Tests: new nil exception test for CPDictionary.

Previously only a deprecation warning was issued. This warning was scheduled to be removed in Cappuccino 0.9.8, this release.

.gitignore

@@ -5,6 +5,7 @@ Demos
 ./Aristo
 WebSite
 .push-package
+*.xcodeproj*
 *.xcodeproj/*.pbxuser
 *.xcodeproj/*.perspectivev3
 xcuserdata/
@@ -12,5 +13,7 @@ xcuserdata/
 *.xCodeSupport/
 *.XcodeSupport/
 *XcodeSupport/
+Tests/Manual/**/*.xcodeproj
 *.sublime-project
 *.sublime-workspace
+*.tm_properties

.travis.yml

@@ -1,6 +1,6 @@
 language: node_js
 node_js:
     - 0.8
-install: ./bootstrap.sh --quiet --noprompt --directory ./narwhal
+install: ./bootstrap.sh --noprompt --directory ./narwhal
 script: jake test
 env: PATH="$TRAVIS_BUILD_DIR/narwhal/bin:$PATH" CAPP_BUILD="$TRAVIS_BUILD_DIR/Build" NARWHAL_ENGINE=rhino

AppKit/CPAlert.j

@@ -41,6 +41,10 @@
 
 @global CPApp
 
+var CPAlertDelegate_alertShowHelp_              = 1 << 0,
+    CPAlertDelegate_alertDidEnd_returnCode_     = 1 << 1;
+
+@typedef CPAlertStyle
 /*
     @global
     @group CPAlertStyle
@@ -59,6 +63,62 @@ CPCriticalAlertStyle        = 2;
 
 var bottomHeight = 71;
 
+@protocol CPAlertDelegate <CPObject>
+
+@optional
+- (BOOL)alertShowHelp:(CPAlert)alert;
+- (void)alertDidEnd:(CPAlert)theAlert returnCode:(int)returnCode;
+
+@end
+
+
+@implementation _CPAlertThemeView : CPView
+
++ (CPString)defaultThemeClass
+{
+    return @"alert";
+}
+
++ (CPDictionary)themeAttributes
+{
+    return @{
+            @"size": CGSizeMake(400.0, 110.0),
+            @"content-inset": CGInsetMake(15, 15, 15, 50),
+            @"informative-offset": 6,
+            @"button-offset": 10,
+            @"message-text-alignment": CPJustifiedTextAlignment,
+            @"message-text-color": [CPColor blackColor],
+            @"message-text-font": [CPFont boldSystemFontOfSize:13.0],
+            @"message-text-shadow-color": [CPNull null],
+            @"message-text-shadow-offset": CGSizeMakeZero(),
+            @"informative-text-alignment": CPJustifiedTextAlignment,
+            @"informative-text-color": [CPColor blackColor],
+            @"informative-text-font": [CPFont systemFontOfSize:12.0],
+            @"informative-text-shadow-color": [CPNull null],
+            @"informative-text-shadow-offset": CGSizeMakeZero(),
+            @"image-offset": CGPointMake(15, 12),
+            @"information-image": [CPNull null],
+            @"warning-image": [CPNull null],
+            @"error-image": [CPNull null],
+            @"help-image": [CPNull null],
+            @"help-image-left-offset": 15,
+            @"help-image-pressed": [CPNull null],
+            @"suppression-button-y-offset": 0.0,
+            @"suppression-button-x-offset": 0.0,
+            @"default-elements-margin": 3.0,
+            @"suppression-button-text-color": [CPColor blackColor],
+            @"suppression-button-text-font": [CPFont systemFontOfSize:12.0],
+            @"suppression-button-text-shadow-color": [CPNull null],
+            @"suppression-button-text-shadow-offset": 0.0,
+            @"modal-window-button-margin-y": 0.0,
+            @"modal-window-button-margin-x": 0.0,
+            @"standard-window-button-margin-y": 0.0,
+            @"standard-window-button-margin-x": 0.0,
+        };
+}
+
+@end
+
 /*!
     @ingroup appkit
 
@@ -83,31 +143,33 @@ var bottomHeight = 71;
 */
 @implementation CPAlert : CPObject
 {
-    BOOL                _showHelp               @accessors(property=showsHelp);
-    BOOL                _showSuppressionButton  @accessors(property=showsSuppressionButton);
+    BOOL                    _showHelp                   @accessors(property=showsHelp);
+    BOOL                    _showSuppressionButton      @accessors(property=showsSuppressionButton);
 
-    CPAlertStyle        _alertStyle             @accessors(property=alertStyle);
-    CPString            _title                  @accessors(property=title);
-    CPView              _accessoryView          @accessors(property=accessoryView);
-    CPImage             _icon                   @accessors(property=icon);
+    CPAlertStyle            _alertStyle                 @accessors(property=alertStyle);
+    CPString                _title                      @accessors(property=title);
+    CPView                  _accessoryView              @accessors(property=accessoryView);
+    CPImage                 _icon                       @accessors(property=icon);
 
-    CPArray             _buttons                @accessors(property=buttons, readonly);
-    CPCheckBox          _suppressionButton      @accessors(property=suppressionButton, readonly);
+    CPArray                 _buttons                    @accessors(property=buttons, readonly);
+    CPCheckBox              _suppressionButton          @accessors(property=suppressionButton, readonly);
 
-    id                  _delegate               @accessors(property=delegate);
-    id                  _modalDelegate;
-    SEL                 _didEndSelector;
+    id <CPAlertDelegate>    _delegate                   @accessors(property=delegate);
+    id                      _modalDelegate;
+    SEL                     _didEndSelector             @accessors(property=didEndSelector);
+    Function                _didEndBlock;
+    unsigned                _implementedDelegateMethods;
 
-    _CPAlertThemeView   _themeView              @accessors(property=themeView, readonly);
-    CPWindow            _window                 @accessors(property=window, readonly);
-    int                 _defaultWindowStyle;
+    _CPAlertThemeView       _themeView                  @accessors(property=themeView, readonly);
+    CPWindow                _window                     @accessors(property=window, readonly);
+    int                     _defaultWindowStyle;
 
-    CPImageView         _alertImageView;
-    CPTextField         _informativeLabel;
-    CPTextField         _messageLabel;
-    CPButton            _alertHelpButton;
+    CPImageView             _alertImageView;
+    CPTextField             _informativeLabel;
+    CPTextField             _messageLabel;
+    CPButton                _alertHelpButton;
 
-    BOOL                _needsLayout;
+    BOOL                    _needsLayout;
 }
 
 #pragma mark Creating Alerts
@@ -186,6 +248,30 @@ var bottomHeight = 71;
     return self;
 }
 
+
+#pragma mark -
+#pragma mark Delegate
+
+/*!
+    Set the delegate of the receiver
+    @param aDelegate the delegate object for the alert.
+*/
+- (void)setDelegate:(id <CPAlertDelegate>)aDelegate
+{
+    if (_delegate === aDelegate)
+        return;
+
+    _delegate = aDelegate;
+    _implementedDelegateMethods = 0;
+
+    if ([_delegate respondsToSelector:@selector(alertShowHelp:)])
+        _implementedDelegateMethods |= CPAlertDelegate_alertShowHelp_;
+
+    if ([_delegate respondsToSelector:@selector(alertDidEnd:returnCode:)])
+        _implementedDelegateMethods |= CPAlertDelegate_alertDidEnd_returnCode_;
+}
+
+
 #pragma mark Accessors
 
 - (CPTheme)theme
@@ -218,22 +304,21 @@ var bottomHeight = 71;
     [_themeView setValue:aValue forThemeAttribute:aName];
 }
 
-- (void)setValue:(id)aValue forThemeAttribute:(CPString)aName inState:(CPThemeState)aState
+- (void)setValue:(id)aValue forThemeAttribute:(CPString)aName inState:(ThemeState)aState
 {
     [_themeView setValue:aValue forThemeAttribute:aName inState:aState];
 }
 
 
-/*! @deprecated
-*/
-- (void)setWindowStyle:(int)aStyle
+/*! @deprecated */
+- (void)setWindowStyle:(int)style
 {
     CPLog.warn("DEPRECATED: setWindowStyle: is deprecated. use setTheme: instead");
-    [self setTheme:(aStyle === CPHUDBackgroundWindowMask) ? [CPTheme defaultHudTheme] : [CPTheme defaultTheme]];
+
+    [self setTheme:(style === CPHUDBackgroundWindowMask) ? [CPTheme defaultHudTheme] : [CPTheme defaultTheme]];
 }
 
-/*! @deprecated
-*/
+/*! @deprecated */
 - (int)windowStyle
 {
     CPLog.warn("DEPRECATED: windowStyle: is deprecated. use theme instead");
@@ -242,18 +327,19 @@ var bottomHeight = 71;
 
 
 /*!
-    set the text of the alert's message
+    Set the text of the alert's message.
 
     @param aText CPString containing the text
 */
-- (void)setMessageText:(CPString)aText
+- (void)setMessageText:(CPString)text
 {
-    [_messageLabel setStringValue:aText];
+    [_messageLabel setStringValue:text];
     _needsLayout = YES;
 }
 
 /*!
-    return the content of the message text
+    Return the content of the message text.
+
     @return CPString containing the message text
 */
 - (CPString)messageText
@@ -262,13 +348,13 @@ var bottomHeight = 71;
 }
 
 /*!
-    set the text of the alert's informative text
+    Set the text of the alert's informative text.
 
     @param aText CPString containing the informative text
 */
-- (void)setInformativeText:(CPString)aText
+- (void)setInformativeText:(CPString)text
 {
-    [_informativeLabel setStringValue:aText];
+    [_informativeLabel setStringValue:text];
     _needsLayout = YES;
 }
 
@@ -285,6 +371,7 @@ var bottomHeight = 71;
 /*!
     Sets the title of the alert window.
     This API is not present in Cocoa.
+
     @param aTitle CPString containing the window title
 */
 - (void)setTitle:(CPString)aTitle
@@ -294,7 +381,7 @@ var bottomHeight = 71;
 }
 
 /*!
-    set the accessory view
+    Set the accessory view.
 
     @param aView the accessory view
 */
@@ -305,7 +392,7 @@ var bottomHeight = 71;
 }
 
 /*!
-    set if alert shows the suppression button
+    Set if the alert shows the suppression button.
 
     @param shouldShowSuppressionButton YES or NO
 */
@@ -596,6 +683,17 @@ var bottomHeight = 71;
     [CPApp runModalForWindow:_window];
 }
 
+/*!
+    The same as \c runModal, but executes the code in \c block when the
+    alert is dismissed.
+*/
+- (void)runModalWithDidEndBlock:(Function /*(CPAlert alert, int returnCode)*/)block
+{
+    _didEndBlock = block;
+
+    [self runModal];
+}
+
 /*!
     Runs the receiver modally as an alert sheet attached to a specified window.
 
@@ -630,6 +728,20 @@ var bottomHeight = 71;
     [self beginSheetModalForWindow:aWindow modalDelegate:nil didEndSelector:nil contextInfo:nil];
 }
 
+/*!
+    Runs the receiver modally as an alert sheet attached to a specified window.
+    Executes the code in \c block when the alert is dismissed.
+
+    @param window The parent window for the sheet.
+    @param block  Code block to execute on dismissal
+*/
+- (void)beginSheetModalForWindow:(CPWindow)aWindow didEndBlock:(Function /*(CPAlert alert, int returnCode)*/)block
+{
+    _didEndBlock = block;
+
+    [self beginSheetModalForWindow:aWindow modalDelegate:nil didEndSelector:nil contextInfo:nil];
+}
+
 #pragma mark Private
 
 /*!
@@ -669,8 +781,7 @@ var bottomHeight = 71;
 */
 - (@action)_showHelp:(id)aSender
 {
-    if ([_delegate respondsToSelector:@selector(alertShowHelp:)])
-        [_delegate alertShowHelp:self];
+    [self _sendDelegateAlertShowHelp];
 }
 
 /*
@@ -697,61 +808,57 @@ var bottomHeight = 71;
 */
 - (void)_alertDidEnd:(CPWindow)aWindow returnCode:(int)returnCode contextInfo:(id)contextInfo
 {
-    if (_didEndSelector)
-        objj_msgSend(_modalDelegate, _didEndSelector, self, returnCode, contextInfo);
+    if (_didEndBlock)
+    {
+        if (typeof(_didEndBlock) === "function")
+            _didEndBlock(self, returnCode);
+        else
+            CPLog.warn("%s: didEnd block is not a function", [self description]);
 
-    _modalDelegate = nil;
-    _didEndSelector = nil;
-
-    if ([_delegate respondsToSelector:@selector(alertDidEnd:returnCode:)])
-        [_delegate alertDidEnd:self returnCode:returnCode];
+        // didEnd blocks are transient
+        _didEndBlock = nil;
+    }
+    else if (_modalDelegate)
+    {
+        if (_didEndSelector)
+            objj_msgSend(_modalDelegate, _didEndSelector, self, returnCode, contextInfo);
+    }
+    else if (_delegate)
+    {
+        if (_didEndSelector)
+            objj_msgSend(_delegate, _didEndSelector, self, returnCode);
+        else
+            [self _sendDelegateAlertDidEndReturnCode:returnCode];
+    }
 }
 
 @end
 
-@implementation _CPAlertThemeView : CPView
 
-+ (CPString)defaultThemeClass
+@implementation CPAlert (CPAlertDelegate)
+
+/*!
+    @ignore
+    Call the delegate alertDidEnd:returnCode
+*/
+- (void)_sendDelegateAlertDidEndReturnCode:(int)returnCode
 {
-    return @"alert";
+    if (!(_implementedDelegateMethods & CPAlertDelegate_alertDidEnd_returnCode_))
+        return;
+
+    [_delegate alertDidEnd:self returnCode:returnCode];
 }
 
-+ (id)themeAttributes
+/*!
+    @ignore
+    Call the delegate alertShowHelp:
+*/
+- (BOOL)_sendDelegateAlertShowHelp
 {
-    return @{
-            @"size": CGSizeMake(400.0, 110.0),
-            @"content-inset": CGInsetMake(15, 15, 15, 50),
-            @"informative-offset": 6,
-            @"button-offset": 10,
-            @"message-text-alignment": CPJustifiedTextAlignment,
-            @"message-text-color": [CPColor blackColor],
-            @"message-text-font": [CPFont boldSystemFontOfSize:13.0],
-            @"message-text-shadow-color": [CPNull null],
-            @"message-text-shadow-offset": CGSizeMakeZero(),
-            @"informative-text-alignment": CPJustifiedTextAlignment,
-            @"informative-text-color": [CPColor blackColor],
-            @"informative-text-font": [CPFont systemFontOfSize:12.0],
-            @"informative-text-shadow-color": [CPNull null],
-            @"informative-text-shadow-offset": CGSizeMakeZero(),
-            @"image-offset": CGPointMake(15, 12),
-            @"information-image": [CPNull null],
-            @"warning-image": [CPNull null],
-            @"error-image": [CPNull null],
-            @"help-image": [CPNull null],
-            @"help-image-left-offset": 15,
-            @"help-image-pressed": [CPNull null],
-            @"suppression-button-y-offset": 0.0,
-            @"suppression-button-x-offset": 0.0,
-            @"default-elements-margin": 3.0,
-            @"suppression-button-text-color": [CPColor blackColor],
-            @"suppression-button-text-font": [CPFont systemFontOfSize:12.0],
-            @"suppression-button-text-shadow-color": [CPNull null],
-            @"suppression-button-text-shadow-offset": 0.0,
-            @"modal-window-button-margin-y": 0.0,
-            @"modal-window-button-margin-x": 0.0,
-            @"standard-window-button-margin-y": 0.0,
-            @"standard-window-button-margin-x": 0.0,
-        };
+    if (!(_implementedDelegateMethods & CPAlertDelegate_alertShowHelp_))
+        return YES;
+
+    return [_delegate alertShowHelp:self];
 }
 
 @end

AppKit/CPAnimation.j

@@ -26,25 +26,26 @@
 @import "CAMediaTimingFunction.j"
 
 
-/*
-    @global
-    @group CPAnimationCurve
-*/
+@protocol CPAnimationDelegate <CPObject>
+
+@optional
+- (BOOL)animationShouldStart:(CPAnimation)animation;
+- (float)animation:(CPAnimation)animation valueForProgress:(float)progress;
+- (void)animationDidEnd:(CPAnimation)animation;
+- (void)animationDidStop:(CPAnimation)animation;
+
+@end
+
+
+var CPAnimationDelegate_animationShouldStart_       = 1 << 1,
+    CPAnimationDelegate_animation_valueForProgress_ = 1 << 2,
+    CPAnimationDelegate_animationDidEnd_            = 1 << 3,
+    CPAnimationDelegate_animationDidStop_           = 1 << 4;
+
+@typedef CPAnimationCurve
 CPAnimationEaseInOut    = 0;
-/*
-    @global
-    @group CPAnimationCurve
-*/
 CPAnimationEaseIn       = 1;
-/*
-    @global
-    @group CPAnimationCurve
-*/
 CPAnimationEaseOut      = 2;
-/*
-    @global
-    @group CPAnimationCurve
-*/
 CPAnimationLinear       = 3;
 
 ACTUAL_FRAME_RATE = 0;
@@ -80,17 +81,18 @@ ACTUAL_FRAME_RATE = 0;
 */
 @implementation CPAnimation : CPObject
 {
-    CPTimeInterval          _lastTime;
-    CPTimeInterval          _duration;
+    CPTimeInterval              _lastTime;
+    CPTimeInterval              _duration;
 
-    CPAnimationCurve        _animationCurve;
-    CAMediaTimingFunction   _timingFunction;
+    CPAnimationCurve            _animationCurve;
+    CAMediaTimingFunction       _timingFunction;
 
-    float                   _frameRate;
-    float                   _progress;
+    float                       _frameRate;
+    float                       _progress;
 
-    id                      _delegate;
-    CPTimer                 _timer;
+    id <CPAnimationDelegate>    _delegate;
+    CPTimer                     _timer;
+    unsigned                    _implementedDelegateMethods;
 }
 
 /*!
@@ -214,9 +216,25 @@ ACTUAL_FRAME_RATE = 0;
     Sets the animation's delegate.
     @param aDelegate the new delegate
 */
-- (void)setDelegate:(id)aDelegate
+- (void)setDelegate:(id <CPAnimationDelegate>)aDelegate
 {
+    if (_delegate === aDelegate)
+        return;
+
     _delegate = aDelegate;
+    _implementedDelegateMethods = 0;
+
+    if ([_delegate respondsToSelector:@selector(animationShouldStart:)])
+        _implementedDelegateMethods |= CPAnimationDelegate_animationShouldStart_;
+
+    if ([_delegate respondsToSelector:@selector(animationDidEnd:)])
+        _implementedDelegateMethods |= CPAnimationDelegate_animationDidEnd_;
+
+    if ([_delegate respondsToSelector:@selector(animationDidStop:)])
+        _implementedDelegateMethods |= CPAnimationDelegate_animationDidStop_;
+
+    if ([_delegate respondsToSelector:@selector(animation:valueForProgress:)])
+        _implementedDelegateMethods |= CPAnimationDelegate_animation_valueForProgress_;
 }
 
 /*!
@@ -227,7 +245,7 @@ ACTUAL_FRAME_RATE = 0;
 - (void)startAnimation
 {
     // If we're already animating, or our delegate stops us, animate.
-    if (_timer || _delegate && [_delegate respondsToSelector:@selector(animationShouldStart:)] && ![_delegate animationShouldStart:self])
+    if (_timer || ![self _sendDelegateAnimationShouldStart])
         return;
 
     if (_progress === 1.0)
@@ -236,7 +254,9 @@ ACTUAL_FRAME_RATE = 0;
     ACTUAL_FRAME_RATE = 0;
     _lastTime = new Date();
 
-    _timer = [CPTimer scheduledTimerWithTimeInterval:0.0 target:self selector:@selector(animationTimerDidFire:) userInfo:nil repeats:YES];
+    var timerInterval = _frameRate <= 0.0 ? 0.0001 : 1.0 / _frameRate;
+
+    _timer = [CPTimer scheduledTimerWithTimeInterval:timerInterval target:self selector:@selector(animationTimerDidFire:) userInfo:nil repeats:YES];
 }
 
 /*
@@ -258,8 +278,7 @@ ACTUAL_FRAME_RATE = 0;
         [_timer invalidate];
         _timer = nil;
 
-        if ([_delegate respondsToSelector:@selector(animationDidEnd:)])
-            [_delegate animationDidEnd:self];
+        [self _sendDelegateAnimationDidEnd];
     }
 }
 
@@ -274,8 +293,7 @@ ACTUAL_FRAME_RATE = 0;
     [_timer invalidate];
     _timer = nil;
 
-    if ([_delegate respondsToSelector:@selector(animationDidStop:)])
-        [_delegate animationDidStop:self];
+    [self _sendDelegateAnimationDidStop];
 }
 
 /*!
@@ -311,8 +329,8 @@ ACTUAL_FRAME_RATE = 0;
 {
     var t = [self currentProgress];
 
-    if ([_delegate respondsToSelector:@selector(animation:valueForProgress:)])
-        return [_delegate animation:self valueForProgress:t];
+    if ([self _delegateRespondsToAnimationValueForProgress])
+        return [self _sendDelegateAnimationValueForProgress:t];
 
     if (_animationCurve == CPAnimationLinear)
         return t;
@@ -328,6 +346,68 @@ ACTUAL_FRAME_RATE = 0;
 
 @end
 
+
+@implementation CPAnimation (CPAnimationDelegate)
+
+/*!
+    @ignore
+    Check if the delegate responds to animation:valueForProgress:
+*/
+- (BOOL)_delegateRespondsToAnimationValueForProgress
+{
+    return _implementedDelegateMethods & CPAnimationDelegate_animation_valueForProgress_;
+}
+
+/*!
+    @ignore
+    Call delegate animationShouldStart:
+*/
+- (BOOL)_sendDelegateAnimationShouldStart
+{
+    if (!(_implementedDelegateMethods & CPAnimationDelegate_animationShouldStart_))
+        return YES;
+
+    return [_delegate animationShouldStart:self];
+}
+
+/*!
+    @ignore
+    Call delegate animation:valueForProgress:
+*/
+- (float)_sendDelegateAnimationValueForProgress:(float)aProgress
+{
+    if (!(_implementedDelegateMethods & CPAnimationDelegate_animation_valueForProgress_))
+        return aProgress;
+
+    return [_delegate animation:self valueForProgress:aProgress];
+}
+
+/*!
+    @ignore
+    Call delegate animationDidEnd:
+*/
+- (void)_sendDelegateAnimationDidEnd
+{
+    if (!(_implementedDelegateMethods & CPAnimationDelegate_animationDidEnd_))
+        return;
+
+    [_delegate animationDidEnd:self];
+}
+
+/*!
+    @ignore
+    Call delegate animationDidStop:
+*/
+- (void)_sendDelegateAnimationDidStop
+{
+    if (!(_implementedDelegateMethods & CPAnimationDelegate_animationDidStop_))
+        return;
+
+    [_delegate animationDidStop:self];
+}
+
+@end
+
 // currently used function to determine time
 // 1:1 conversion to js from webkit source files
 // UnitBezier.h, WebCore_animation_AnimationBase.cpp

AppKit/CPApplication.j

@@ -22,6 +22,7 @@
 
 @import <Foundation/CPBundle.j>
 
+@import "CPApplication_Constants.j"
 @import "CPCompatibility.j"
 @import "CPColorPanel.j"
 @import "CPCursor.j"
@@ -36,27 +37,26 @@
 @import "CPWindowController.j"
 @import "_CPPopoverWindow.j"
 
+@typedef CPModalSession
+
 var CPMainCibFile               = @"CPMainCibFile",
     CPMainCibFileHumanFriendly  = @"Main cib file base name",
     CPEventModifierFlags = 0;
 
-CPApp = nil;
 
-CPApplicationWillFinishLaunchingNotification    = @"CPApplicationWillFinishLaunchingNotification";
-CPApplicationDidFinishLaunchingNotification     = @"CPApplicationDidFinishLaunchingNotification";
-CPApplicationWillTerminateNotification          = @"CPApplicationWillTerminateNotification";
-CPApplicationWillBecomeActiveNotification       = @"CPApplicationWillBecomeActiveNotification";
-CPApplicationDidBecomeActiveNotification        = @"CPApplicationDidBecomeActiveNotification";
-CPApplicationWillResignActiveNotification       = @"CPApplicationWillResignActiveNotification";
-CPApplicationDidResignActiveNotification        = @"CPApplicationDidResignActiveNotification";
+@protocol CPApplicationDelegate <CPObject>
 
-CPTerminateNow      = YES;
-CPTerminateCancel   = NO;
-CPTerminateLater    = -1; // not currently supported
+@optional
+- (void)applicationDidBecomeActive:(CPNotification)aNotification;
+- (void)applicationDidChangeScreenParameters:(CPNotification)aNotification;
+- (void)applicationDidFinishLaunching:(CPNotification)aNotification;
+- (void)applicationDidResignActive:(CPNotification)aNotification;
+- (void)applicationWillBecomeActive:(CPNotification)aNotification;
+- (void)applicationWillFinishLaunching:(CPNotification)aNotification;
+- (void)applicationWillResignActive:(CPNotification)aNotification;
+- (void)applicationWillTerminate:(CPNotification)aNotification;
 
-CPRunStoppedResponse    = -1000;
-CPRunAbortedResponse    = -1001;
-CPRunContinuesResponse  = -1002;
+@end
 
 /*!
     @ingroup appkit
@@ -85,36 +85,36 @@ CPRunContinuesResponse  = -1002;
 */
 @implementation CPApplication : CPResponder
 {
-    CPArray                 _eventListeners;
-    int                     _eventListenerInsertionIndex;
+    CPArray                     _eventListeners;
+    int                         _eventListenerInsertionIndex;
 
-    CPEvent                 _currentEvent;
-    CPWindow                _lastMouseMoveWindow;
+    CPEvent                     _currentEvent;
+    CPWindow                    _lastMouseMoveWindow;
 
-    CPArray                 _windows;
-    CPWindow                _keyWindow;
-    CPWindow                _mainWindow;
-    CPWindow                _previousKeyWindow;
-    CPWindow                _previousMainWindow;
+    CPArray                     _windows;
+    CPWindow                    _keyWindow;
+    CPWindow                    _mainWindow;
+    CPWindow                    _previousKeyWindow;
+    CPWindow                    _previousMainWindow;
 
-    CPDocumentController    _documentController;
+    CPDocumentController        _documentController;
 
-    CPModalSession          _currentSession;
+    CPModalSession              _currentSession;
 
     //
-    id                      _delegate;
-    BOOL                    _finishedLaunching;
-    BOOL                    _isActive;
+    id <CPApplicationDelegate>  _delegate;
+    BOOL                        _finishedLaunching;
+    BOOL                        _isActive;
 
-    CPDictionary            _namedArgs;
-    CPArray                 _args;
-    CPString                _fullArgsString;
+    CPDictionary                _namedArgs;
+    CPArray                     _args;
+    CPString                    _fullArgsString;
 
-    CPImage                 _applicationIconImage;
+    CPImage                     _applicationIconImage;
 
-    CPPanel                 _aboutPanel;
+    CPPanel                     _aboutPanel;
 
-    CPThemeBlend            _themeBlend @accessors(property=themeBlend);
+    CPThemeBlend                _themeBlend @accessors(property=themeBlend);
 }
 
 /*!
@@ -160,7 +160,7 @@ CPRunContinuesResponse  = -1002;
     react to these events.
     @param aDelegate the delegate object
 */
-- (void)setDelegate:(id)aDelegate
+- (void)setDelegate:(id <CPApplicationDelegate>)aDelegate
 {
     if (_delegate == aDelegate)
         return;
@@ -174,7 +174,8 @@ CPRunContinuesResponse  = -1002;
             CPApplicationDidBecomeActiveNotification, @selector(applicationDidBecomeActive:),
             CPApplicationWillResignActiveNotification, @selector(applicationWillResignActive:),
             CPApplicationDidResignActiveNotification, @selector(applicationDidResignActive:),
-            CPApplicationWillTerminateNotification, @selector(applicationWillTerminate:)
+            CPApplicationWillTerminateNotification, @selector(applicationWillTerminate:),
+            CPApplicationDidChangeScreenParametersNotification, @selector(applicationDidChangeScreenParameters:)
         ],
         count = [delegateNotifications count];
 
@@ -449,7 +450,7 @@ CPRunContinuesResponse  = -1002;
     [CPPlatform activateIgnoringOtherApps:shouldIgnoreOtherApps];
     _isActive = YES;
 
-    [self _willResignActive];
+    [self _didBecomeActive];
 }
 
 - (void)deactivate
@@ -587,8 +588,8 @@ CPRunContinuesResponse  = -1002;
 /* @ignore */
 - (BOOL)_handleKeyEquivalent:(CPEvent)anEvent
 {
-    return  [[self keyWindow] performKeyEquivalent:anEvent] ||
-            [[self mainMenu] performKeyEquivalent:anEvent];
+    return [[self keyWindow] performKeyEquivalent:anEvent] ||
+           [[self mainMenu] performKeyEquivalent:anEvent];
 }
 
 /*!
@@ -602,33 +603,10 @@ CPRunContinuesResponse  = -1002;
 
     var theWindow = [anEvent window];
 
-#if PLATFORM(DOM)
-    var willPropagate = [[theWindow platformWindow] _willPropagateCurrentDOMEvent];
-
-    // temporarily pretend we won't propagate the event. we'll restore the saved value later
-    // we do this outside the if so that changes user code might make in _handleKeyEquiv. are preserved
-    [[theWindow platformWindow] _propagateCurrentDOMEvent:NO];
-#endif
-
     // Check if this is a candidate for key equivalent...
     if ([anEvent _couldBeKeyEquivalent] && [self _handleKeyEquivalent:anEvent])
-    {
-#if PLATFORM(DOM)
-        var characters = [anEvent characters],
-            modifierFlags = [anEvent modifierFlags];
-
-        // Unconditionally propagate on these keys to solve browser copy paste bugs
-        if ((characters == "c" || characters == "x" || characters == "v") && (modifierFlags & CPPlatformActionKeyMask))
-            [[theWindow platformWindow] _propagateCurrentDOMEvent:YES];
-#endif
-
+        // The key equivalent was handled.
         return;
-    }
-
-#if PLATFORM(DOM)
-    // if we make it this far, then restore the original willPropagate value
-    [[theWindow platformWindow] _propagateCurrentDOMEvent:willPropagate];
-#endif
 
     if ([anEvent type] == CPMouseMoved)
     {
@@ -1010,7 +988,9 @@ CPRunContinuesResponse  = -1002;
         return;
     }
 
-    [aSheet._windowView _enableSheet:YES inWindow:aWindow];
+    if (![aWindow attachedSheet])
+        [aSheet._windowView _enableSheet:YES inWindow:aWindow];
+
     [aWindow _attachSheet:aSheet modalDelegate:aModalDelegate didEndSelector:didEndSelector contextInfo:contextInfo];
 }
 
@@ -1197,7 +1177,7 @@ CPRunContinuesResponse  = -1002;
         [[self keyWindow] orderFront:self];
     else if ([self mainWindow])
         [[self mainWindow] makeKeyAndOrderFront:self];
-    else
+    else if ([self mainMenu])
         [[self mainMenu]._menuWindow makeKeyWindow]; //FIXME this may not actually work
 
     _previousKeyWindow = nil;
@@ -1381,8 +1361,8 @@ var _CPAppBootstrapperActions = nil;
     if (mainCibFile)
     {
         [mainBundle loadCibFile:mainCibFile
-            externalNameTable:@{ CPCibOwner: CPApp }
-                 loadDelegate:self];
+              externalNameTable:@{ CPCibOwner: CPApp }
+                   loadDelegate:self];
 
         return YES;
     }
@@ -1459,7 +1439,7 @@ var _CPAppBootstrapperActions = nil;
 
 + (void)cibDidFailToLoad:(CPCib)aCib
 {
-    throw new Error("Could not load main cib file (Did you forget to nib2cib it?).");
+    throw new Error("Could not load main cib file. Did you forget to nib2cib it?");
 }
 
 + (void)reset

AppKit/CPApplication_Constants.j

@@ -0,0 +1,40 @@
+/*
+ * CPApplication_Constants.j
+ * AppKit
+ *
+ * Created by Aparajita Fishman.
+ * Copyright 2013 The Cappuccino Project
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+CPApp = nil;
+
+CPApplicationWillFinishLaunchingNotification        = @"CPApplicationWillFinishLaunchingNotification";
+CPApplicationDidFinishLaunchingNotification         = @"CPApplicationDidFinishLaunchingNotification";
+CPApplicationWillTerminateNotification              = @"CPApplicationWillTerminateNotification";
+CPApplicationWillBecomeActiveNotification           = @"CPApplicationWillBecomeActiveNotification";
+CPApplicationDidBecomeActiveNotification            = @"CPApplicationDidBecomeActiveNotification";
+CPApplicationWillResignActiveNotification           = @"CPApplicationWillResignActiveNotification";
+CPApplicationDidResignActiveNotification            = @"CPApplicationDidResignActiveNotification";
+CPApplicationDidChangeScreenParametersNotification  = @"CPApplicationDidChangeScreenParametersNotification";
+
+CPTerminateNow      = YES;
+CPTerminateCancel   = NO;
+CPTerminateLater    = -1; // not currently supported
+
+CPRunStoppedResponse    = -1000;
+CPRunAbortedResponse    = -1001;
+CPRunContinuesResponse  = -1002;

AppKit/CPArrayController.j

@@ -23,7 +23,7 @@
  */
 
 @import <Foundation/CPIndexSet.j>
-
+@import <Foundation/CPPredicate.j>
 @import "CPObjectController.j"
 @import "CPKeyValueBinding.j"
 

AppKit/CPBezierPath.j

@@ -147,6 +147,8 @@ var DefaultLineWidth = 1.0;
     {
         _path = CGPathCreateMutable();
         _lineWidth = [[self class] defaultLineWidth];
+        _lineDashesPhase = 0;
+        _lineDashes = [];
     }
 
     return self;

AppKit/CPBox.j

@@ -24,6 +24,7 @@
 @import "CPView.j"
 
 // CPBoxType
+@typedef CPBoxType
 CPBoxPrimary    = 0;
 CPBoxSecondary  = 1;
 CPBoxSeparator  = 2;
@@ -31,12 +32,14 @@ CPBoxOldStyle   = 3;
 CPBoxCustom     = 4;
 
 // CPBorderType
+@typedef CPBorderType
 CPNoBorder      = 0;
 CPLineBorder    = 1;
 CPBezelBorder   = 2;
 CPGrooveBorder  = 3;
 
 // CPTitlePosition
+@typedef CPTitlePosition
 CPNoTitle     = 0;
 CPAboveTop    = 1;
 CPAtTop       = 2;
@@ -76,7 +79,7 @@ CPBelowBottom = 6;
     return @"box";
 }
 
-+ (id)themeAttributes
++ (CPDictionary)themeAttributes
 {
     return @{
             @"background-color": [CPNull null],

AppKit/CPBrowser.j

@@ -20,6 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+@import <Foundation/CPObject.j>
 @import <Foundation/CPIndexSet.j>
 
 @import "CPControl.j"
@@ -30,40 +31,86 @@
 
 @global CPApp
 
+@protocol CPBrowserDelegate <CPObject>
+
+@optional
+- (BOOL)browser:(CPBrowser)browser acceptDrop:(id)info atRow:(CPInteger)row column:(CPInteger)column dropOperation:(CPTableViewDropOperation)dropOperation;
+- (BOOL)browser:(CPBrowser)browser canDragRowsWithIndexes:(CPIndexSet)rowIndexes inColumn:(CPInteger)column withEvent:(CPEvent )event;
+- (BOOL)browser:(CPBrowser)browser isLeafItem:(id)item;
+- (BOOL)browser:(CPBrowser)browser shouldSelectRowIndexes:(CPIndexSet)anIndexSet inColumn:(CPInteger)column;
+- (BOOL)browser:(CPBrowser)browser writeRowsWithIndexes:(CPIndexSet)rowIndexes inColumn:(CPInteger)column toPasteboard:(CPPasteboard)pasteboard;
+- (CPDragOperation)browser:(CPBrowser)browser validateDrop:(id)info proposedRow:(CPInteger)row column:(CPInteger)column dropOperation:(CPTableViewDropOperation)dropOperation;
+- (CPImage)browser:(CPBrowser)browser imageValueForItem:(id)anItem;
+- (CPImage)browser:(CPBrowser)browser draggingImageForRowsWithIndexes:(CPIndexSet)rowIndexes inColumn:(CPInteger)column withEvent:(CPEvent)event offset:(CGPoint)dragImageOffset;
+- (CPImage)browser:(CPBrowser)browser imageValueForItem:(id)item;
+- (CPIndexSet)browser:(CPBrowser)browser selectionIndexesForProposedSelection:(CPIndexSet)proposedSelectionIndexes inColumn:(CPInteger)column;
+- (CPInteger)browser:(CPBrowser)browser numberOfChildrenOfItem:(id)item;
+- (CPView)browser:(CPBrowser)browser draggingViewForRowsWithIndexes:(CPIndexSet)rowIndexes inColumn:(CPInteger)column withEvent:(CPEvent)event offset:(CGPoint)dragImageOffset;
+- (id)browser:(CPBrowser)browser child:(CPInteger)index ofItem:(id)item;
+- (id)browser:(CPBrowser)browser objectValueForItem:(id)item;
+- (id)rootItemForBrowser:(CPBrowser)browser;
+- (void)browser:(CPBrowser)browser didChangeLastColumn:(CPInteger)oldLastColumn toColumn:(CPInteger)column;
+- (void)browser:(CPBrowser)browser didResizeColumn:(CPInteger)column;
+- (void)browserSelectionIsChanging:(CPBrowser)browser;
+- (void)browserSelectionDidChange:(CPBrowser)browser;
+
+@end
+
+var CPBrowserDelegate_browser_acceptDrop_atRow_column_dropOperation_                        = 1 << 1,
+    CPBrowserDelegate_browser_canDragRowsWithIndexes_inColumn_withEvent_                    = 1 << 2,
+    CPBrowserDelegate_browser_isLeafItem_                                                   = 1 << 3,
+    CPBrowserDelegate_browser_shouldSelectRowIndexes_inColumn_                              = 1 << 4,
+    CPBrowserDelegate_browser_writeRowsWithIndexes_inColumn_toPasteboard_                   = 1 << 5,
+    CPBrowserDelegate_browser_validateDrop_proposedRow_column_dropOperation_                = 1 << 6,
+    CPBrowserDelegate_browser_imageValueForItem_                                            = 1 << 7,
+    CPBrowserDelegate_browser_draggingImageForRowsWithIndexes_inColumn_withEvent_offset_    = 1 << 8,
+    CPBrowserDelegate_browser_imageValueForItem_                                            = 1 << 9,
+    CPBrowserDelegate_browser_selectionIndexesForProposedSelection_inColumn_                = 1 << 10,
+    CPBrowserDelegate_browser_numberOfChildrenOfItem_                                       = 1 << 11,
+    CPBrowserDelegate_browser_draggingViewForRowsWithIndexes_inColumn_withEvent_offset_     = 1 << 12,
+    CPBrowserDelegate_browser_child_ofItem_                                                 = 1 << 13,
+    CPBrowserDelegate_browser_objectValueForItem_                                           = 1 << 14,
+    CPBrowserDelegate_rootItemForBrowser_                                                   = 1 << 15,
+    CPBrowserDelegate_browser_didChangeLastColumn_toColumn_                                 = 1 << 16,
+    CPBrowserDelegate_browser_didResizeColumn_                                              = 1 << 17,
+    CPBrowserDelegate_browserSelectionIsChanging_                                           = 1 << 18,
+    CPBrowserDelegate_browserSelectionDidChange_                                            = 1 << 19;
+
 /*!
     @ingroup appkit
     @class CPBrowser
 */
 @implementation CPBrowser : CPControl
 {
-    id              _delegate;
-    CPString        _pathSeparator;
+    id <CPBrowserDelegate>  _delegate;
+    CPString                _pathSeparator;
+    unsigned                _implementedDelegateMethods;
 
-    CPView          _contentView;
-    CPScrollView    _horizontalScrollView;
-    CPView          _prototypeView;
+    CPView                  _contentView;
+    CPScrollView            _horizontalScrollView;
+    CPView                  _prototypeView;
 
-    CPArray         _tableViews;
-    CPArray         _tableDelegates;
+    CPArray                 _tableViews;
+    CPArray                 _tableDelegates;
 
-    id              _rootItem;
+    id                      _rootItem;
 
-    BOOL            _delegateSupportsImages;
+    BOOL                    _delegateSupportsImages;
 
-    SEL             _doubleAction @accessors(property=doubleAction);
+    SEL                     _doubleAction @accessors(property=doubleAction);
 
-    BOOL            _allowsMultipleSelection;
-    BOOL            _allowsEmptySelection;
+    BOOL                    _allowsMultipleSelection;
+    BOOL                    _allowsEmptySelection;
 
-    Class           _tableViewClass @accessors(property=tableViewClass);
+    Class                   _tableViewClass @accessors(property=tableViewClass);
 
-    float           _rowHeight;
-    float           _imageWidth;
-    float           _leafWidth;
-    float           _minColumnWidth;
-    float           _defaultColumnWidth @accessors(property=defaultColumnWidth);
+    float                   _rowHeight;
+    float                   _imageWidth;
+    float                   _leafWidth;
+    float                   _minColumnWidth;
+    float                   _defaultColumnWidth @accessors(property=defaultColumnWidth);
 
-    CPArray         _columnWidths;
+    CPArray                 _columnWidths;
 }
 
 + (CPString)defaultThemeClass
@@ -71,7 +118,7 @@
     return "browser";
 }
 
-+ (id)themeAttributes
++ (CPDictionary)themeAttributes
 {
     return @{
         @"image-control-resize": [CPNull null],
@@ -137,10 +184,74 @@
             [CPKeyedArchiver archivedDataWithRootObject:_prototypeView]];
 }
 
-- (void)setDelegate:(id)anObject
+- (void)setDelegate:(id <CPBrowserDelegate>)anObject
 {
+    if (_delegate === anObject)
+        return;
+
     _delegate = anObject;
-    _delegateSupportsImages = [_delegate respondsToSelector:@selector(browser:imageValueForItem:)];
+    _implementedDelegateMethods = 0;
+    _delegateSupportsImages = NO;
+
+    if ([_delegate respondsToSelector:@selector(browser:acceptDrop:atRow:column:dropOperation:)])
+        _implementedDelegateMethods |= CPBrowserDelegate_browser_acceptDrop_atRow_column_dropOperation_;
+
+    if ([_delegate respondsToSelector:@selector(browser:canDragRowsWithIndexes:inColumn:withEvent:)])
+        _implementedDelegateMethods |= CPBrowserDelegate_browser_canDragRowsWithIndexes_inColumn_withEvent_;
+
+    if ([_delegate respondsToSelector:@selector(browser:isLeafItem:)])
+        _implementedDelegateMethods |= CPBrowserDelegate_browser_isLeafItem_;
+
+    if ([_delegate respondsToSelector:@selector(browser:shouldSelectRowIndexes:inColumn:)])
+        _implementedDelegateMethods |= CPBrowserDelegate_browser_shouldSelectRowIndexes_inColumn_;
+
+    if ([_delegate respondsToSelector:@selector(browser:writeRowsWithIndexes:inColumn:toPasteboard:)])
+        _implementedDelegateMethods |= CPBrowserDelegate_browser_writeRowsWithIndexes_inColumn_toPasteboard_;
+
+    if ([_delegate respondsToSelector:@selector(browser:validateDrop:proposedRow:column:dropOperation:)])
+        _implementedDelegateMethods |= CPBrowserDelegate_browser_validateDrop_proposedRow_column_dropOperation_;
+
+    if ([_delegate respondsToSelector:@selector(browser:imageValueForItem:)])
+        _implementedDelegateMethods |= CPBrowserDelegate_browser_imageValueForItem_;
+
+    if ([_delegate respondsToSelector:@selector(browser:draggingImageForRowsWithIndexes:inColumn:withEvent:offset:)])
+        _implementedDelegateMethods |= CPBrowserDelegate_browser_draggingImageForRowsWithIndexes_inColumn_withEvent_offset_;
+
+    if ([_delegate respondsToSelector:@selector(browser:imageValueForItem:)])
+    {
+        _delegateSupportsImages = YES;
+        _implementedDelegateMethods |= CPBrowserDelegate_browser_imageValueForItem_;
+    }
+
+    if ([_delegate respondsToSelector:@selector(browser:selectionIndexesForProposedSelection:inColumn:)])
+        _implementedDelegateMethods |= CPBrowserDelegate_browser_selectionIndexesForProposedSelection_inColumn_;
+
+    if ([_delegate respondsToSelector:@selector(browser:numberOfChildrenOfItem:)])
+        _implementedDelegateMethods |= CPBrowserDelegate_browser_numberOfChildrenOfItem_;
+
+    if ([_delegate respondsToSelector:@selector(browser:draggingViewForRowsWithIndexes:inColumn:withEvent:offset:)])
+        _implementedDelegateMethods |= CPBrowserDelegate_browser_draggingViewForRowsWithIndexes_inColumn_withEvent_offset_;
+
+    if ([_delegate respondsToSelector:@selector(browser:child:ofItem:)])
+        _implementedDelegateMethods |= CPBrowserDelegate_browser_child_ofItem_;
+
+    if ([_delegate respondsToSelector:@selector(browser:objectValueForItem:)])
+        _implementedDelegateMethods |= CPBrowserDelegate_browser_objectValueForItem_;
+
+    if ([_delegate respondsToSelector:@selector(rootItemForBrowser:)])
+        _implementedDelegateMethods |= CPBrowserDelegate_rootItemForBrowser_;
+
+    if ([_delegate respondsToSelector:@selector(browser:didChangeLastColumn:toColumn:)])
+        _implementedDelegateMethods |= CPBrowserDelegate_browser_didChangeLastColumn_toColumn_;
+
+    if ([_delegate respondsToSelector:@selector(browser:didChangeLastColumn:)])
+        _implementedDelegateMethods |= CPBrowserDelegate_browser_didResizeColumn_;
+
+    if ([_delegate respondsToSelector:@selector(browserSelectionIsChanging:)])
+        _implementedDelegateMethods |= CPBrowserDelegate_browserSelectionIsChanging_;
+
+    if ([_delegate respondsToSelector:@selector(browserSelectionDidChange:)])
+        _implementedDelegateMethods |= CPBrowserDelegate_browserSelectionDidChange_;
 
     [self loadColumnZero];
 }
@@ -162,16 +273,13 @@
 
 - (void)loadColumnZero
 {
-    if ([_delegate respondsToSelector:@selector(rootItemForBrowser:)])
-        _rootItem = [_delegate rootItemForBrowser:self];
-    else
-        _rootItem = nil;
+    _rootItem = [self _sendDelegateRootItemForBrowser];
 
     [self setLastColumn:-1];
     [self addColumn];
 }
 
-- (void)setLastColumn:(int)columnIndex
+- (void)setLastColumn:(CPInteger)columnIndex
 {
     if (columnIndex >= _tableViews.length)
         return;
@@ -181,7 +289,7 @@
 
     if (columnIndex > 0)
         [_tableViews[columnIndex - 1] setNeedsDisplay:YES];
-        
+
     [_tableViews[columnIndex] setNeedsDisplay:YES];
 
     [[_tableViews.slice(indexPlusOne) valueForKey:"enclosingScrollView"]
@@ -190,8 +298,7 @@
     _tableViews = _tableViews.slice(0, indexPlusOne);
     _tableDelegates = _tableDelegates.slice(0, indexPlusOne);
 
-    if ([_delegate respondsToSelector:@selector(browser:didChangeLastColumn:toColumn:)])
-        [_delegate browser:self didChangeLastColumn:oldValue toColumn:columnIndex];
+    [self _sendDelegateBrowserDidChangeLastColumn:oldValue toColumn:columnIndex];
 
     [self tile];
 }
@@ -291,7 +398,7 @@
     [aTableView addTableColumn:column];
 }
 
-- (void)reloadColumn:(int)column
+- (void)reloadColumn:(CPInteger)column
 {
     [[self tableViewInColumn:column] reloadData];
 }
@@ -359,17 +466,17 @@
 
 // ITEMS
 
-- (id)itemAtRow:(int)row inColumn:(int)column
+- (id)itemAtRow:(CPInteger)row inColumn:(CPInteger)column
 {
     return [_tableDelegates[column] childAtIndex:row];
 }
 
 - (BOOL)isLeafItem:(id)item
 {
-    return [_delegate respondsToSelector:@selector(browser:isLeafItem:)] && [_delegate browser:self isLeafItem:item];
+    return (_implementedDelegateMethods & CPBrowserDelegate_browser_isLeafItem_) && [_delegate browser:self isLeafItem:item];
 }
 
-- (id)parentForItemsInColumn:(int)column
+- (id)parentForItemsInColumn:(CPInteger)column
 {
     return [_tableDelegates[column] _item];
 }
@@ -493,9 +600,7 @@
 {
     _columnWidths[column] = aWidth;
 
-    if ([_delegate respondsToSelector:@selector(browser:didResizeColumn:)])
-        [_delegate browser:self didResizeColumn:column];
-
+    [self _sendDelegateBrowserDidResizeColumn:column];
     [self tile];
 }
 
@@ -610,15 +715,12 @@
     if (column < 0 || column > [self lastColumn] + 1)
         return;
 
-    if ([_delegate respondsToSelector:@selector(browser:selectionIndexesForProposedSelection:inColumn:)])
-        indexSet = [_delegate browser:self selectionIndexesForProposedSelection:indexSet inColumn:column];
+    indexSet = [self _sendDelegateBrowserSelectionIndexesForProposedSelection:indexSet inColumn:column];
 
-    if ([_delegate respondsToSelector:@selector(browser:shouldSelectRowIndexes:inColumn:)] &&
-       ![_delegate browser:self shouldSelectRowIndexes:indexSet inColumn:column])
+    if (![self _sendDelegateBrowserShouldSelectRowIndexes:indexSet inColumn:column])
         return;
 
-    if ([_delegate respondsToSelector:@selector(browserSelectionIsChanging:)])
-        [_delegate browserSelectionIsChanging:self];
+    [self _sendDelegateBrowserSelectionIsChanging];
 
     if (column > [self lastColumn])
         [self addColumn];
@@ -629,8 +731,7 @@
 
     [self scrollColumnToVisible:column];
 
-    if ([_delegate respondsToSelector:@selector(browserSelectionDidChange:)])
-        [_delegate browserSelectionDidChange:self];
+    [self _sendDelegateBrowserSelectionDidChange];
 }
 
 - (void)setBackgroundColor:(CPColor)aColor
@@ -652,30 +753,6 @@
     [_tableViews makeObjectsPerformSelector:@selector(registerForDraggedTypes:) withObject:types];
 }
 
-- (BOOL)canDragRowsWithIndexes:(CPIndexSet)rowIndexes inColumn:(int)columnIndex withEvent:(CPEvent)dragEvent
-{
-    if ([_delegate respondsToSelector:@selector(browser:canDragRowsWithIndexes:inColumn:withEvent:)])
-        return [_delegate browser:self canDragRowsWithIndexes:rowIndexes inColumn:columnIndex withEvent:dragEvent];
-
-    return YES;
-}
-
-- (CPImage)draggingImageForRowsWithIndexes:(CPIndexSet)rowIndexes inColumn:(int)columnIndex withEvent:(CPEvent)dragEvent offset:(CGPoint)dragImageOffset
-{
-    if ([_delegate respondsToSelector:@selector(browser:draggingImageForRowsWithIndexes:inColumn:withEvent:offset:)])
-        return [_delegate browser:self draggingImageForRowsWithIndexes:rowIndexes inColumn:columnIndex withEvent:dragEvent offset:dragImageOffset];
-
-    return nil;
-}
-
-- (CPView)draggingViewForRowsWithIndexes:(CPIndexSet)rowIndexes inColumn:(int)columnIndex withEvent:(CPEvent)dragEvent offset:(CGPoint)dragImageOffset
-{
-    if ([_delegate respondsToSelector:@selector(browser:draggingViewForRowsWithIndexes:inColumn:withEvent:offset:)])
-        return [_delegate browser:self draggingViewForRowsWithIndexes:rowIndexes inColumn:columnIndex withEvent:dragEvent offset:dragImageOffset];
-
-    return nil;
-}
-
 @end
 
 @implementation CPBrowser (CPCoding)
@@ -771,7 +848,7 @@
     CPBrowser                _browser @accessors;
 }
 
-- (void)initWithFrame:(CGRect)aFrame
+- (id)initWithFrame:(CGRect)aFrame
 {
     if (self = [super initWithFrame:aFrame])
     {
@@ -860,8 +937,6 @@
 
 @end
 
-@import <Foundation/CPObject.j>
-
 @implementation _CPBrowserTableDelegate : CPObject
 {
     CPBrowser   _browser @accessors;
@@ -902,22 +977,22 @@
     [_browser selectRowIndexes:selectedIndexes inColumn:_index];
 }
 
-- (id)childAtIndex:(unsigned)index
+- (id)childAtIndex:(CPUInteger)index
 {
     return [_delegate browser:_browser child:index ofItem:_item];
 }
 
-- (BOOL)tableView:(CPTableView)aTableView acceptDrop:(id)info row:(int)row dropOperation:(CPTableViewDropOperation)operation
+- (BOOL)tableView:(CPTableView)aTableView acceptDrop:(id)info row:(CPInteger)row dropOperation:(CPTableViewDropOperation)operation
 {
-    if ([_delegate respondsToSelector:@selector(browser:acceptDrop:atRow:column:dropOperation:)])
+    if (_browser._implementedDelegateMethods & CPBrowserDelegate_browser_acceptDrop_atRow_column_dropOperation_)
         return [_delegate browser:_browser acceptDrop:info atRow:row column:_index dropOperation:operation];
     else
         return NO;
 }
 
-- (CPDragOperation)tableView:(CPTableView)aTableView validateDrop:(id)info proposedRow:(int)row proposedDropOperation:(CPTableViewDropOperation)operation
+- (CPDragOperation)tableView:(CPTableView)aTableView validateDrop:(id)info proposedRow:(CPInteger)row proposedDropOperation:(CPTableViewDropOperation)operation
 {
-    if ([_delegate respondsToSelector:@selector(browser:validateDrop:proposedRow:column:dropOperation:)])
+    if (_browser._implementedDelegateMethods & CPBrowserDelegate_browser_validateDrop_proposedRow_column_dropOperation_)
         return [_delegate browser:_browser validateDrop:info proposedRow:row column:_index dropOperation:operation];
     else
         return CPDragOperationNone;
@@ -925,7 +1000,7 @@
 
 - (BOOL)tableView:(CPTableView)aTableView writeRowsWithIndexes:(CPIndexSet)rowIndexes toPasteboard:(CPPasteboard)pboard
 {
-    if ([_delegate respondsToSelector:@selector(browser:writeRowsWithIndexes:inColumn:toPasteboard:)])
+    if (_browser._implementedDelegateMethods & CPBrowserDelegate_browser_writeRowsWithIndexes_inColumn_toPasteboard_)
         return [_delegate browser:_browser writeRowsWithIndexes:rowIndexes inColumn:_index toPasteboard:pboard];
     else
         return NO;
@@ -980,7 +1055,7 @@
     var imageView = [self layoutEphemeralSubviewNamed:@"image-view"
                                            positioned:CPWindowAbove
                       relativeToEphemeralSubviewNamed:nil],
-        isHighlighted = [self themeState] & CPThemeStateSelectedDataView;
+        isHighlighted = [self hasThemeState:CPThemeStateSelectedDataView];
 
     [imageView setImage: _isLeaf ? (isHighlighted ? _highlightedBranchImage : _branchImage) : nil];
     [imageView setImageScaling:CPImageScaleNone];
@@ -995,7 +1070,7 @@
     [aCoder encodeObject:_highlightedBranchImage forKey:"_CPBrowserLeafViewHighlightedBranchImageKey"];
 }
 
-- (void)initWithCoder:(CPCoder)aCoder
+- (id)initWithCoder:(CPCoder)aCoder
 {
     if (self = [super initWithCoder:aCoder])
     {
@@ -1008,3 +1083,115 @@
 }
 
 @end
+
+@implementation CPBrowser (CPBrowserDelegate)
+
+/*!
+    @ignore
+    Call delegate rootItemForBrowser:
+*/
+- (id)_sendDelegateRootItemForBrowser
+{
+    if (!(_implementedDelegateMethods & CPBrowserDelegate_rootItemForBrowser_))
+        return nil;
+
+    return [_delegate rootItemForBrowser:self];
+}
+
+/*!
+    @ignore
+    Call delegate browser:didChangeLastColumn:toColumn:
+*/
+- (void)_sendDelegateBrowserDidChangeLastColumn:(CPInteger)lastColumn toColumn:(CPInteger)newColumn
+{
+    if (!(_implementedDelegateMethods & CPBrowserDelegate_browser_didChangeLastColumn_toColumn_))
+        return;
+
+    [_delegate browser:self didChangeLastColumn:lastColumn toColumn:newColumn];
+}
+
+/*!
+    @ignore
+    Call delegate browser:didResizeColumn:
+*/
+- (void)_sendDelegateBrowserDidResizeColumn:(CPInteger)column
+{
+    if (!(_implementedDelegateMethods & CPBrowserDelegate_browser_didResizeColumn_))
+        return;
+
+    [_delegate browser:self didResizeColumn:column];
+}
+
+/*!
+    @ignore
+    Call delegate browserSelectionIsChanging:
+*/
+- (void)_sendDelegateBrowserSelectionIsChanging
+{
+    if (!(_implementedDelegateMethods & CPBrowserDelegate_browserSelectionIsChanging_))
+        return;
+
+    [_delegate browserSelectionIsChanging:self];
+}
+
+/*!
+    @ignore
+    Call delegate browser:shouldSelectRowIndexes:inColumn:
+*/
+- (BOOL)_sendDelegateBrowserShouldSelectRowIndexes:(CPIndexSet)anIndexSet inColumn:(CPInteger)aColumn
+{
+    if (!(_implementedDelegateMethods & CPBrowserDelegate_browser_shouldSelectRowIndexes_inColumn_))
+        return YES;
+
+    return [_delegate browser:self shouldSelectRowIndexes:anIndexSet inColumn:aColumn];
+}
+
+/*!
+    @ignore
+    Call delegate browser:selectionIndexesForProposedSelection:inColumn:
+*/
+- (CPIndexSet)_sendDelegateBrowserSelectionIndexesForProposedSelection:(CPIndexSet)anIndexSet inColumn:(CPInteger)aColumn
+{
+    if (!(_implementedDelegateMethods & CPBrowserDelegate_browser_selectionIndexesForProposedSelection_inColumn_))
+        return anIndexSet;
+
+    return [_delegate browser:self selectionIndexesForProposedSelection:anIndexSet inColumn:aColumn];
+}
+
+/*!
+    @ignore
+    Call delegate browserSelectionDidChange
+*/
+- (void)_sendDelegateBrowserSelectionDidChange
+{
+    if (!(_implementedDelegateMethods & CPBrowserDelegate_browserSelectionDidChange_))
+        return;
+
+    [_delegate browserSelectionDidChange:self];
+}
+
+- (BOOL)canDragRowsWithIndexes:(CPIndexSet)rowIndexes inColumn:(CPInteger)columnIndex withEvent:(CPEvent)dragEvent
+{
+    if (_implementedDelegateMethods & CPBrowserDelegate_browser_canDragRowsWithIndexes_inColumn_withEvent_)
+        return [_delegate browser:self canDragRowsWithIndexes:rowIndexes inColumn:columnIndex withEvent:dragEvent];
+
+    return YES;
+}
+
+- (CPImage)draggingImageForRowsWithIndexes:(CPIndexSet)rowIndexes inColumn:(CPInteger)columnIndex withEvent:(CPEvent)dragEvent offset:(CGPoint)dragImageOffset
+{
+    if (_implementedDelegateMethods & CPBrowserDelegate_browser_draggingImageForRowsWithIndexes_inColumn_withEvent_offset_)
+        return [_delegate browser:self draggingImageForRowsWithIndexes:rowIndexes inColumn:columnIndex withEvent:dragEvent offset:dragImageOffset];
+
+    return nil;
+}
+
+- (CPView)draggingViewForRowsWithIndexes:(CPIndexSet)rowIndexes inColumn:(CPInteger)columnIndex withEvent:(CPEvent)dragEvent offset:(CGPoint)dragImageOffset
+{
+    if (_implementedDelegateMethods & CPBrowserDelegate_browser_draggingViewForRowsWithIndexes_inColumn_withEvent_offset_)
+        return [_delegate browser:self draggingViewForRowsWithIndexes:rowIndexes inColumn:columnIndex withEvent:dragEvent offset:dragImageOffset];
+
+    return nil;
+}
+
+@end

AppKit/CPButton.j

@@ -29,8 +29,7 @@
 @import "CPWindow_Constants.j"
 
 /* @group CPBezelStyle */
-
-                                       // IB style
+@typedef CPBezelStyle
 CPRoundedBezelStyle             = 1;   // Push
 CPRegularSquareBezelStyle       = 2;   // Bevel
 CPThickSquareBezelStyle         = 3;
@@ -49,6 +48,7 @@ CPHUDBezelStyle                 = -1;
 
 
 /* @group CPButtonType */
+@typedef CPButtonType
 CPMomentaryLightButton  = 0;
 CPPushOnPushOffButton   = 1;
 CPToggleButton          = 2;
@@ -72,13 +72,14 @@ CPPushInCellMask            = CPPushInButtonMask;
 CPChangeGrayCellMask        = CPGrayButtonMask;
 CPChangeBackgroundCellMask  = CPBackgroundButtonMask;
 
-CPButtonStateMixed             = CPThemeState("mixed");
-CPButtonStateBezelStyleRounded = CPThemeState("rounded");
+CPButtonStateMixed                  = CPThemeState("mixed");
+CPButtonStateBezelStyleRounded      = CPThemeState("rounded");
+CPButtonStateBezelStyleRoundRect    = CPThemeState("roundRect");
 
 // add all future correspondance between bezel styles and theme state here.
 var CPButtonBezelStyleStateMap = @{
         CPRoundedBezelStyle: CPButtonStateBezelStyleRounded,
-        CPRoundRectBezelStyle: [CPNull null],
+        CPRoundRectBezelStyle: CPButtonStateBezelStyleRoundRect,
     };
 
 /// @cond IGNORE
@@ -107,7 +108,6 @@ CPButtonImageOffset   = 3.0;
 
     // NS-style Display Properties
     CPBezelStyle        _bezelStyle;
-    CPControlSize       _controlSize;
 
     CPString            _keyEquivalent;
     unsigned            _keyEquivalentModifierMask;
@@ -149,7 +149,7 @@ CPButtonImageOffset   = 3.0;
     return @"button";
 }
 
-+ (id)themeAttributes
++ (CPDictionary)themeAttributes
 {
     return @{
             @"image": [CPNull null],
@@ -188,8 +188,6 @@ CPButtonImageOffset   = 3.0;
 
 - (void)_init
 {
-    _controlSize = CPRegularControlSize;
-
     _keyEquivalent = @"";
     _keyEquivalentModifierMask = 0;
 
@@ -200,6 +198,20 @@ CPButtonImageOffset   = 3.0;
     [self setButtonType:CPMomentaryPushInButton];
 }
 
+#pragma mark -
+#pragma mark Control Size
+
+- (void)setControlSize:(CPControlSize)aControlSize
+{
+    [super setControlSize:aControlSize];
+
+    if ([self isBordered])
+        [self _sizeToControlSize];
+}
+
+
+#pragma mark -
+
 // Setting the state
 /*!
     Returns a Boolean value indicating whether the button allows a mixed state.
@@ -268,7 +280,7 @@ CPButtonImageOffset   = 3.0;
             break;
 
         case CPOffState:
-            [self unsetThemeState:CPThemeStateSelected | CPButtonStateMixed | CPThemeStateHighlighted];
+            [self unsetThemeState:[CPThemeStateSelected, CPButtonStateMixed, CPThemeStateHighlighted]];
     }
 }
 
@@ -292,7 +304,7 @@ CPButtonImageOffset   = 3.0;
 }
 
 /*!
-    Sets the button's next state to \c aState.
+    Sets the button's state to the next available state.
     @param aState Possible states are any of the CPButton globals:
     \c CPOffState, \c CPOnState, \c CPMixedState
 */
@@ -448,38 +460,47 @@ CPButtonImageOffset   = 3.0;
 {
     switch (aButtonType)
     {
-        case CPMomentaryLightButton:    [self setHighlightsBy:CPChangeGrayCellMask | CPChangeBackgroundCellMask];
-                                        [self setShowsStateBy:CPNoCellMask];
-                                        break;
+        case CPMomentaryLightButton:
+            [self setHighlightsBy:CPChangeGrayCellMask | CPChangeBackgroundCellMask];
+            [self setShowsStateBy:CPNoCellMask];
+            break;
 
-        case CPMomentaryPushInButton:   [self setHighlightsBy:CPPushInCellMask | CPChangeGrayCellMask | CPChangeBackgroundCellMask];
-                                        [self setShowsStateBy:CPNoCellMask];
-                                        break;
+        case CPMomentaryPushInButton:
+            [self setHighlightsBy:CPPushInCellMask | CPChangeGrayCellMask | CPChangeBackgroundCellMask];
+            [self setShowsStateBy:CPNoCellMask];
+            break;
 
-        case CPMomentaryChangeButton:   [self setHighlightsBy:CPContentsCellMask];
-                                        [self setShowsStateBy:CPNoCellMask];
-                                        break;
+        case CPMomentaryChangeButton:
+            [self setHighlightsBy:CPContentsCellMask];
+            [self setShowsStateBy:CPNoCellMask];
+            break;
 
-        case CPPushOnPushOffButton:     [self setHighlightsBy:CPPushInCellMask | CPChangeGrayCellMask | CPChangeBackgroundCellMask];
-                                        [self setShowsStateBy:CPChangeBackgroundCellMask | CPChangeGrayCellMask];
-                                        break;
+        case CPPushOnPushOffButton:
+            [self setHighlightsBy:CPPushInCellMask | CPChangeGrayCellMask | CPChangeBackgroundCellMask];
+            [self setShowsStateBy:CPChangeBackgroundCellMask | CPChangeGrayCellMask];
+            break;
 
-        case CPOnOffButton:             [self setHighlightsBy:CPChangeGrayCellMask | CPChangeBackgroundCellMask];
-                                        [self setShowsStateBy:CPChangeGrayCellMask | CPChangeBackgroundCellMask];
-                                        break;
+        case CPOnOffButton:
+            [self setHighlightsBy:CPChangeGrayCellMask | CPChangeBackgroundCellMask];
+            [self setShowsStateBy:CPChangeGrayCellMask | CPChangeBackgroundCellMask];
+            break;
 
-        case CPToggleButton:            [self setHighlightsBy:CPPushInCellMask | CPContentsCellMask];
-                                        [self setShowsStateBy:CPContentsCellMask];
-                                        break;
+        case CPToggleButton:
+            [self setHighlightsBy:CPPushInCellMask | CPContentsCellMask];
+            [self setShowsStateBy:CPContentsCellMask];
+            break;
 
-        case CPSwitchButton:            [CPException raise:CPInvalidArgumentException
-                                                    reason:"The CPSwitchButton type is not supported in Cappuccino, use the CPCheckBox class instead."];
+        case CPSwitchButton:
+            [CPException raise:CPInvalidArgumentException
+                        reason:"The CPSwitchButton type is not supported in Cappuccino, use the CPCheckBox class instead."];
 
-        case CPRadioButton:             [CPException raise:CPInvalidArgumentException
-                                                    reason:"The CPRadioButton type is not supported in Cappuccino, use the CPRadio class instead."];
+        case CPRadioButton:
+            [CPException raise:CPInvalidArgumentException
+                        reason:"The CPRadioButton type is not supported in Cappuccino, use the CPRadio class instead."];
 
-        default:                        [CPException raise:CPInvalidArgumentException
-                                                    reason:"Unknown button type."];
+        default:
+            [CPException raise:CPInvalidArgumentException
+                        reason:"Unknown button type."];
     }
 
     [self setImageDimsWhenDisabled:YES];
@@ -644,10 +665,10 @@ CPButtonImageOffset   = 3.0;
 */
 - (void)sizeToFit
 {
-    [self layoutSubviews];
-
     [self setFrameSize:[self _minimumFrameSize]];
 
+    [self layoutSubviews];
+
     if ([self ephemeralSubviewNamed:@"content-view"])
         [self layoutSubviews];
 }

AppKit/CPButtonBar.j

@@ -26,7 +26,10 @@
 @class CPSplitView
 
 @global CPPopUpButtonStatePullsDown
-
+@global CPKeyValueChangeOldKey
+@global CPKeyValueChangeNewKey
+@global CPKeyValueObservingOptionNew
+@global CPKeyValueObservingOptionOld
 
 @implementation CPButtonBar : CPView
 {
@@ -79,7 +82,7 @@
     return @"button-bar";
 }
 
-+ (id)themeAttributes
++ (CPDictionary)themeAttributes
 {
     return @{
             @"resize-control-inset": CGInsetMake(0.0, 0.0, 0.0, 0.0),
@@ -129,10 +132,20 @@
 
 - (void)setButtons:(CPArray)buttons
 {
+    for (var i = [_buttons count] - 1; i >= 0; i--)
+    {
+        [_buttons[i] removeFromSuperview];
+        [_buttons[i] removeObserver:self forKeyPath:@"hidden"];
+    }
+
+
     _buttons = [CPArray arrayWithArray:buttons];
 
-    for (var i = 0, count = [_buttons count]; i < count; i++)
+    for (var i = [_buttons count] - 1; i >= 0; i--)
+    {
+        [_buttons[i] addObserver:self forKeyPath:@"hidden" options:CPKeyValueObservingOptionNew | CPKeyValueObservingOptionOld context:nil];
         [_buttons[i] setBordered:YES];
+    }
 
     [self setNeedsLayout];
 }
@@ -218,8 +231,15 @@
         count = [buttonsNotHidden count];
 
     while (count--)
-        if ([buttonsNotHidden[count] isHidden])
-            [buttonsNotHidden removeObject:buttonsNotHidden[count]];
+    {
+        var button = buttonsNotHidden[count];
+
+        if ([button isHidden])
+        {
+            [button removeFromSuperview];
+            [buttonsNotHidden removeObject:button];
+        }
+    }
 
     var currentButtonOffset = _resizeControlIsLeftAligned ? CGRectGetMaxX([self bounds]) + 1 : -1,
         bounds = [self bounds],
@@ -250,15 +270,15 @@
             currentButtonOffset += width - 1;
         }
 
-        [button setValue:normalColor forThemeAttribute:@"bezel-color" inState:CPThemeStateNormal | CPThemeStateBordered];
-        [button setValue:highlightedColor forThemeAttribute:@"bezel-color" inState:CPThemeStateHighlighted | CPThemeStateBordered];
-        [button setValue:disabledColor forThemeAttribute:@"bezel-color" inState:CPThemeStateDisabled | CPThemeStateBordered];
+        [button setValue:normalColor forThemeAttribute:@"bezel-color" inState:[CPThemeStateNormal, CPThemeStateBordered]];
+        [button setValue:highlightedColor forThemeAttribute:@"bezel-color" inState:[CPThemeStateHighlighted,  CPThemeStateBordered, ]];
+        [button setValue:disabledColor forThemeAttribute:@"bezel-color" inState:[CPThemeStateDisabled, CPThemeStateBordered]];
         [button setValue:textColor forThemeAttribute:@"text-color" inState:CPThemeStateBordered];
 
         // FIXME shouldn't need this
-        [button setValue:normalColor forThemeAttribute:@"bezel-color" inState:CPThemeStateNormal | CPThemeStateBordered | CPPopUpButtonStatePullsDown];
-        [button setValue:highlightedColor forThemeAttribute:@"bezel-color" inState:CPThemeStateHighlighted | CPThemeStateBordered | CPPopUpButtonStatePullsDown];
-        [button setValue:disabledColor forThemeAttribute:@"bezel-color" inState:CPThemeStateDisabled | CPThemeStateBordered | CPPopUpButtonStatePullsDown];
+        [button setValue:normalColor forThemeAttribute:@"bezel-color" inState:[CPThemeStateNormal, CPThemeStateBordered, CPPopUpButtonStatePullsDown]];
+        [button setValue:highlightedColor forThemeAttribute:@"bezel-color" inState:[CPThemeStateHighlighted, CPThemeStateBordered, CPPopUpButtonStatePullsDown]];
+        [button setValue:disabledColor forThemeAttribute:@"bezel-color" inState:[CPThemeStateDisabled, CPThemeStateBordered, CPPopUpButtonStatePullsDown]];
 
         [self addSubview:button];
     }
@@ -274,6 +294,14 @@
     }
 }
 
+- (void)observeValueForKeyPath:(CPString)keyPath ofObject:(id)object change:(CPDictionary)change context:(id)context
+{
+    if ([change objectForKey:CPKeyValueChangeOldKey] == [change objectForKey:CPKeyValueChangeNewKey])
+        return;
+
+    [self setNeedsLayout];
+}
+
 - (void)setFrameSize:(CGSize)aSize
 {
     [super setFrameSize:aSize];

AppKit/CPCheckBox.j

@@ -111,6 +111,30 @@ CPCheckBoxImageOffset = 4.0;
     return startedTracking;
 }
 
+
+#pragma mark -
+#pragma mark Override methods from CPButton
+
+- (CGSize)_minimumFrameSize
+{
+    var size = [super _minimumFrameSize],
+        contentView = [self ephemeralSubviewNamed:@"content-view"];
+
+    if (!contentView && [[self title] length])
+    {
+        var minSize = [self currentValueForThemeAttribute:@"min-size"],
+            maxSize = [self currentValueForThemeAttribute:@"max-size"];
+
+        // Here we always add the min size to the control which is the size of the view of the checkBox
+        size.width += minSize.width + CPCheckBoxImageOffset;
+
+        if (maxSize.width >= 0.0)
+            size.width = MIN(size.width, maxSize.width);
+    }
+
+    return size;
+}
+
 @end
 
 @implementation _CPCheckBoxValueBinder : CPBinder

AppKit/CPClipView.j

@@ -46,49 +46,12 @@
         return;
 
     if (_documentView)
-    {
-        var defaultCenter = [CPNotificationCenter defaultCenter];
-
-        [defaultCenter
-            removeObserver:self
-                      name:CPViewFrameDidChangeNotification
-                    object:_documentView];
-
-        [defaultCenter
-            removeObserver:self
-                      name:CPViewBoundsDidChangeNotification
-                    object:_documentView];
-
         [_documentView removeFromSuperview];
-    }
 
     _documentView = aView;
 
     if (_documentView)
-    {
         [self addSubview:_documentView];
-        [self _observeDocumentView];
-    }
-}
-
-- (void)_observeDocumentView
-{
-    var defaultCenter = [CPNotificationCenter defaultCenter];
-
-    [_documentView setPostsFrameChangedNotifications:YES];
-    [_documentView setPostsBoundsChangedNotifications:YES];
-
-    [defaultCenter
-        addObserver:self
-           selector:@selector(viewFrameChanged:)
-               name:CPViewFrameDidChangeNotification
-             object:_documentView];
-
-    [defaultCenter
-        addObserver:self
-           selector:@selector(viewBoundsChanged:)
-               name:CPViewBoundsDidChangeNotification
-             object:_documentView];
 }
 
 /*!
@@ -230,6 +193,11 @@
     return [self scrollToPoint:CGPointMake(bounds.origin.x - deltaX, bounds.origin.y - deltaY)];
 }
 
+- (CGRect)documentVisibleRect
+{
+    return [self convertRect:[self bounds] fromView:_documentView];
+}
+
 @end
 
 
@@ -244,7 +212,6 @@ var CPClipViewDocumentViewKey = @"CPScrollViewDocumentView";
         // Don't call setDocumentView: here. It calls addSubview:, but it's A) not necessary since the
         // view hierarchy is fully encoded and B) dangerous if the subview is not fully decoded.
         _documentView = [aCoder decodeObjectForKey:CPClipViewDocumentViewKey];
-        [self _observeDocumentView];
     }
 
     return self;

AppKit/CPCollectionView.j

@@ -32,6 +32,34 @@
 @import "CPPasteboard.j"
 @import "CPView.j"
 
+@class _CPCollectionViewDropIndicator
+
+var CPCollectionViewDelegate_collectionView_acceptDrop_index_dropOperation_                 = 1 << 0,
+    CPCollectionViewDelegate_collectionView_canDragItemsAtIndexes_withEvent_                = 1 << 1,
+    CPCollectionViewDelegate_collectionView_writeItemsAtIndexes_toPasteboard_               = 1 << 2,
+    CPCollectionViewDelegate_collectionView_dragTypesForItemsAtIndexes_                     = 1 << 3,
+    CPCollectionViewDelegate_collectionView_dataForItemsAtIndexes_forType_                  = 1 << 4,
+    CPCollectionViewDelegate_collectionView_validateDrop_proposedIndex_dropOperation_       = 1 << 5,
+    CPCollectionViewDelegate_collectionView_didDoubleClickOnItemAtIndex_                    = 1 << 6,
+    CPCollectionViewDelegate_collectionView_menuForItemAtIndex_                             = 1 << 7,
+    CPCollectionViewDelegate_collectionView_draggingViewForItemsAtIndexes_withEvent_offset  = 1 << 8;
+
+
+@protocol CPCollectionViewDelegate <CPObject>
+
+@optional
+- (BOOL)collectionView:(CPCollectionView)collectionView acceptDrop:(id)draggingInfo index:(CPInteger)index dropOperation:(CPCollectionViewDropOperation)dropOperation;
+- (BOOL)collectionView:(CPCollectionView)collectionView canDragItemsAtIndexes:(CPIndexSet)indexes withEvent:(CPEvent)event;
+- (BOOL)collectionView:(CPCollectionView)collectionView writeItemsAtIndexes:(CPIndexSet)indexes toPasteboard:(CPPasteboard)pasteboard;
+- (CPArray)collectionView:(CPCollectionView)collectionView dragTypesForItemsAtIndexes:(CPIndexSet)indexes;
+- (CPData)collectionView:(CPCollectionView)collectionView dataForItemsAtIndexes:(CPIndexSet)indices forType:(CPString)aType;
+- (CPDragOperation)collectionView:(CPCollectionView)collectionView validateDrop:(id)draggingInfo proposedIndex:(CPInteger)proposedDropIndex dropOperation:(CPCollectionViewDropOperation)proposedDropOperation;
+- (CPMenu)collectionView:(CPCollectionView)collectionView menuForItemAtIndex:(CPInteger)anIndex;
+- (CPView)collectionView:(CPCollectionView)collectionView dragginViewForItemsAtIndexes:(CPIndexSet)indexes withEvent:(CPEvent)event offset:(CGPoint)dragImageOffset;
+- (void)collectionView:(CPCollectionView)collectionView didDoubleClickOnItemAtIndex:(int)index;
+
+@end
+
 /*!
     @ingroup appkit
     @class CPCollectionView
@@ -42,10 +70,6 @@
 
     @par Delegate Methods
 
-    @delegate - (void)collectionViewDidChangeSelection:(CPCollectionView)collectionView;
-    DEPRECATED: Please do not use.
-    @param collectionView the collection view who's selection changed
-
     @delegate - (void)collectionView:(CPCollectionView)collectionView didDoubleClickOnItemAtIndex:(int)index;
     Called when the user double-clicks on an item in the collection view.
     @param collectionView the collection view that received the double-click
@@ -69,51 +93,52 @@ var HORIZONTAL_MARGIN = 2;
 
 @implementation CPCollectionView : CPView
 {
-    CPArray                 _content;
-    CPArray                 _items;
+    CPArray                         _content;
+    CPArray                         _items;
 
-    CPData                  _itemData;
-    CPCollectionViewItem    _itemPrototype;
-    CPCollectionViewItem    _itemForDragging;
-    CPMutableArray          _cachedItems;
+    CPData                          _itemData;
+    CPCollectionViewItem            _itemPrototype;
+    CPCollectionViewItem            _itemForDragging;
+    CPMutableArray                  _cachedItems;
 
-    unsigned                _maxNumberOfRows;
-    unsigned                _maxNumberOfColumns;
+    unsigned                        _maxNumberOfRows;
+    unsigned                        _maxNumberOfColumns;
 
-    CGSize                  _minItemSize;
-    CGSize                  _maxItemSize;
+    CGSize                          _minItemSize;
+    CGSize                          _maxItemSize;
 
-    CPArray                 _backgroundColors;
+    CPArray                         _backgroundColors;
 
-    float                   _tileWidth;
+    float                           _tileWidth;
 
-    BOOL                    _isSelectable;
-    BOOL                    _allowsMultipleSelection;
-    BOOL                    _allowsEmptySelection;
-    CPIndexSet              _selectionIndexes;
+    BOOL                            _isSelectable;
+    BOOL                            _allowsMultipleSelection;
+    BOOL                            _allowsEmptySelection;
+    CPIndexSet                      _selectionIndexes;
 
-    CGSize                  _itemSize;
+    CGSize                          _itemSize;
 
-    float                   _horizontalMargin;
-    float                   _verticalMargin;
+    float                           _horizontalMargin;
+    float                           _verticalMargin;
 
-    unsigned                _numberOfRows;
-    unsigned                _numberOfColumns;
+    unsigned                        _numberOfRows;
+    unsigned                        _numberOfColumns;
 
-    id                      _delegate;
+    id <CPCollectionViewDelegate>   _delegate;
+    unsigned                        _implementedDelegateMethods;
 
-    CPEvent                 _mouseDownEvent;
+    CPEvent                         _mouseDownEvent;
 
-    BOOL                    _needsMinMaxItemSizeUpdate;
-    CGSize                  _storedFrameSize;
+    BOOL                            _needsMinMaxItemSizeUpdate;
+    CGSize                          _storedFrameSize;
 
-    BOOL                    _uniformSubviewsResizing @accessors(property=uniformSubviewsResizing);
-    BOOL                    _lockResizing;
+    BOOL                            _uniformSubviewsResizing @accessors(property=uniformSubviewsResizing);
+    BOOL                            _lockResizing;
 
-    CPInteger               _currentDropIndex;
-    CPDragOperation         _currentDragOperation;
+    CPInteger                       _currentDropIndex;
+    CPDragOperation                 _currentDragOperation;
 
-    _CPCollectionViewDropIndicator _dropView;
+    _CPCollectionViewDropIndicator  _dropView;
 }
 
 - (id)initWithFrame:(CGRect)aFrame
@@ -168,6 +193,51 @@ var HORIZONTAL_MARGIN = 2;
     [self setAutoresizingMask:0];
 }
 
+
+
+#pragma mark -
+#pragma mark Delegate
+
+/*!
+    Set the delegate of the receiver
+    @param aDelegate the delegate object for the collectionView.
+*/
+- (void)setDelegate:(id <CPCollectionViewDelegate>)aDelegate
+{
+    if (_delegate === aDelegate)
+        return;
+
+    _delegate = aDelegate;
+    _implementedDelegateMethods = 0;
+
+    if ([_delegate respondsToSelector:@selector(collectionView:acceptDrop:index:dropOperation:)])
+        _implementedDelegateMethods |= CPCollectionViewDelegate_collectionView_acceptDrop_index_dropOperation_;
+
+    if ([_delegate respondsToSelector:@selector(collectionView:canDragItemsAtIndexes:withEvent:)])
+        _implementedDelegateMethods |= CPCollectionViewDelegate_collectionView_canDragItemsAtIndexes_withEvent_;
+
+    if ([_delegate respondsToSelector:@selector(collectionView:writeItemsAtIndexes:toPasteboard:)])
+        _implementedDelegateMethods |= CPCollectionViewDelegate_collectionView_writeItemsAtIndexes_toPasteboard_;
+
+    if ([_delegate respondsToSelector:@selector(collectionView:dragTypesForItemsAtIndexes:)])
+        _implementedDelegateMethods |= CPCollectionViewDelegate_collectionView_dragTypesForItemsAtIndexes_;
+
+    if ([_delegate respondsToSelector:@selector(collectionView:dataForItemsAtIndexes:forType:)])
+        _implementedDelegateMethods |= CPCollectionViewDelegate_collectionView_dataForItemsAtIndexes_forType_;
+
+    if ([_delegate respondsToSelector:@selector(collectionView:validateDrop:proposedIndex:dropOperation:)])
+        _implementedDelegateMethods |= CPCollectionViewDelegate_collectionView_validateDrop_proposedIndex_dropOperation_;
+
+    if ([_delegate respondsToSelector:@selector(collectionView:didDoubleClickOnItemAtIndex:)])
+        _implementedDelegateMethods |= CPCollectionViewDelegate_collectionView_didDoubleClickOnItemAtIndex_;
+
+    if ([_delegate respondsToSelector:@selector(collectionView:menuForItemAtIndex:)])
+        _implementedDelegateMethods |= CPCollectionViewDelegate_collectionView_menuForItemAtIndex_;
+
+    if ([_delegate respondsToSelector:@selector(collectionView:draggingViewForItemsAtIndexes:withEvent:offset:)])
+        _implementedDelegateMethods |= CPCollectionViewDelegate_collectionView_draggingViewForItemsAtIndexes_withEvent_offset;
+}
+
 /*!
     Sets the item prototype to \c anItem
     @param anItem the new item prototype.
@@ -395,12 +465,6 @@ var HORIZONTAL_MARGIN = 2;
 
     var binderClass = [[self class] _binderClassForBinding:@"selectionIndexes"];
     [[binderClass getBinding:@"selectionIndexes" forObject:self] reverseSetValueFor:@"selectionIndexes"];
-
-    if ([_delegate respondsToSelector:@selector(collectionViewDidChangeSelection:)])
-    {
-        CPLog.warn("The delegate method collectionViewDidChangeSelection: is deprecated and will be removed in a future version, please bind to selectionIndexes instead.");
-        [_delegate collectionViewDidChangeSelection:self];
-    }
 }
 
 /*!
@@ -455,12 +519,12 @@ var HORIZONTAL_MARGIN = 2;
     [self tileIfNeeded:NO];
 }
 
-- (void)resizeSubviewsWithOldSize:(CPSize)oldBoundsSize
+- (void)resizeSubviewsWithOldSize:(CGSize)oldBoundsSize
 {
     // Desactivate subviews autoresizing
 }
 
-- (void)resizeWithOldSuperviewSize:(CPSize)oldBoundsSize
+- (void)resizeWithOldSuperviewSize:(CGSize)oldBoundsSize
 {
     if (_lockResizing)
         return;
@@ -545,7 +609,7 @@ var HORIZONTAL_MARGIN = 2;
 
     height = MAX(height, numberOfRows * (_minItemSize.height + _verticalMargin));
 
-    var itemSizeHeight = FLOOR(height / numberOfRows);
+    var itemSizeHeight = FLOOR(height / numberOfRows) - _verticalMargin;
 
     if (maxItemSizeHeight > 0)
         itemSizeHeight = MIN(itemSizeHeight, maxItemSizeHeight);
@@ -755,8 +819,8 @@ var HORIZONTAL_MARGIN = 2;
 
 - (void)mouseUp:(CPEvent)anEvent
 {
-    if ([_selectionIndexes count] && [anEvent clickCount] == 2 && [_delegate respondsToSelector:@selector(collectionView:didDoubleClickOnItemAtIndex:)])
-        [_delegate collectionView:self didDoubleClickOnItemAtIndex:[_selectionIndexes firstIndex]];
+    if ([_selectionIndexes count] && [anEvent clickCount] == 2)
+        [self _sendDelegateDidDoubleClickOnItemAtIndex:[_selectionIndexes firstIndex]];
 }
 
 - (void)mouseDown:(CPEvent)anEvent
@@ -784,6 +848,10 @@ var HORIZONTAL_MARGIN = 2;
                 var firstSelectedIndex = [[self selectionIndexes] firstIndex],
                     newSelectedRange = nil;
 
+                // This catches the case where the shift key is held down for the first selection.
+                if (firstSelectedIndex === CPNotFound)
+                    firstSelectedIndex = index;
+
                 if (index < firstSelectedIndex)
                     newSelectedRange = CPMakeRange(index, (firstSelectedIndex - index) + 1);
                 else
@@ -826,7 +894,7 @@ var HORIZONTAL_MARGIN = 2;
     [self tile];
 }
 
-- (void)setUniformSubviewsResizing:(float)flag
+- (void)setUniformSubviewsResizing:(BOOL)flag
 {
     _uniformSubviewsResizing = flag;
     [self tileIfNeeded:NO];
@@ -842,15 +910,6 @@ var HORIZONTAL_MARGIN = 2;
     return _verticalMargin;
 }
 
-/*!
-    Sets the collection view's delegate
-    @param aDelegate the new delegate
-*/
-- (void)setDelegate:(id)aDelegate
-{
-    _delegate = aDelegate;
-}
-
 /*!
     Returns the collection view's delegate
 */
@@ -864,13 +923,13 @@ var HORIZONTAL_MARGIN = 2;
 */
 - (CPMenu)menuForEvent:(CPEvent)theEvent
 {
-    if (![[self delegate] respondsToSelector:@selector(collectionView:menuForItemAtIndex:)])
+    if (![self _delegateRespondsToCollectionViewMenuForItemAtIndex])
         return [super menuForEvent:theEvent];
 
     var location = [self convertPoint:[theEvent locationInWindow] fromView:nil],
         index = [self _indexAtPoint:location];
 
-    return [_delegate collectionView:self menuForItemAtIndex:index];
+    return [self _sendDelegateMenuForItemAtIndex:index];
 }
 
 - (int)_indexAtPoint:(CGPoint)thePoint
@@ -888,12 +947,12 @@ var HORIZONTAL_MARGIN = 2;
     return CPNotFound;
 }
 
-- (CPCollectionViewItem)itemAtIndex:(unsigned)anIndex
+- (CPCollectionViewItem)itemAtIndex:(CPUInteger)anIndex
 {
     return [_items objectAtIndex:anIndex];
 }
 
-- (CGRect)frameForItemAtIndex:(unsigned)anIndex
+- (CGRect)frameForItemAtIndex:(CPUInteger)anIndex
 {
     return [[[self itemAtIndex:anIndex] view] frame];
 }
@@ -928,7 +987,7 @@ var HORIZONTAL_MARGIN = 2;
 */
 - (void)pasteboard:(CPPasteboard)aPasteboard provideDataForType:(CPString)aType
 {
-    [aPasteboard setData:[_delegate collectionView:self dataForItemsAtIndexes:_selectionIndexes forType:aType] forType:aType];
+    [aPasteboard setData:[self _sendDelegateDataForItemsAtIndexes:_selectionIndexes forType:aType] forType:aType];
 }
 
 - (void)_createDropIndicatorIfNeeded
@@ -958,24 +1017,23 @@ var HORIZONTAL_MARGIN = 2;
         (ABS(locationInWindow.y - mouseDownLocationInWindow.y) < 3))
         return;
 
-    if (![_delegate respondsToSelector:@selector(collectionView:dragTypesForItemsAtIndexes:)])
+    if (![self _delegateRespondsToCollectionViewDragTypesForItemsAtIndexes])
         return;
 
     // If we don't have any selected items, we've clicked away, and thus the drag is meaningless.
     if (![_selectionIndexes count])
         return;
 
-    if ([_delegate respondsToSelector:@selector(collectionView:canDragItemsAtIndexes:withEvent:)] &&
-        ![_delegate collectionView:self canDragItemsAtIndexes:_selectionIndexes withEvent:_mouseDownEvent])
+    if (![self _sendDelegateCanDragItemsAtIndexes:_selectionIndexes withEvent:_mouseDownEvent])
         return;
 
     // Set up the pasteboard
-    var dragTypes = [_delegate collectionView:self dragTypesForItemsAtIndexes:_selectionIndexes];
+    var dragTypes = [self _sendDelegateDragTypesForItemsAtIndexes:_selectionIndexes];
 
     [[CPPasteboard pasteboardWithName:CPDragPboard] declareTypes:dragTypes owner:self];
 
     var dragImageOffset = CGSizeMakeZero(),
-        view = [self _draggingViewForItemsAtIndexes:_selectionIndexes withEvent:_mouseDownEvent offset:dragImageOffset];
+        view = [self _sendDelegateDraggingViewForItemsAtIndexes:_selectionIndexes withEvent:_mouseDownEvent offset:dragImageOffset];
 
     [view setFrameSize:_itemSize];
     [view setAlphaValue:0.7];
@@ -992,14 +1050,6 @@ var HORIZONTAL_MARGIN = 2;
         slideBack:YES];
 }
 
-- (CPView)_draggingViewForItemsAtIndexes:(CPIndexSet)indexes withEvent:(CPEvent)anEvent offset:(CGPoint)offset
-{
-    if ([_delegate respondsToSelector:@selector(collectionView:draggingViewForItemsAtIndexes:withEvent:offset:)])
-        return [_delegate collectionView:self draggingViewForItemsAtIndexes:indexes withEvent:anEvent offset:offset];
-
-    return [self draggingViewForItemsAtIndexes:indexes withEvent:anEvent offset:offset];
-}
-
 - (CPView)draggingViewForItemsAtIndexes:(CPIndexSet)indexes withEvent:(CPEvent)event offset:(CGPoint)dragImageOffset
 {
     var idx = _content[[indexes firstIndex]];
@@ -1012,14 +1062,6 @@ var HORIZONTAL_MARGIN = 2;
     return [_itemForDragging view];
 }
 
-- (BOOL)_canDragItemsAtIndexes:(CPIndexSet)indexes withEvent:(CPEvent)anEvent
-{
-    if ([self respondsToSelector:@selector(collectionView:canDragItemsAtIndexes:withEvent:)])
-        return [_delegate collectionView:self canDragItemsAtIndexes:indexes withEvent:anEvent];
-
-  return YES;
-}
-
 - (CPDragOperation)draggingEntered:(id)draggingInfo
 {
     var dropIndex = -1,
@@ -1057,16 +1099,14 @@ var HORIZONTAL_MARGIN = 2;
     var result = CPDragOperationMove,
         dropIndex = [self _dropIndexForDraggingInfo:draggingInfo proposedDropOperation:dropOperation];
 
-    if ([_delegate respondsToSelector:@selector(collectionView:validateDrop:proposedIndex:dropOperation:)])
+    if ([self _delegateRespondsToCollectionViewValidateDropProposedIndexDropOperation])
     {
         var dropIndexRef2 = @ref(dropIndex);
 
-        result = [_delegate collectionView:self validateDrop:draggingInfo proposedIndex:dropIndexRef2  dropOperation:dropOperation];
+        result = [self _sendDelegateValidateDrop:draggingInfo proposedIndex:dropIndexRef2  dropOperation:dropOperation];
 
         if (result !== CPDragOperationNone)
-        {
             dropIndex = dropIndexRef2();
-        }
     }
 
     dropIndexRef(dropIndex);
@@ -1100,7 +1140,7 @@ Not supported. Use -collectionView:dataForItemsAtIndexes:fortype:
     var result = NO;
 
     if (_currentDragOperation && _currentDropIndex !== -1)
-        result = [_delegate collectionView:self acceptDrop:draggingInfo index:_currentDropIndex dropOperation:1];
+        result = [self _sendDelegateAcceptDrop:draggingInfo index:_currentDropIndex dropOperation:1];
 
     [self draggingEnded:draggingInfo]; // Is this correct ?
 
@@ -1318,13 +1358,14 @@ Not supported. Use -collectionView:dataForItemsAtIndexes:fortype:
     [self interpretKeyEvents:[anEvent]];
 }
 
-- (void)setAutoresizingMask:(int)aMask
+- (void)setAutoresizingMask:(unsigned)aMask
 {
     [super setAutoresizingMask:0];
 }
 
 @end
 
+
 @implementation CPCollectionView (Deprecated)
 
 - (CGRect)rectForItemAtIndex:(int)anIndex
@@ -1345,6 +1386,148 @@ Not supported. Use -collectionView:dataForItemsAtIndexes:fortype:
 
 @end
 
+
+@implementation CPCollectionView (CPCollectionViewDelegate)
+
+/*
+    @ignore
+    Return YES if the delegate implements collectionView:validateDrop:proposedIndex:dropOperation:
+*/
+- (BOOL)_delegateRespondsToCollectionViewValidateDropProposedIndexDropOperation
+{
+    return _implementedDelegateMethods & CPCollectionViewDelegate_collectionView_validateDrop_proposedIndex_dropOperation_;
+}
+
+/*
+    @ignore
+    Return YES if the delegate implements collectionView:menuForItemAtIndex:
+*/
+- (BOOL)_delegateRespondsToCollectionViewMenuForItemAtIndex
+{
+    return _implementedDelegateMethods & CPCollectionViewDelegate_collectionView_menuForItemAtIndex_;
+}
+
+/*
+    @ignore
+    Return YES if the delegate implements collectionView:dragTypesForItemsAtIndexes:
+*/
+- (BOOL)_delegateRespondsToCollectionViewDragTypesForItemsAtIndexes
+{
+    return _implementedDelegateMethods & CPCollectionViewDelegate_collectionView_dragTypesForItemsAtIndexes_;
+}
+
+/*!
+    @ignore
+    Call delegate collectionView:acceptDrop:index:dropOperation:
+*/
+- (BOOL)_sendDelegateAcceptDrop:(id)draggingInfo index:(CPInteger)index dropOperation:(CPCollectionViewDropOperation)dropOperation
+{
+    if (!(_implementedDelegateMethods & CPCollectionViewDelegate_collectionView_acceptDrop_index_dropOperation_))
+        return NO;
+
+    return [_delegate collectionView:self acceptDrop:draggingInfo index:index dropOperation:dropOperation];
+}
+
+/*!
+    @ignore
+    Call delegate collectionView:canDragItemsAtIndexes:withEvent:
+*/
+- (BOOL)_sendDelegateCanDragItemsAtIndexes:(CPIndexSet)indexes withEvent:(CPEvent)anEvent
+{
+    if (!(_implementedDelegateMethods & CPCollectionViewDelegate_collectionView_canDragItemsAtIndexes_withEvent_))
+        return YES;
+
+    return [_delegate collectionView:self canDragItemsAtIndexes:indexes withEvent:anEvent];
+}
+
+/*!
+    @ignore
+    Call delegate collectionView:writeItemsAtIndexes:toPasteboard:
+*/
+- (BOOL)_sendDelegateWriteItemsAtIndexes:(CPIndexSet)indexes toPasteboard:(CPPasteboard)pasteboard
+{
+    if (!(_implementedDelegateMethods & CPCollectionViewDelegate_collectionView_writeItemsAtIndexes_toPasteboard_))
+        return NO;
+
+    return [_delegate collectionView:self writeItemsAtIndexes:indexes toPasteboard:pasteboard];
+}
+
+/*!
+    @ignore
+    Call delegate collectionView:dragTypesForItemsAtIndexes:
+*/
+- (CPArray)_sendDelegateDragTypesForItemsAtIndexes:(CPIndexSet)indexes
+{
+    if (!(_implementedDelegateMethods & CPCollectionViewDelegate_collectionView_dragTypesForItemsAtIndexes_))
+        return [];
+
+    return [_delegate collectionView:self dragTypesForItemsAtIndexes:indexes];
+}
+
+/*!
+    @ignore
+    Call delegate collectionView:dataForItemsAtIndexes:forType:
+*/
+- (CPData)_sendDelegateDataForItemsAtIndexes:(CPIndexSet)indexes forType:(CPString)aType
+{
+    if (!(_implementedDelegateMethods & CPCollectionViewDelegate_collectionView_dataForItemsAtIndexes_forType_))
+        return nil;
+
+    return [_delegate collectionView:self dataForItemsAtIndexes:indexes forType:aType];
+}
+
+/*!
+    @ignore
+    Call delegate collectionView:validateDrop:proposedIndex:dropOperation:
+*/
+- (CPDragOperation)_sendDelegateValidateDrop:(id)draggingInfo proposedIndex:(CPInteger)proposedDropIndex dropOperation:(CPCollectionViewDropOperation)proposedDropOperation
+{
+    if (!(_implementedDelegateMethods & CPCollectionViewDelegate_collectionView_validateDrop_proposedIndex_dropOperation_))
+        return CPDragOperationNone;
+
+    return [_delegate collectionView:self validateDrop:draggingInfo proposedIndex:proposedDropIndex dropOperation:proposedDropOperation];
+}
+
+/*!
+    @ignore
+    Call delegate collectionView:didDoubleClickOnItemAtIndex:
+*/
+- (void)_sendDelegateDidDoubleClickOnItemAtIndex:(int)index
+{
+    if (!(_implementedDelegateMethods & CPCollectionViewDelegate_collectionView_didDoubleClickOnItemAtIndex_))
+        return;
+
+    return [_delegate collectionView:self didDoubleClickOnItemAtIndex:index];
+}
+
+
+/*!
+    @ignore
+    Call delegate collectionView:menuForItemAtIndex:
+*/
+- (void)_sendDelegateMenuForItemAtIndex:(CPInteger)anIndex
+{
+    if (!(_implementedDelegateMethods & CPCollectionViewDelegate_collectionView_menuForItemAtIndex_))
+        return nil;
+
+    return [_delegate collectionView:self menuForItemAtIndex:anIndex];
+}
+
+/*!
+    @ignore
+    Call delegate draggingViewForItemsAtIndexes:withEvent:offset:
+*/
+- (CPView)_sendDelegateDraggingViewForItemsAtIndexes:(CPIndexSet)indexes withEvent:(CPEvent)anEvent offset:(CGPoint)dragImageOffset
+{
+    if (!(_implementedDelegateMethods & CPCollectionViewDelegate_collectionView_draggingViewForItemsAtIndexes_withEvent_offset))
+        return [self draggingViewForItemsAtIndexes:indexes withEvent:anEvent offset:dragImageOffset];
+
+    return [_delegate collectionView:self draggingViewForItemsAtIndexes:indexes withEvent:anEvent offset:dragImageOffset];
+}
+
+@end
+
+
 var CPCollectionViewMinItemSizeKey              = @"CPCollectionViewMinItemSizeKey",
     CPCollectionViewMaxItemSizeKey              = @"CPCollectionViewMaxItemSizeKey",
     CPCollectionViewVerticalMarginKey           = @"CPCollectionViewVerticalMarginKey",

AppKit/CPColor.j

@@ -813,6 +813,12 @@ url("data:image/png;base64,BASE64ENCODEDDATA")  // if there is a pattern image
     return [CPColor colorWithRed:RAND() green:RAND() blue:RAND() alpha:1.0];
 }
 
++ (CPColor)checkerBoardColor
+{
+    // Thanks to cocco http://stackoverflow.com/a/18368212/76900.
+    return [CPColor colorWithPatternImage:[[CPImage alloc] initWithContentsOfFile:"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQAQMAAAAlPW0iAAAABlBMVEX////MzMw46qqDAAAAEElEQVQImWNg+M+AFeEQBgB+vw/xfUUZkgAAAABJRU5ErkJggg=="]];
+}
+
 @end
 
 /// @cond IGNORE

AppKit/CPColorPanel.j

@@ -27,6 +27,9 @@
 @import "CPView.j"
 
 @class CPSlider
+@class _CPColorPanelToolbar
+@class _CPColorPanelSwatches
+@class _CPColorPanelPreview
 
 @global CPApp
 
@@ -576,7 +579,7 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
         [aPasteboard setData:[CPKeyedArchiver archivedDataWithRootObject:_dragColor] forType:aType];
 }
 
-- (void)performDragOperation:(id <CPDraggingInfo>)aSender
+- (void)performDragOperation:(id /*<CPDraggingInfo>*/)aSender
 {
     var location = [self convertPoint:[aSender draggingLocation] fromView:nil],
         pasteboard = [aSender draggingPasteboard],
@@ -615,7 +618,7 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
     return _colorPanel;
 }
 
-- (void)performDragOperation:(id <CPDraggingInfo>)aSender
+- (void)performDragOperation:(id /*<CPDraggingInfo>*/)aSender
 {
     var pasteboard = [aSender draggingPasteboard];
 

AppKit/CPColorPicker.j

@@ -25,6 +25,8 @@
 @import "CPView.j"
 
 @class CPSlider
+@class CPColorPanel
+@class __CPColorWheel
 
 @global CPColorPickerViewWidth
 @global CPColorPickerViewHeight

AppKit/CPColorWell.j

@@ -58,7 +58,7 @@ var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiv
     return @"colorwell";
 }
 
-+ (id)themeAttributes
++ (CPDictionary)themeAttributes
 {
     return @{
             @"bezel-inset": CGInsetMakeZero(),
@@ -86,14 +86,12 @@ var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiv
         _active = NO;
         _color = [CPColor whiteColor];
         [self setBordered:YES];
-
-        [self _registerForNotifications];
     }
 
     return self;
 }
 
-- (void)_registerForNotifications
+- (void)_registerNotifications
 {
     var defaultCenter = [CPNotificationCenter defaultCenter];
 
@@ -110,6 +108,22 @@ var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiv
              object:[CPColorPanel sharedColorPanel]];
 }
 
+- (void)_removeNotifications
+{
+    var defaultCenter = [CPNotificationCenter defaultCenter];
+
+    [defaultCenter
+        removeObserver:self
+                  name:_CPColorWellDidBecomeExclusiveNotification
+                object:nil];
+
+    [defaultCenter
+        removeObserver:self
+                  name:CPWindowWillCloseNotification
+                object:[CPColorPanel sharedColorPanel]];
+
+}
+
 /*!
     Sets whether the color well is bordered.
 */
@@ -312,6 +326,28 @@ var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiv
     [contentBorderView setBackgroundColor:[self currentValueForThemeAttribute:@"content-border-color"]];
 }
 
+
+#pragma mark -
+#pragma mark Observers method
+
+- (void)_addObservers
+{
+    if (_isObserving)
+        return;
+
+    [super _addObservers];
+    [self _registerNotifications];
+}
+
+- (void)_removeObservers
+{
+    if (!_isObserving)
+        return;
+
+    [super _removeObservers];
+    [self _removeNotifications];
+}
+
 @end
 
 @implementation CPColorWellValueBinder : CPBinder
@@ -363,8 +399,6 @@ var CPColorWellColorKey     = "CPColorWellColorKey",
         _active = NO;
         _color = [aCoder decodeObjectForKey:CPColorWellColorKey];
         [self setBordered:[aCoder decodeBoolForKey:CPColorWellBorderedKey]];
-
-        [self _registerForNotifications];
     }
 
     return self;

AppKit/CPComboBox.j

@@ -25,6 +25,27 @@
 @import "_CPPopUpList.j"
 
 
+// TODO : should conform to protocol CPTextFieldDelegate
+@protocol CPComboBoxDelegate <CPObject>
+
+@optional
+- (void)comboBoxSelectionIsChanging:(CPNotification)aNotification;
+- (void)comboBoxSelectionDidChange:(CPNotification)aNotification;
+- (void)comboBoxWillPopUp:(CPNotification)aNotification;
+- (void)comboBoxWillDismiss:(CPNotification)aNotification;
+
+@end
+
+@protocol CPComboBoxDataSource <CPObject>
+
+@optional
+- (CPString)comboBox:(CPComboBox)aComboBox completedString:(CPString)uncompletedString;
+- (id)comboBox:(CPComboBox)aComboBox objectValueForItemAtIndex:(int)index;
+- (int)comboBox:(CPComboBox)aComboBox indexOfItemWithStringValue:(CPString)stringValue;
+- (int)numberOfItemsInComboBox:(CPComboBox)aComboBox;
+
+@end
+
 CPComboBoxSelectionDidChangeNotification  = @"CPComboBoxSelectionDidChangeNotification";
 CPComboBoxSelectionIsChangingNotification = @"CPComboBoxSelectionIsChangingNotification";
 CPComboBoxWillDismissNotification         = @"CPComboBoxWillDismissNotification";
@@ -32,6 +53,11 @@ CPComboBoxWillPopUpNotification           = @"CPComboBoxWillPopUpNotification";
 
 CPComboBoxStateButtonBordered = CPThemeState("button-bordered");
 
+var CPComboBoxDelegate_comboBoxSelectionIsChanging_ = 1 << 0,
+    CPComboBoxDelegate_comboBoxSelectionDidChange_  = 1 << 1,
+    CPComboBoxDelegate_comboBoxWillPopUp_           = 1 << 2,
+    CPComboBoxDelegate_comboBoxWillDismiss_         = 1 << 3;
+
 var CPComboBoxTextSubview = @"text",
     CPComboBoxButtonSubview = @"button",
     CPComboBoxDefaultNumberOfVisibleItems = 5,
@@ -40,17 +66,20 @@ var CPComboBoxTextSubview = @"text",
 
 @implementation CPComboBox : CPTextField
 {
-    CPArray                 _items;
-    _CPPopUpList            _listDelegate;
-    CPComboBoxDataSource    _dataSource;
-    BOOL                    _usesDataSource;
-    BOOL                    _completes;
-    BOOL                    _canComplete;
-    int                     _numberOfVisibleItems;
-    BOOL                    _forceSelection;
-    BOOL                    _hasVerticalScroller;
-    CPString                _selectedStringValue;
-    BOOL                    _popUpButtonCausedResign;
+    BOOL                        _canComplete;
+    BOOL                        _completes;
+    BOOL                        _forceSelection;
+    BOOL                        _hasVerticalScroller;
+    BOOL                        _popUpButtonCausedResign;
+    BOOL                        _usesDataSource;
+    CGSize                      _intercellSpacing;
+    CPArray                     _items;
+    id<CPComboBoxDataSource>    _dataSource;
+    CPInteger                   _implementedDelegateComboBoxMethods;
+    CPString                    _selectedStringValue;
+    float                       _itemHeight;
+    int                         _numberOfVisibleItems;
+    _CPPopUpList                _listDelegate;
 }
 
 + (CPString)defaultThemeClass
@@ -58,7 +87,7 @@ var CPComboBoxTextSubview = @"text",
     return "combobox";
 }
 
-+ (id)themeAttributes
++ (CPDictionary)themeAttributes
 {
     return @{
                 @"popup-button-size": CGSizeMake(21.0, 29.0),
@@ -119,7 +148,9 @@ var CPComboBoxTextSubview = @"text",
         return;
 
     _hasVerticalScroller = flag;
-    [[_listDelegate scrollView] setHasVerticalScroller:flag];
+
+    if (_listDelegate)
+        [[_listDelegate scrollView] setHasVerticalScroller:_hasVerticalScroller];
 }
 
 - (CGSize)intercellSpacing
@@ -129,7 +160,13 @@ var CPComboBoxTextSubview = @"text",
 
 - (void)setIntercellSpacing:(CGSize)aSize
 {
-    [[_listDelegate tableView] setIntercellSpacing:aSize];
+    if (_intercellSpacing && CGSizeEqualToSize(aSize, _intercellSpacing))
+        return;
+
+    _intercellSpacing = aSize;
+
+    if (_listDelegate)
+        [[_listDelegate tableView] setIntercellSpacing:_intercellSpacing];
 }
 
 - (BOOL)isButtonBordered
@@ -152,10 +189,18 @@ var CPComboBoxTextSubview = @"text",
 
 - (void)setItemHeight:(float)itemHeight
 {
-    [[_listDelegate tableView] setRowHeight:itemHeight];
+    if (itemHeight === _itemHeight)
+        return;
 
-    // FIXME: This shouldn't be necessary, but CPTableView does not tile after setRowHeight
-    [[_listDelegate tableView] reloadData];
+    _itemHeight = itemHeight;
+
+    if (_listDelegate)
+    {
+        [[_listDelegate tableView] setRowHeight:_itemHeight];
+
+        // FIXME: This shouldn't be necessary, but CPTableView does not tile after setRowHeight
+        [[_listDelegate tableView] reloadData];
+    }
 }
 
 - (int)numberOfVisibleItems
@@ -171,7 +216,7 @@ var CPComboBoxTextSubview = @"text",
 
 #pragma mark Setting a Delegate
 
-- (id < CPComboBoxDelegate >)delegate
+- (id <CPComboBoxDelegate>)delegate
 {
     return [super delegate];
 }
@@ -182,48 +227,28 @@ var CPComboBoxTextSubview = @"text",
     protocol, in actual fact it doesn't. Also note that the same
     delegate may conform to the NSTextFieldDelegate protocol.
 */
-- (void)setDelegate:(id < CPComboBoxDelegate >)aDelegate
+- (void)setDelegate:(id <CPComboBoxDelegate>)aDelegate
 {
     var delegate = [self delegate];
 
     if (aDelegate === delegate)
         return;
 
-    var defaultCenter = [CPNotificationCenter defaultCenter];
-
-    if (delegate)
-    {
-        [defaultCenter removeObserver:delegate name:CPComboBoxSelectionIsChangingNotification object:self];
-        [defaultCenter removeObserver:delegate name:CPComboBoxSelectionDidChangeNotification object:self];
-        [defaultCenter removeObserver:delegate name:CPComboBoxWillDismissNotification object:self];
-        [defaultCenter removeObserver:delegate name:CPComboBoxWillPopUpNotification object:self];
-    }
+    _implementedDelegateComboBoxMethods = 0;
 
     if (aDelegate)
     {
         if ([aDelegate respondsToSelector:@selector(comboBoxSelectionIsChanging:)])
-            [defaultCenter addObserver:delegate
-                              selector:@selector(comboBoxSelectionIsChanging:)
-                                  name:CPComboBoxSelectionIsChangingNotification
-                                object:self];
+            _implementedDelegateComboBoxMethods |= CPComboBoxDelegate_comboBoxSelectionIsChanging_;
 
         if ([aDelegate respondsToSelector:@selector(comboBoxSelectionDidChange:)])
-            [defaultCenter addObserver:delegate
-                              selector:@selector(comboBoxSelectionDidChange:)
-                                  name:CPComboBoxSelectionDidChangeNotification
-                                object:self];
+            _implementedDelegateComboBoxMethods |= CPComboBoxDelegate_comboBoxSelectionDidChange_;
 
         if ([aDelegate respondsToSelector:@selector(comboBoxWillPopUp:)])
-            [defaultCenter addObserver:delegate
-                              selector:@selector(comboBoxWillPopUp:)
-                                  name:CPComboBoxWillPopUpNotification
-                                object:self];
+            _implementedDelegateComboBoxMethods |= CPComboBoxDelegate_comboBoxWillPopUp_;
 
         if ([aDelegate respondsToSelector:@selector(comboBoxWillDismiss:)])
-            [defaultCenter addObserver:delegate
-                              selector:@selector(comboBoxWillDissmis:)
-                                  name:CPComboBoxWillDismissNotification
-                                object:self];
+            _implementedDelegateComboBoxMethods |= CPComboBoxDelegate_comboBoxWillDismiss_;
     }
 
     [super setDelegate:aDelegate];
@@ -231,7 +256,7 @@ var CPComboBoxTextSubview = @"text",
 
 #pragma mark Setting a Data Source
 
-- (id < CPComboBoxDataSource >)dataSource
+- (id <CPComboBoxDataSource>)dataSource
 {
     if (!_usesDataSource)
         [self _dataSourceWarningForMethod:_cmd condition:NO];
@@ -239,10 +264,12 @@ var CPComboBoxTextSubview = @"text",
     return _dataSource;
 }
 
-- (void)setDataSource:(id < CPComboBoxDataSource >)aSource
+- (void)setDataSource:(id <CPComboBoxDataSource>)aSource
 {
     if (!_usesDataSource)
+    {
         [self _dataSourceWarningForMethod:_cmd condition:NO];
+    }
     else if (_dataSource !== aSource)
     {
         if (![aSource respondsToSelector:@selector(numberOfItemsInComboBox:)] ||
@@ -251,7 +278,9 @@ var CPComboBoxTextSubview = @"text",
             CPLog.warn("Illegal %s data source (%s). Must implement numberOfItemsInComboBox: and comboBox:objectValueForItemAtIndex:", [self className], [aSource description]);
         }
         else
+        {
             _dataSource = aSource;
+        }
     }
 }
 
@@ -369,49 +398,57 @@ var CPComboBoxTextSubview = @"text",
     if (_listDelegate === aDelegate)
         return;
 
-    var defaultCenter = [CPNotificationCenter defaultCenter];
-
-    if (_listDelegate)
-    {
-        [defaultCenter removeObserver:self name:_CPPopUpListWillPopUpNotification object:_listDelegate];
-        [defaultCenter removeObserver:self name:_CPPopUpListWillDismissNotification object:_listDelegate];
-        [defaultCenter removeObserver:self name:_CPPopUpListDidDismissNotification object:_listDelegate];
-        [defaultCenter removeObserver:self name:_CPPopUpListItemWasClickedNotification object:_listDelegate];
-
-        var oldTableView = [_listDelegate tableView];
-
-        if (oldTableView)
-        {
-            [defaultCenter removeObserver:self name:CPTableViewSelectionIsChangingNotification object:oldTableView];
-            [defaultCenter removeObserver:self name:CPTableViewSelectionDidChangeNotification object:oldTableView];
-        }
-    }
+    [self _removeObserversForListDelegate:_listDelegate];
 
     _listDelegate = aDelegate;
 
+    // We only add the observers if the CPComboBox is displayed
+    if ([self window])
+        [self _addObserversForListDelegate:_listDelegate]
+
+    // Apply our text style to the list
+    [_listDelegate setFont:[self font]];
+    [_listDelegate setAlignment:[self alignment]];
+
+    [[_listDelegate scrollView] setHasVerticalScroller:_hasVerticalScroller];
+
+    if (_intercellSpacing)
+        [[_listDelegate tableView] setIntercellSpacing:_intercellSpacing];
+
+    if (_itemHeight)
+        [[_listDelegate tableView] setRowHeight:_itemHeight];
+}
+
+- (void)_addObserversForListDelegate:(_CPPopUpList)aDelegate
+{
+    if (!aDelegate)
+        return;
+
+    var defaultCenter = [CPNotificationCenter defaultCenter];
+
     [defaultCenter addObserver:self
                       selector:@selector(comboBoxWillPopUp:)
                           name:_CPPopUpListWillPopUpNotification
-                        object:_listDelegate];
+                        object:aDelegate];
 
     [defaultCenter addObserver:self
                       selector:@selector(comboBoxWillDismiss:)
                           name:_CPPopUpListWillDismissNotification
-                        object:_listDelegate];
+                        object:aDelegate];
 
     [defaultCenter addObserver:self
                       selector:@selector(listDidDismiss:)
                           name:_CPPopUpListDidDismissNotification
-                        object:_listDelegate];
+                        object:aDelegate];
 
     [defaultCenter addObserver:self
                       selector:@selector(itemWasClicked:)
                           name:_CPPopUpListItemWasClickedNotification
-                        object:_listDelegate];
+                        object:aDelegate];
 
-    [[_listDelegate scrollView] setHasVerticalScroller:_hasVerticalScroller];
+    [[aDelegate scrollView] setHasVerticalScroller:_hasVerticalScroller];
 
-    var tableView = [_listDelegate tableView];
+    var tableView = [aDelegate tableView];
 
     [defaultCenter addObserver:self
                       selector:@selector(comboBoxSelectionIsChanging:)
@@ -422,10 +459,27 @@ var CPComboBoxTextSubview = @"text",
                       selector:@selector(comboBoxSelectionDidChange:)
                           name:CPTableViewSelectionDidChangeNotification
                         object:tableView];
+}
 
-    // Apply our text style to the list
-    [_listDelegate setFont:[self font]];
-    [_listDelegate setAlignment:[self alignment]];
+- (void)_removeObserversForListDelegate:(_CPPopUpList)aDelegate
+{
+    if (!aDelegate)
+        return;
+
+    var defaultCenter = [CPNotificationCenter defaultCenter];
+
+    [defaultCenter removeObserver:self name:_CPPopUpListWillPopUpNotification object:aDelegate];
+    [defaultCenter removeObserver:self name:_CPPopUpListWillDismissNotification object:aDelegate];
+    [defaultCenter removeObserver:self name:_CPPopUpListDidDismissNotification object:aDelegate];
+    [defaultCenter removeObserver:self name:_CPPopUpListItemWasClickedNotification object:aDelegate];
+
+    var oldTableView = [aDelegate tableView];
+
+    if (oldTableView)
+    {
+        [defaultCenter removeObserver:self name:CPTableViewSelectionIsChangingNotification object:oldTableView];
+        [defaultCenter removeObserver:self name:CPTableViewSelectionDidChangeNotification object:oldTableView];
+    }
 }
 
 - (int)indexOfItemWithObjectValue:(id)anObject
@@ -470,8 +524,6 @@ var CPComboBoxTextSubview = @"text",
     if (!_listDelegate)
         [self setListDelegate:[[_CPPopUpList alloc] initWithDataSource:self]];
 
-    [self _selectMatchingItem];
-
     // Note the offset here is 1 less than the focus ring width because the outer edge
     // of the focus ring is very transparent and it looks better if the list is closer.
     if (CPComboBoxFocusRingWidth < 0)
@@ -482,6 +534,7 @@ var CPComboBoxTextSubview = @"text",
     }
 
     [_listDelegate popUpRelativeToRect:[self _borderFrame] view:self offset:CPComboBoxFocusRingWidth - 1];
+    [self _selectMatchingItem];
 }
 
 /*! @ignore */
@@ -817,13 +870,17 @@ var CPComboBoxTextSubview = @"text",
 - (void)setFont:(CPFont)aFont
 {
     [super setFont:aFont];
-    [_listDelegate setFont:aFont];
+
+    if (_listDelegate)
+        [_listDelegate setFont:aFont];
 }
 
 - (void)setAlignment:(CPTextAlignment)alignment
 {
     [super setAlignment:alignment];
-    [_listDelegate setAlignment:alignment];
+
+    if (_listDelegate)
+        [_listDelegate setAlignment:alignment];
 }
 
 #pragma mark Pop Up Button Layout
@@ -894,7 +951,9 @@ var CPComboBoxTextSubview = @"text",
             index = [_dataSource comboBox:self indexOfItemWithStringValue:stringValue]
     }
     else
+    {
         index = [self indexOfItemWithObjectValue:stringValue];
+    }
 
     [_listDelegate selectRow:index];
 
@@ -946,6 +1005,28 @@ var CPComboBoxTextSubview = @"text",
     }
 }
 
+
+#pragma mark -
+#pragma mark Observers method
+
+- (void)_addObservers
+{
+    if (_isObserving)
+        return;
+
+    [super _addObservers];
+    [self _addObserversForListDelegate:_listDelegate];
+}
+
+- (void)_removeObservers
+{
+    if (!_isObserving)
+        return;
+
+    [super _removeObservers];
+    [self _removeObserversForListDelegate:_listDelegate];
+}
+
 @end
 
 @implementation CPComboBox (CPComboBoxDelegate)
@@ -953,24 +1034,36 @@ var CPComboBoxTextSubview = @"text",
 /*! @ignore */
 - (void)comboBoxSelectionIsChanging:(CPNotification)aNotification
 {
+    if (_implementedDelegateComboBoxMethods & CPComboBoxDelegate_comboBoxSelectionIsChanging_)
+        [_delegate comboBoxSelectionIsChanging:[[CPNotification alloc] initWithName:CPComboBoxSelectionIsChangingNotification object:self userInfo:nil]];
+
     [[CPNotificationCenter defaultCenter] postNotificationName:CPComboBoxSelectionIsChangingNotification object:self];
 }
 
 /*! @ignore */
 - (void)comboBoxSelectionDidChange:(CPNotification)aNotification
 {
+    if (_implementedDelegateComboBoxMethods & CPComboBoxDelegate_comboBoxSelectionDidChange_)
+        [_delegate comboBoxSelectionDidChange:[[CPNotification alloc] initWithName:CPComboBoxSelectionDidChangeNotification object:self userInfo:nil]];
+
     [[CPNotificationCenter defaultCenter] postNotificationName:CPComboBoxSelectionDidChangeNotification object:self];
 }
 
 /*! @ignore */
 - (void)comboBoxWillPopUp:(CPNotification)aNotification
 {
+    if (_implementedDelegateComboBoxMethods & CPComboBoxDelegate_comboBoxWillPopUp_)
+        [_delegate comboBoxWillPopUp:[[CPNotification alloc] initWithName:CPComboBoxWillPopUpNotification object:self userInfo:nil]];
+
     [[CPNotificationCenter defaultCenter] postNotificationName:CPComboBoxWillPopUpNotification object:self];
 }
 
 /*! @ignore */
 - (void)comboBoxWillDismiss:(CPNotification)aNotification
 {
+    if (_implementedDelegateComboBoxMethods & CPComboBoxDelegate_comboBoxWillDismiss_)
+        [_delegate comboBoxWillDismiss:[[CPNotification alloc] initWithName:CPComboBoxWillDismissNotification object:self userInfo:nil]];
+
     [[CPNotificationCenter defaultCenter] postNotificationName:CPComboBoxWillDismissNotification object:self];
 }
 

AppKit/CPCompatibility.j

@@ -46,7 +46,9 @@ CPHTMLDragAndDropFeature                = 8;
 
 CPJavaScriptInnerTextFeature            = 9;
 CPJavaScriptTextContentFeature          = 10;
+// In onpaste, oncopy and oncut events, the event has an event.clipboardData from which the current pasteboard contents can be read with event.clipboardData.getData.
 CPJavaScriptClipboardEventsFeature      = 11;
+// window.clipboardData exists and can be read and written to at any time using window.clipboardData.getData/setData.
 CPJavaScriptClipboardAccessFeature      = 12;
 CPJavaScriptCanvasDrawFeature           = 13;
 CPJavaScriptCanvasTransformFeature      = 14;
@@ -76,11 +78,21 @@ CPInputOnInputEventFeature              = 30;
 
 CPFileAPIFeature                        = 31;
 
+CPAltEnterTextAreaFeature               = 32;
+
+
+
 /*
     When an absolutely positioned div (CPView) with an absolutely positioned canvas in it (CPView with drawRect:) moves things on top of the canvas (subviews) don't redraw correctly. E.g. if you have a bunch of text fields in a CPBox in a sheet which animates in, some of the text fields might not be visible because the CPBox has a canvas at the bottom and the box moved form offscreen to onscreen. This bug is probably very related: https://bugs.webkit.org/show_bug.cgi?id=67203
 */
 CPCanvasParentDrawErrorsOnMovementBug   = 1 << 0;
 
+// The paste event is only sent if an input or textarea has focus.
+CPJavaScriptPasteRequiresEditableTarget   = 1 << 1;
+// Redirecting the focus of the browser on keydown to an input for Cmd-V or Ctrl-V makes the paste fail.
+CPJavaScriptPasteCantRefocus            = 1 << 2;
+
+
 var USER_AGENT                          = "",
     PLATFORM_ENGINE                     = CPUnknownBrowserEngine,
     PLATFORM_FEATURES                   = [],
@@ -90,6 +102,7 @@ var USER_AGENT                          = "",
 // default these features to true
 PLATFORM_FEATURES[CPInputTypeCanBeChangedFeature] = YES;
 PLATFORM_FEATURES[CPInputSetFontOutsideOfDOM] = YES;
+PLATFORM_FEATURES[CPAltEnterTextAreaFeature] = YES;
 
 if (typeof window !== "undefined" && typeof window.navigator !== "undefined")
     USER_AGENT = window.navigator.userAgent;
@@ -118,6 +131,9 @@ else if (typeof window !== "undefined" && window.attachEvent) // Must follow Ope
 
     // Tested in Internet Explore 8 and 9.
     PLATFORM_FEATURES[CPInputSetFontOutsideOfDOM] = NO;
+
+    // IE allows free clipboard access.
+    PLATFORM_FEATURES[CPJavaScriptClipboardAccessFeature] = YES;
 }
 
 // WebKit
@@ -129,11 +145,8 @@ else if (USER_AGENT.indexOf("AppleWebKit/") != -1)
     PLATFORM_FEATURES[CPCSSRGBAFeature] = YES;
     PLATFORM_FEATURES[CPHTMLContentEditableFeature] = YES;
 
-    if (USER_AGENT.indexOf("Chrome") === -1)
-        PLATFORM_FEATURES[CPHTMLDragAndDropFeature] = YES;
-
     PLATFORM_FEATURES[CPJavaScriptClipboardEventsFeature] = YES;
-    PLATFORM_FEATURES[CPJavaScriptClipboardAccessFeature] = YES;
+    PLATFORM_FEATURES[CPJavaScriptClipboardAccessFeature] = NO;
     PLATFORM_FEATURES[CPJavaScriptShadowFeature] = YES;
 
     var versionStart = USER_AGENT.indexOf("AppleWebKit/") + "AppleWebKit/".length,
@@ -159,7 +172,14 @@ else if (USER_AGENT.indexOf("AppleWebKit/") != -1)
         PLATFORM_FEATURES[CPInput1PxLeftPadding] = YES;
 
     if (USER_AGENT.indexOf("Chrome") === CPNotFound)
+    {
         PLATFORM_FEATURES[CPSOPDisabledFromFileURLs] = YES;
+        PLATFORM_FEATURES[CPHTMLDragAndDropFeature] = YES;
+        // https://bugs.webkit.org/show_bug.cgi?id=75891
+        PLATFORM_BUGS |= CPJavaScriptPasteRequiresEditableTarget;
+        // https://bugs.webkit.org/show_bug.cgi?id=39689
+        PLATFORM_BUGS |= CPJavaScriptPasteCantRefocus;
+    }
 
     // Assume this bug was introduced around Safari 5.1/Chrome 16. This could probably be tighter.
     if (majorVersion > 533)
@@ -190,6 +210,18 @@ else if (USER_AGENT.indexOf("Gecko") !== -1) // Must follow KHTML check.
 
     // Some day this might be fixed and should be version prefixed. No known fixed version yet.
     PLATFORM_FEATURES[CPInput1PxLeftPadding] = YES;
+
+    PLATFORM_FEATURES[CPAltEnterTextAreaFeature] = NO;
+    // This was supposed to be added in Firefox 22, but when testing with the latest beta as of 2013-06-14
+    // it does not seem to work. It seems to exhibit the CPJavaScriptPasteRequiresEditableTarget problem,
+    // and in addition doesn't seem to work with our native copy code either.
+    /*if (version >= 22.0)
+    {
+        PLATFORM_FEATURES[CPJavaScriptClipboardEventsFeature] = YES;
+        // TODO File a bug at https://bugzilla.mozilla.org/. In other browsers, one can return "false" from the
+        // beforepaste event to indicate a paste should be enabled even that the DOMEvent.target is not editable.
+        PLATFORM_BUGS |= CPJavaScriptPasteRequiresEditableTarget;
+    }*/
 }
 
 // Feature-specific checks
@@ -323,6 +355,20 @@ function CPBrowserStyleProperty(aProperty)
 
                 r = candidates[PLATFORM_STYLE_JS_PROPERTIES['transition']] || nil;
                 break;
+
+            case 'transformorigin':
+
+                var candidates = {
+                        'WebkitTransform' : 'WebkitTransformOrigin',
+                        'MozTransform'    : 'MozTransformOrigin',
+                        'OTransform'      : 'OTransformOrigin',
+                        'msTransform'     : 'MSTransformOrigin',
+                        'transform'       : 'transformOrigin'
+                    };
+
+                r = candidates[PLATFORM_STYLE_JS_PROPERTIES['transform']] || nil;
+                break;
+
             default:
                 var prefixes = ["Webkit", "Moz", "O", "ms"],
                     strippedProperty = aProperty.split('-').join(' '),

AppKit/CPControl.j

@@ -30,16 +30,31 @@
 
 @global CPApp
 
+@protocol CPControlTextEditingDelegate <CPObject>
+
+@optional
+- (void)controlTextDidBeginEditing:(CPNotification)aNotification;
+- (void)controlTextDidChange:(CPNotification)aNotification;
+- (void)controlTextDidEndEditing:(CPNotification)aNotification;
+- (void)controlTextDidFocus:(CPNotification)aNotification;
+- (void)controlTextDidBlur:(CPNotification)aNotification;
+- (BOOL)control:(CPControl)control didFailToFormatString:(CPString)string errorDescription:(CPString)error;
+
+@end
+
+@typedef CPTextAlignment
 CPLeftTextAlignment      = 0;
 CPRightTextAlignment     = 1;
 CPCenterTextAlignment    = 2;
 CPJustifiedTextAlignment = 3;
 CPNaturalTextAlignment   = 4;
 
+@typedef CPControlSize
 CPRegularControlSize = 0;
 CPSmallControlSize   = 1;
 CPMiniControlSize    = 2;
 
+@typedef CPLineBreakMode
 CPLineBreakByWordWrapping     = 0;
 CPLineBreakByCharWrapping     = 1;
 CPLineBreakByClipping         = 2;
@@ -47,11 +62,13 @@ CPLineBreakByTruncatingHead   = 3;
 CPLineBreakByTruncatingTail   = 4;
 CPLineBreakByTruncatingMiddle = 5;
 
+@typedef CPVerticalTextAlignment
 CPTopVerticalTextAlignment    = 1;
 CPCenterVerticalTextAlignment = 2;
 CPBottomVerticalTextAlignment = 3;
 
 // Deprecated for use with images, use the CPImageScale constants
+@typedef CPImageScaling
 CPScaleProportionally = 0;
 CPScaleToFit          = 1;
 CPScaleNone           = 2;
@@ -61,6 +78,7 @@ CPImageScaleAxesIndependently      = 1;
 CPImageScaleNone                   = 2;
 CPImageScaleProportionallyUpOrDown = 3;
 
+@typedef CPCellImagePosition
 CPNoImage       = 0;
 CPImageOnly     = 1;
 CPImageLeft     = 2;
@@ -106,6 +124,8 @@ var CPControlBlackColor = [CPColor blackColor];
     BOOL                _trackingWasWithinFrame;
     unsigned            _trackingMouseDownFlags;
     CGPoint             _previousTrackingLocation;
+
+    CPControlSize       _controlSize;
 }
 
 + (CPDictionary)themeAttributes
@@ -122,6 +142,7 @@ var CPControlBlackColor = [CPColor blackColor];
             @"image-scaling": CPScaleToFit,
             @"min-size": CGSizeMakeZero(),
             @"max-size": CGSizeMake(-1.0, -1.0),
+            @"nib2cib-adjustment-frame": CGRectMakeZero()
         };
 }
 
@@ -177,13 +198,95 @@ var CPControlBlackColor = [CPColor blackColor];
 
     if (self)
     {
-        _sendActionOn = CPLeftMouseUpMask;
+        _sendActionOn           = CPLeftMouseUpMask;
         _trackingMouseDownFlags = 0;
     }
 
     return self;
 }
 
+
+#pragma mark -
+#pragma mark Control Size
+
+/*!
+    Returns the control's control size
+*/
+- (CPControlSize)controlSize
+{
+    return _controlSize;
+}
+
+/*!
+    Sets the control's size.
+    @param aControlSize the control's size
+*/
+- (void)setControlSize:(CPControlSize)aControlSize
+{
+    if (_controlSize === aControlSize)
+        return;
+
+    [self unsetThemeState:[self _controlSizeThemeState]];
+    _controlSize = aControlSize;
+    [self setThemeState:[self _controlSizeThemeState]];
+
+    [self setNeedsLayout];
+    [self setNeedsDisplay:YES];
+}
+
+/*!
+    Gets the current theme state according to the current controlSize.
+    @return a CPThemeState
+*/
+- (ThemeState)_controlSizeThemeState
+{
+    switch(_controlSize)
+    {
+        case CPSmallControlSize:
+            return CPThemeStateControlSizeSmall;
+
+        case CPMiniControlSize:
+            return CPThemeStateControlSizeMini;
+
+        case CPRegularControlSize:
+        default:
+            return CPThemeStateControlSizeRegular;
+    }
+}
+
+/*!
+    @ignore
+    Change frame size according to the theme control size theme constraints
+    Basically for height to min-size.
+*/
+- (void)_sizeToControlSize
+{
+    var frameSize = [self frameSize],
+        minSize = [self currentValueForThemeAttribute:@"min-size"],
+        maxSize = [self currentValueForThemeAttribute:@"max-size"];
+
+    if (minSize.width > 0)
+    {
+        frameSize.width = MAX(minSize.width, frameSize.width);
+
+        if (maxSize.width > 0)
+            frameSize.width = MIN(maxSize.width, frameSize.width);
+    }
+
+    if (minSize.height > 0)
+    {
+        frameSize.height = MAX(minSize.height, frameSize.height);
+
+        if (maxSize.height > 0)
+            frameSize.height = MIN(maxSize.height, frameSize.height);
+    }
+
+    [self setFrameSize:frameSize];
+}
+
+
+#pragma mark -
+
 /*!
     Sets the receiver's target action.
 
@@ -322,11 +425,11 @@ var CPControlBlackColor = [CPColor blackColor];
     _previousTrackingLocation = currentLocation;
 }
 
-- (void)setState:(int)state
+- (void)setState:(CPInteger)state
 {
 }
 
-- (int)nextState
+- (CPInteger)nextState
 {
     return 0;
 }
@@ -530,7 +633,7 @@ var CPControlBlackColor = [CPColor blackColor];
             return formattedValue;
     }
 
-    return (_value === undefined || _value === nil) ? "" : String(_value);
+    return (_value === undefined || _value === nil) ? @"" : String(_value);
 }
 
 /*!
@@ -607,7 +710,7 @@ var CPControlBlackColor = [CPColor blackColor];
     if ([note object] != self)
         return;
 
-    [[CPNotificationCenter defaultCenter] postNotificationName:CPControlTextDidBeginEditingNotification object:self userInfo:@{ "CPFieldEditor": [note object] }];
+    [[CPNotificationCenter defaultCenter] postNotificationName:CPControlTextDidBeginEditingNotification object:self userInfo:@{"CPFieldEditor": [note object]}];
 }
 
 - (void)textDidChange:(CPNotification)note
@@ -616,7 +719,7 @@ var CPControlBlackColor = [CPColor blackColor];
     if ([note object] != self)
         return;
 
-    [[CPNotificationCenter defaultCenter] postNotificationName:CPControlTextDidChangeNotification object:self userInfo:@{ "CPFieldEditor": [note object] }];
+    [[CPNotificationCenter defaultCenter] postNotificationName:CPControlTextDidChangeNotification object:self userInfo:@{"CPFieldEditor": [note object]}];
 }
 
 - (void)textDidEndEditing:(CPNotification)note
@@ -627,7 +730,49 @@ var CPControlBlackColor = [CPColor blackColor];
 
     [self _reverseSetBinding];
 
-    [[CPNotificationCenter defaultCenter] postNotificationName:CPControlTextDidEndEditingNotification object:self userInfo:@{ "CPFieldEditor": [note object] }];
+    [[CPNotificationCenter defaultCenter] postNotificationName:CPControlTextDidEndEditingNotification object:self userInfo:[note userInfo]];
+}
+
+/*!
+    @ignore
+    Return the currentTextMovement needed by the delegate textDidEndEditing
+    This is going to check the currentEvent of the CPApp
+*/
+- (unsigned)_currentTextMovement
+{
+    var currentEvent = [CPApp currentEvent],
+        keyCode = [currentEvent keyCode],
+        modifierFlags = [currentEvent modifierFlags];
+
+    switch (keyCode)
+    {
+        case CPEscapeKeyCode:
+            return CPCancelTextMovement;
+
+        case CPLeftArrowKeyCode:
+            return CPLeftTextMovement;
+
+        case CPRightArrowKeyCode:
+            return CPRightTextMovement;
+
+        case CPUpArrowKeyCode:
+            return CPUpTextMovement;
+
+        case CPDownArrowKeyCode:
+            return CPDownTextMovement;
+
+        case CPReturnKeyCode:
+            return CPReturnTextMovement;
+
+        case CPTabKeyCode:
+            if (modifierFlags & CPShiftKeyMask)
+                return CPBacktabTextMovement;
+
+            return CPTabTextMovement;
+
+        default:
+            return CPOtherTextMovement;
+    }
 }
 
 /*!
@@ -813,7 +958,7 @@ var CPControlBlackColor = [CPColor blackColor];
 /*!
     Returns the image scaling of the control.
 */
-- (CPImageScaling)imageScaling
+- (CPUInteger)imageScaling
 {
     return [self valueForThemeAttribute:@"image-scaling"];
 }
@@ -873,14 +1018,15 @@ var CPControlBlackColor = [CPColor blackColor];
 
 @end
 
-var CPControlValueKey                   = @"CPControlValueKey",
+var CPControlActionKey                  = @"CPControlActionKey",
+    CPControlControlSizeKey             = @"CPControlControlSizeKey",
     CPControlControlStateKey            = @"CPControlControlStateKey",
-    CPControlIsEnabledKey               = @"CPControlIsEnabledKey",
-    CPControlTargetKey                  = @"CPControlTargetKey",
-    CPControlActionKey                  = @"CPControlActionKey",
-    CPControlSendActionOnKey            = @"CPControlSendActionOnKey",
     CPControlFormatterKey               = @"CPControlFormatterKey",
+    CPControlIsEnabledKey               = @"CPControlIsEnabledKey",
+    CPControlSendActionOnKey            = @"CPControlSendActionOnKey",
     CPControlSendsActionOnEndEditingKey = @"CPControlSendsActionOnEndEditingKey",
+    CPControlTargetKey                  = @"CPControlTargetKey",
+    CPControlValueKey                   = @"CPControlValueKey",
 
     __Deprecated__CPImageViewImageKey   = @"CPImageViewImageKey";
 
@@ -907,6 +1053,8 @@ var CPControlValueKey                   = @"CPControlValueKey",
         [self setSendsActionOnEndEditing:[aCoder decodeBoolForKey:CPControlSendsActionOnEndEditingKey]];
 
         [self setFormatter:[aCoder decodeObjectForKey:CPControlFormatterKey]];
+
+        [self setControlSize:[aCoder decodeIntForKey:CPControlControlSizeKey]];
     }
 
     return self;
@@ -939,6 +1087,8 @@ var CPControlValueKey                   = @"CPControlValueKey",
 
     if (_formatter !== nil)
         [aCoder encodeObject:_formatter forKey:CPControlFormatterKey];
+
+    [aCoder encodeInt:_controlSize forKey:CPControlControlSizeKey];
 }
 
 @end

AppKit/CPCursor.j

@@ -22,6 +22,7 @@ Cursor support by browser:
 */
 
 @import <Foundation/CPObject.j>
+@import "CPImage.j"
 
 @global CPApp
 
@@ -116,7 +117,8 @@ var currentCursor = nil,
 
 - (void)push
 {
-    currentCursor = cursorStack.push(self);
+    cursorStack.push(self);
+    currentCursor = self;
 }
 
 - (void)set

AppKit/CPDatePicker/CPDatePicker.j

@@ -28,7 +28,6 @@
 @import <Foundation/CPArray.j>
 @import <Foundation/CPObject.j>
 @import <Foundation/CPDate.j>
-@import <Foundation/CPDateFormatter.j>
 @import <Foundation/CPLocale.j>
 @import <Foundation/CPTimeZone.j>
 
@@ -71,11 +70,12 @@ CPEraDatePickerElementFlag              = 0x0100;
     //CPCalendar  _calendar           @accessors(property=calendar);
     CPTimeZone      _timeZone           @accessors(property=timeZone);
     id              _delegate           @accessors(property=delegate);
-    unsigned        _datePickerElements @accessors(property=datePickerElements);
+    CPInteger       _datePickerElements @accessors(property=datePickerElements);
     CPInteger       _datePickerMode     @accessors(property=datePickerMode);
     CPInteger       _datePickerStyle    @accessors(property=datePickerStyle);
     CPInteger       _timeInterval       @accessors(property=timeInterval);
 
+    BOOL                    _invokedByUserEvent;
     _CPDatePickerTextField  _datePickerTextfield;
     _CPDatePickerCalendar   _datePickerCalendar;
     unsigned                _implementedCDatePickerDelegateMethods;
@@ -90,7 +90,7 @@ CPEraDatePickerElementFlag              = 0x0100;
     return @"datePicker";
 }
 
-+ (id)themeAttributes
++ (CPDictionary)themeAttributes
 {
     return @{
             @"bezel-color": [CPColor clearColor],
@@ -135,10 +135,10 @@ CPEraDatePickerElementFlag              = 0x0100;
             @"clock-text-shadow-color": [CPColor clearColor],
             @"clock-text-shadow-offset": CGSizeMakeZero(),
             @"clock-font": [CPNull null],
-            @"second-hand-color": [CPColor clearColor],
-            @"hour-hand-color": [CPColor clearColor],
-            @"middle-hand-color": [CPColor clearColor],
-            @"minute-hand-color": [CPColor clearColor],
+            @"second-hand-image": [CPNull null],
+            @"hour-hand-image": [CPNull null],
+            @"middle-hand-image": [CPNull null],
+            @"minute-hand-image": [CPNull null],
             @"size-clock": CGSizeMakeZero(),
             @"second-hand-size": CGSizeMakeZero(),
             @"hour-hand-size": CGSizeMakeZero(),
@@ -159,7 +159,7 @@ CPEraDatePickerElementFlag              = 0x0100;
     return [super _binderClassForBinding:theBinding];
 }
 
-- (id)_replacementKeyPathForBinding:(CPString)aBinding
+- (CPString)_replacementKeyPathForBinding:(CPString)aBinding
 {
     if (aBinding == CPValueBinding)
         return @"dateValue";
@@ -206,24 +206,32 @@ CPEraDatePickerElementFlag              = 0x0100;
     if (!_locale)
         _locale = [CPLocale currentLocale];
 
-    if (!_timeZone)
-        _timeZone = [CPTimeZone systemTimeZone];
-
     _datePickerTextfield = [[_CPDatePickerTextField alloc] initWithFrame:[self bounds] withDatePicker:self];
-
     [_datePickerTextfield setDateValue:_dateValue];
-    [self addSubview:_datePickerTextfield];
 
     _datePickerCalendar = [[_CPDatePickerCalendar alloc] initWithFrame:[self bounds] withDatePicker:self];
     [_datePickerCalendar setDateValue:_dateValue];
-    [_datePickerCalendar setHidden:YES];
-    [self addSubview:_datePickerCalendar];
+
+    // We might have been unarchived in a disabled state.
+    [_datePickerTextfield setEnabled:[self isEnabled]];
 
     [self setNeedsDisplay:YES];
     [self setNeedsLayout];
 }
 
 
+#pragma mark -
+#pragma mark Control Size
+
+- (void)setControlSize:(CPControlSize)aControlSize
+{
+    [super setControlSize:aControlSize];
+
+    if ([self datePickerStyle] == CPTextFieldAndStepperDatePickerStyle || [self datePickerStyle] == CPTextFieldDatePickerStyle)
+        [self _sizeToControlSize];
+}
+
+
 #pragma mark -
 #pragma mark Delegate methods
 
@@ -252,15 +260,26 @@ CPEraDatePickerElementFlag              = 0x0100;
 
     if (_datePickerStyle == CPTextFieldAndStepperDatePickerStyle || _datePickerStyle == CPTextFieldDatePickerStyle)
     {
-        [_datePickerTextfield setHidden:NO];
-        [_datePickerCalendar setHidden:YES];
+        if (![_datePickerTextfield superview])
+            [self addSubview:_datePickerTextfield];
+
+        if ([_datePickerCalendar superview])
+            [_datePickerCalendar removeFromSuperview];
+
+        [_datePickerTextfield setControlSize:[self controlSize]];
         [_datePickerTextfield setNeedsLayout];
+        [_datePickerTextfield setNeedsDisplay:YES];
     }
     else
     {
-        [_datePickerCalendar setHidden:NO];
-        [_datePickerTextfield setHidden:YES];
+        if (![_datePickerCalendar superview])
+            [self addSubview:_datePickerCalendar];
+
+        if ([_datePickerTextfield superview])
+            [_datePickerTextfield removeFromSuperview];
+
         [_datePickerCalendar setNeedsLayout];
+        [_datePickerCalendar setNeedsDisplay:YES];
     }
 }
 
@@ -269,17 +288,20 @@ CPEraDatePickerElementFlag              = 0x0100;
 
 /*! Return the objectValue of the datePicker. The objectValue should take the timeZoneEffect
 */
-- (void)objectValue
+- (id)objectValue
 {
     // TODO : add timeZone effect. How to do it because js ???
     return _dateValue
 }
 
-/*! Set the objectValue ofhe datePier. It has to be a CPDate
+/*! Set the objectValue of the datePicker. It has to be a CPDate
     @param aDateValue the dateValue
 */
 - (void)setObjectValue:(CPDate)aValue
 {
+    if (![aValue isKindOfClass:[CPDate class]])
+        return;
+
     [self setDateValue:aValue];
 }
 
@@ -291,6 +313,7 @@ CPEraDatePickerElementFlag              = 0x0100;
     if (aDateValue == nil)
         return;
 
+    _invokedByUserEvent = NO;
     [self _setDateValue:aDateValue timeInterval:_timeInterval];
 }
 
@@ -309,7 +332,14 @@ CPEraDatePickerElementFlag              = 0x0100;
     aTimeInterval = MAX(MIN(aTimeInterval, [_maxDate timeIntervalSinceDate:aDateValue]), [_minDate timeIntervalSinceDate:aDateValue]);
 
     if ([aDateValue isEqualToDate:_dateValue] && aTimeInterval == _timeInterval)
+    {
+        if (_datePickerStyle == CPTextFieldAndStepperDatePickerStyle || _datePickerStyle == CPTextFieldDatePickerStyle)
+            [_datePickerTextfield setDateValue:_dateValue];
+        else
+            [_datePickerCalendar setDateValue:_dateValue];
+
         return;
+    }
 
     if (_implementedCDatePickerDelegateMethods & CPDatePicker_validateProposedDateValue_timeInterval)
     {
@@ -331,7 +361,8 @@ CPEraDatePickerElementFlag              = 0x0100;
     _timeInterval = (_datePickerMode == CPSingleDateMode)? 0 : aTimeInterval;
     [self didChangeValueForKey:@"timeInterval"];
 
-    [self sendAction:[self action] to:[self target]];
+    if (_invokedByUserEvent)
+        [self sendAction:[self action] to:[self target]];
 
     if (_datePickerStyle == CPTextFieldAndStepperDatePickerStyle || _datePickerStyle == CPTextFieldDatePickerStyle)
         [_datePickerTextfield setDateValue:_dateValue];
@@ -366,10 +397,12 @@ CPEraDatePickerElementFlag              = 0x0100;
 /*! Set the syle of the datePicker
     @param aDatePickerStyle the datePicker style
 */
-- (void)setDatePickerStyle:(CPDate)aDatePickerStyle
+- (void)setDatePickerStyle:(CPInteger)aDatePickerStyle
 {
     _datePickerStyle = aDatePickerStyle;
 
+    [self setControlSize:[self controlSize]];
+
     [self setNeedsDisplay:YES];
     [self setNeedsLayout];
 }
@@ -377,7 +410,7 @@ CPEraDatePickerElementFlag              = 0x0100;
 /*! Set the elements of the datePicker
     @param aDatePickerElements the datePicker elements
 */
-- (void)setDatePickerElements:(CPDate)aDatePickerElements
+- (void)setDatePickerElements:(CPInteger)aDatePickerElements
 {
     _datePickerElements = aDatePickerElements;
 
@@ -388,7 +421,7 @@ CPEraDatePickerElementFlag              = 0x0100;
 /*! Set the mode of the datePicker
     @param aDatePickerMode the datePicker mode
 */
-- (void)setDatePickerMode:(CPDate)aDatePickerMode
+- (void)setDatePickerMode:(CPInteger)aDatePickerMode
 {
     _datePickerMode = aDatePickerMode;
 
@@ -509,6 +542,11 @@ CPEraDatePickerElementFlag              = 0x0100;
     [self didChangeValueForKey:@"timeZone"];
 
     [self setNeedsLayout];
+
+    if (_datePickerStyle == CPTextFieldAndStepperDatePickerStyle || _datePickerStyle == CPTextFieldDatePickerStyle)
+        [_datePickerTextfield setDateValue:_dateValue];
+    else
+        [_datePickerCalendar setDateValue:_dateValue];
 }
 
 
@@ -520,11 +558,16 @@ CPEraDatePickerElementFlag              = 0x0100;
 - (BOOL)becomeFirstResponder
 {
     if (_datePickerStyle == CPTextFieldAndStepperDatePickerStyle || _datePickerStyle == CPTextFieldDatePickerStyle)
-        [_datePickerTextfield _selecteTextFieldWithFlags:[[CPApp currentEvent] modifierFlags]];
-    else
-        return NO;
+    {
+        if (![super becomeFirstResponder])
+            return NO;
 
-    return YES;
+        [_datePickerTextfield _selectTextFieldWithFlags:[[CPApp currentEvent] modifierFlags]];
+
+        return YES;
+    }
+
+    return NO;
 }
 
 /*! Return YES
@@ -628,12 +671,13 @@ var CPDatePickerModeKey         = @"CPDatePickerModeKey",
         _timeInterval = [aCoder decodeDoubleForKey:CPIntervalKey];
         _datePickerMode = [aCoder decodeIntForKey:CPDatePickerModeKey];
         _datePickerElements = [aCoder decodeIntForKey:CPDatePickerElementsKey];
-        _datePickerStyle = [aCoder decodeIntForKey:CPDatePickerStyleKey];
+        [self setDatePickerStyle:[aCoder decodeIntForKey:CPDatePickerStyleKey]];
         _locale = [aCoder decodeObjectForKey:CPLocaleKey];
         _dateValue = [aCoder decodeObjectForKey:CPDateValueKey];
         _backgroundColor = [aCoder decodeObjectForKey:CPBackgroundColorKey];
         _drawsBackground = [aCoder decodeBoolForKey:CPDrawsBackgroundKey];
         _isBordered = [aCoder decodeBoolForKey:CPBorderedKey];
+
         [self _init];
     }
 
@@ -642,7 +686,9 @@ var CPDatePickerModeKey         = @"CPDatePickerModeKey",
 
 - (void)encodeWithCoder:(CPCoder)aCoder
 {
+    // FIXME Do we need to encode _datePickerTextfield and _datePickerCalendar? As subviews they'll be encoded, but when we decode we recreate them anyhow.
     [super encodeWithCoder:aCoder];
+
     [aCoder encodeDouble:_timeInterval forKey:CPIntervalKey];
     [aCoder encodeInt:_datePickerMode forKey:CPDatePickerModeKey];
     [aCoder encodeInt:_datePickerStyle forKey:CPDatePickerStyleKey];
@@ -655,6 +701,7 @@ var CPDatePickerModeKey         = @"CPDatePickerModeKey",
     [aCoder encodeObject:_backgroundColor forKey:CPBackgroundColorKey];
     [aCoder encodeObject:_drawsBackground forKey:CPDrawsBackgroundKey];
     [aCoder encodeObject:_isBordered forKey:CPBorderedKey];
+
 }
 
 @end
@@ -688,4 +735,4 @@ var CPDatePickerModeKey         = @"CPDatePickerModeKey",
     self.setMilliseconds(99);
 }
 
-@end
+@end

AppKit/CPDatePicker/_CPDatePickerCalendar.j

@@ -29,7 +29,11 @@
 @import <Foundation/Foundation.j>
 
 @class CPDatePicker
+@class _CPDatePickerMonthView
+@class _CPDatePickerHeaderView
+@class _CPDatePickerBox
 
+@global CPApp
 @global CPSingleDateMode
 @global CPRangeDateMode
 
@@ -43,6 +47,10 @@
 @global CPYearMonthDayDatePickerElementFlag
 @global CPEraDatePickerElementFlag
 
+@global CPAlternateKeyMask
+@global CPCommandKeyMask
+@global CPControlKeyMask
+
 var CPShortWeekDayNameArrayEn = [@"Mo", @"Tu", @"We", @"Th", @"Fr", @"Sa", @"Su"],
     CPShortWeekDayNameArrayUS = [@"Su", @"Mo", @"Tu", @"We", @"Th", @"Fr", @"Sa"],
     CPShortWeekDayNameArrayFr = [@"L", @"M", @"M", @"J", @"V", @"S", @"D"],
@@ -58,7 +66,7 @@ var CPShortWeekDayNameArrayEn = [@"Mo", @"Tu", @"We", @"Th", @"Fr", @"Sa", @"Su"
     _CPDatePickerMonthView          _monthView;
     _CPDatePickerHeaderView         _headerView;
     _CPDatePickerClock              _datePickerClock;
-    CPBox                           _box;
+    _CPDatePickerBox                _box;
     CPDatePicker                    _datePicker;
     CPInteger                       _startSelectionIndex;
     CPInteger                       _currentSelectionIndex;
@@ -80,6 +88,7 @@ var CPShortWeekDayNameArrayEn = [@"Mo", @"Tu", @"We", @"Th", @"Fr", @"Sa", @"Su"
         _datePicker = aDatePicker
         [self _init];
     }
+
     return self;
 }
 
@@ -91,7 +100,7 @@ var CPShortWeekDayNameArrayEn = [@"Mo", @"Tu", @"We", @"Th", @"Fr", @"Sa", @"Su"
         sizeCalendar = [_datePicker valueForThemeAttribute:@"size-calendar"],
         sizeClock = [_datePicker valueForThemeAttribute:@"size-clock"];
 
-    _box = [[_DatePickerBox alloc] initWithFrame:CGRectMake(0, 0, sizeCalendar.width, sizeHeader.height + sizeCalendar.height)];
+    _box = [[_CPDatePickerBox alloc] initWithFrame:CGRectMake(0, 0, sizeCalendar.width, sizeHeader.height + sizeCalendar.height)];
     [_box setDatePicker:_datePicker];
 
     _headerView = [[_CPDatePickerHeaderView alloc] initWithFrame:CGRectMake(0, 0, sizeHeader.width, sizeHeader.height) datePicker:_datePicker delegate:self];
@@ -113,11 +122,6 @@ var CPShortWeekDayNameArrayEn = [@"Mo", @"Tu", @"We", @"Th", @"Fr", @"Sa", @"Su"
 #pragma mark -
 #pragma mark Responder methods
 
-- (BOOL)becomeFirstResponder
-{
-    return YES;
-}
-
 - (BOOL)acceptsFirstResponder
 {
     return YES;
@@ -215,6 +219,8 @@ var CPShortWeekDayNameArrayEn = [@"Mo", @"Tu", @"We", @"Th", @"Fr", @"Sa", @"Su"
         [_headerView setHidden:YES];
         [_monthView setHidden:YES];
     }
+
+    [self setFrameSize:[_datePicker frameSize]];
 }
 
 
@@ -223,16 +229,62 @@ var CPShortWeekDayNameArrayEn = [@"Mo", @"Tu", @"We", @"Th", @"Fr", @"Sa", @"Su"
 
 /*! Move to the nextMonth without changing the dateValue of the datePicker
 */
-- (void)_nextMonth:(id)sender
+- (void)_clickArrowNext:(id)sender
 {
-    [self setDateValue:[_monthView nextMonth]];
+    var currentEvent = [CPApp currentEvent],
+        modifierFlags = [currentEvent modifierFlags];
+
+    if (modifierFlags & (CPCommandKeyMask | CPControlKeyMask | CPAlternateKeyMask))
+    {
+        var date = [[_monthView monthDate] copy];
+        date.setDate(1);
+
+        if (modifierFlags & CPAlternateKeyMask)
+            date.setUTCFullYear(date.getUTCFullYear() + 10);
+        else
+            date.setUTCFullYear(date.getUTCFullYear() + 1);
+
+        [self setDateValue:date];
+    }
+    else
+    {
+         [self _displayNextMonth];
+    }
+}
+
+- (void)_displayNextMonth
+{
+     [self setDateValue:[_monthView nextMonth]];
+}
+
+- (void)_displayPreviousMonth
+{
+    [self setDateValue:[_monthView previousMonth]];
 }
 
 /*! Move to the previous month without changing the dateValue of the datePicker
 */
-- (void)_previousMonth:(id)sender
+- (void)_clickArrowPrevious:(id)sender
 {
-    [self setDateValue:[_monthView previousMonth]];
+    var currentEvent = [CPApp currentEvent],
+        modifierFlags = [currentEvent modifierFlags];
+
+    if (modifierFlags & (CPCommandKeyMask | CPControlKeyMask | CPAlternateKeyMask))
+    {
+        var date = [[_monthView monthDate] copy];
+        date.setDate(1);
+
+        if (modifierFlags & CPAlternateKeyMask)
+            date.setUTCFullYear(date.getUTCFullYear() - 10);
+        else
+            date.setUTCFullYear(date.getUTCFullYear() - 1);
+
+        [self setDateValue:date];
+    }
+    else
+    {
+         [self _displayPreviousMonth];
+    }
 }
 
 /*! Move to the current selected day
@@ -334,10 +386,12 @@ var CPShortWeekDayNameArrayEn = [@"Mo", @"Tu", @"We", @"Th", @"Fr", @"Sa", @"Su"
         [self addSubview:_currentButton];
 
         [_previousButton setTarget:aDelegate];
-        [_previousButton setAction:@selector(_previousMonth:)];
+        [_previousButton setAction:@selector(_clickArrowPrevious:)];
+        [_previousButton setContinuous:YES];
 
         [_nextButton setTarget:aDelegate];
-        [_nextButton setAction:@selector(_nextMonth:)];
+        [_nextButton setAction:@selector(_clickArrowNext:)];
+        [_nextButton setContinuous:YES];
 
         [_currentButton setTarget:aDelegate];
         [_currentButton setAction:@selector(_currentMonth:)];
@@ -445,6 +499,9 @@ var CPShortWeekDayNameArrayEn = [@"Mo", @"Tu", @"We", @"Th", @"Fr", @"Sa", @"Su"
 */
 - (void)layoutSubviews
 {
+    if ([_datePicker datePickerStyle] == CPTextFieldAndStepperDatePickerStyle || [_datePicker datePickerStyle] == CPTextFieldDatePickerStyle)
+        return;
+
     var bounds = [self bounds],
         dayNames = [self _dayNames],
         width = CGRectGetWidth(bounds),
@@ -680,7 +737,7 @@ var CPShortWeekDayNameArrayEn = [@"Mo", @"Tu", @"We", @"Th", @"Fr", @"Sa", @"Su"
 
         [dayTile setDate:[currentDate copy]];
         [dayTile setStringValue:currentDate.getDate()];
-        [dayTile setDisabled:![self isEnabled] || currentDate.getMonth() !== currentMonth.getMonth()];
+        [dayTile setDisabled:![self isEnabled] || currentDate.getMonth() !== currentMonth.getMonth() || currentDate < [_datePicker minDate] || currentDate > [_datePicker maxDate]];
         [dayTile setHighlighted:isPresentMonth && currentDate.getDate() == now.getDate()];
     }
 
@@ -753,6 +810,9 @@ var CPShortWeekDayNameArrayEn = [@"Mo", @"Tu", @"We", @"Th", @"Fr", @"Sa", @"Su"
 */
 - (void)layoutSubviews
 {
+    if ([_datePicker datePickerStyle] == CPTextFieldAndStepperDatePickerStyle || [_datePicker datePickerStyle] == CPTextFieldDatePickerStyle)
+        return;
+
     [super layoutSubviews];
 
     [self tile];
@@ -839,26 +899,62 @@ var CPShortWeekDayNameArrayEn = [@"Mo", @"Tu", @"We", @"Th", @"Fr", @"Sa", @"Su"
     _indexDayTile = -1;
     _eventDragged = nil
 
+    _datePicker._invokedByUserEvent = YES;
+
     // Check if we have to change or not the month of the component
     if ([dayTile date].getMonth() == _date.getMonth())
     {
-        var minDate = [[_datePicker minDate] copy],
-            maxDate = [[_datePicker maxDate] copy];
+        if ([_datePicker datePickerMode] == CPRangeDateMode && [anEvent modifierFlags] & CPShiftKeyMask)
+        {
+            var dateValueAtMidnight = [[_datePicker dateValue] copy];
 
-        [minDate _resetToMidnight];
-        [maxDate _resetToLastSeconds];
+            [dateValueAtMidnight _resetToMidnight];
 
-        if (dateTile >= minDate && dateTile <= maxDate)
-            [_datePicker _setDateValue:[self _hoursMinutesSecondsFromDatePickerForDate:dateTile] timeInterval:0];
+            if (dateTile < dateValueAtMidnight)
+            {
+                var interval;
+
+                if (dateTile == dateValueAtMidnight)
+                    interval = [_datePicker timeInterval];
+                else
+                    interval = ([dateValueAtMidnight timeIntervalSinceDate:dateTile] + [_datePicker timeInterval]);
+
+                [_datePicker _setDateValue:[self _hoursMinutesSecondsFromDatePickerForDate:dateTile] timeInterval:interval];
+            }
+            else if ([[dayTile date] isEqualToDate:dateValueAtMidnight])
+            {
+                [_datePicker _setDateValue:[self _hoursMinutesSecondsFromDatePickerForDate:dateTile] timeInterval:0];
+            }
+            else
+            {
+                [_datePicker _setDateValue:[self _hoursMinutesSecondsFromDatePickerForDate:[dateValueAtMidnight copy]] timeInterval:([dateTile timeIntervalSinceDate:dateValueAtMidnight])];
+            }
+
+            // Be sure to display the good month
+            [_delegate setDateValue:dateTile];
+        }
+        else
+        {
+            var minDate = [[_datePicker minDate] copy],
+                maxDate = [[_datePicker maxDate] copy];
+
+            [minDate _resetToMidnight];
+            [maxDate _resetToLastSeconds];
+
+            if (dateTile >= minDate && dateTile <= maxDate)
+                [_datePicker _setDateValue:[self _hoursMinutesSecondsFromDatePickerForDate:dateTile] timeInterval:0];
+        }
     }
     else
     {
         // Check the year and the month. The year is usefull when changing from Jan to Dec.
         if (_date.getMonth() - [dayTile date].getMonth() == 1 || _date.getFullYear() - [dayTile date].getFullYear() == 1)
-            [_delegate _previousMonth:self];
+            [_delegate _displayPreviousMonth];
         else
-            [_delegate _nextMonth:self];
+            [_delegate _displayNextMonth];
     }
+
+    _datePicker._invokedByUserEvent = NO;
 }
 
 /*! Mouse dragged event
@@ -876,6 +972,8 @@ var CPShortWeekDayNameArrayEn = [@"Mo", @"Tu", @"We", @"Th", @"Fr", @"Sa", @"Su"
     _indexDayTile = [self indexOfTileForEvent:anEvent];
     _eventDragged = anEvent;
 
+    _datePicker._invokedByUserEvent = YES;
+
     if ([_datePicker datePickerMode] == CPSingleDateMode)
     {
         // Check if we have to change or not the month of the component
@@ -893,9 +991,9 @@ var CPShortWeekDayNameArrayEn = [@"Mo", @"Tu", @"We", @"Th", @"Fr", @"Sa", @"Su"
 
             // Check the year and the month. The year is usefull when changing from Jan to Dec.
             if (_date.getMonth() - [dayTile date].getMonth() == 1 || _date.getFullYear() - [dayTile date].getFullYear() == 1)
-                [_delegate _previousMonth:self];
+                [_delegate _displayPreviousMonth];
             else
-                [_delegate _nextMonth:self];
+                [_delegate _displayNextMonth];
         }
     }
     else
@@ -917,6 +1015,8 @@ var CPShortWeekDayNameArrayEn = [@"Mo", @"Tu", @"We", @"Th", @"Fr", @"Sa", @"Su"
                 [_datePicker _setDateValue:[self _hoursMinutesSecondsFromDatePickerForDate:_clickDate] timeInterval:[dateTile timeIntervalSinceDate:dateValueAtMidnight]];
         }
     }
+
+    _datePicker._invokedByUserEvent = NO;
 }
 
 - (void)mouseUp:(CPEvent)anEvent
@@ -938,7 +1038,7 @@ var CPShortWeekDayNameArrayEn = [@"Mo", @"Tu", @"We", @"Th", @"Fr", @"Sa", @"Su"
     if (_isMonthJustChanged)
     {
         _dragDate.setMonth(_date.getMonth() + 1);
-        [_delegate _nextMonth:self];
+        [_delegate _displayNextMonth];
     }
 }
 
@@ -947,7 +1047,7 @@ var CPShortWeekDayNameArrayEn = [@"Mo", @"Tu", @"We", @"Th", @"Fr", @"Sa", @"Su"
     if (_isMonthJustChanged)
     {
         _dragDate.setMonth(_date.getMonth() - 1);
-        [_delegate _previousMonth:self];
+        [_delegate _displayPreviousMonth];
     }
 }
 
@@ -1014,30 +1114,30 @@ var CPShortWeekDayNameArrayEn = [@"Mo", @"Tu", @"We", @"Th", @"Fr", @"Sa", @"Su"
         [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-text-shadow-color" inState:CPThemeStateDisabled] forThemeAttribute:@"text-shadow-color" inState:CPThemeStateDisabled];
         [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-text-shadow-offset" inState:CPThemeStateDisabled] forThemeAttribute:@"text-shadow-offset" inState:CPThemeStateDisabled];
 
-        [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-font" inState:CPThemeStateDisabled | CPThemeStateSelected] forThemeAttribute:@"font" inState:CPThemeStateDisabled | CPThemeStateSelected];
-        [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-text-color" inState:CPThemeStateDisabled | CPThemeStateSelected] forThemeAttribute:@"text-color" inState:CPThemeStateDisabled | CPThemeStateSelected];
-        [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-text-shadow-color" inState:CPThemeStateDisabled | CPThemeStateSelected] forThemeAttribute:@"text-shadow-color" inState:CPThemeStateDisabled | CPThemeStateSelected];
-        [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-text-shadow-offset" inState:CPThemeStateDisabled | CPThemeStateSelected] forThemeAttribute:@"text-shadow-offset" inState:CPThemeStateDisabled | CPThemeStateSelected];
+        [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-font" inState:[CPThemeStateDisabled, CPThemeStateSelected]] forThemeAttribute:@"font" inState:[CPThemeStateDisabled, CPThemeStateSelected]];
+        [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-text-color" inState:[CPThemeStateDisabled, CPThemeStateSelected]]forThemeAttribute:@"text-color" inState:[CPThemeStateDisabled, CPThemeStateSelected]];
+        [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-text-shadow-color" inState:[CPThemeStateDisabled, CPThemeStateSelected]] forThemeAttribute:@"text-shadow-color" inState:[CPThemeStateDisabled, CPThemeStateSelected]];
+        [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-text-shadow-offset" inState:[CPThemeStateDisabled, CPThemeStateSelected]] forThemeAttribute:@"text-shadow-offset" inState:[CPThemeStateDisabled, CPThemeStateSelected]];
 
         [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-font" inState:CPThemeStateHighlighted] forThemeAttribute:@"font" inState:CPThemeStateHighlighted];
         [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-text-color" inState:CPThemeStateHighlighted] forThemeAttribute:@"text-color" inState:CPThemeStateHighlighted];
         [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-text-shadow-color" inState:CPThemeStateHighlighted] forThemeAttribute:@"text-shadow-color" inState:CPThemeStateHighlighted];
         [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-text-shadow-offset" inState:CPThemeStateHighlighted] forThemeAttribute:@"text-shadow-offset" inState:CPThemeStateHighlighted];
 
-        [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-font" inState:CPThemeStateHighlighted | CPThemeStateSelected] forThemeAttribute:@"font" inState:CPThemeStateHighlighted | CPThemeStateSelected];
-        [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-text-color" inState:CPThemeStateHighlighted | CPThemeStateSelected] forThemeAttribute:@"text-color" inState:CPThemeStateHighlighted | CPThemeStateSelected];
-        [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-text-shadow-color" inState:CPThemeStateHighlighted | CPThemeStateSelected] forThemeAttribute:@"text-shadow-color" inState:CPThemeStateHighlighted | CPThemeStateSelected];
-        [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-text-shadow-offset" inState:CPThemeStateHighlighted | CPThemeStateSelected] forThemeAttribute:@"text-shadow-offset" inState:CPThemeStateHighlighted | CPThemeStateSelected];
+        [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-font" inState:[CPThemeStateHighlighted, CPThemeStateSelected]] forThemeAttribute:@"font" inState:[CPThemeStateHighlighted, CPThemeStateSelected]];
+        [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-text-color" inState:[CPThemeStateHighlighted, CPThemeStateSelected]] forThemeAttribute:@"text-color" inState:[CPThemeStateHighlighted, CPThemeStateSelected]];
+        [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-text-shadow-color" inState:[CPThemeStateHighlighted, CPThemeStateSelected]] forThemeAttribute:@"text-shadow-color" inState:[CPThemeStateHighlighted, CPThemeStateSelected]];
+        [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-text-shadow-offset" inState:[CPThemeStateHighlighted, CPThemeStateSelected]] forThemeAttribute:@"text-shadow-offset" inState:[CPThemeStateHighlighted, CPThemeStateSelected]];
 
-        [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-font" inState: CPThemeStateDisabled | CPThemeStateHighlighted | CPThemeStateSelected] forThemeAttribute:@"font" inState: CPThemeStateDisabled | CPThemeStateHighlighted | CPThemeStateSelected];
-        [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-text-color" inState: CPThemeStateDisabled | CPThemeStateHighlighted | CPThemeStateSelected] forThemeAttribute:@"text-color" inState: CPThemeStateDisabled | CPThemeStateHighlighted | CPThemeStateSelected];
-        [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-text-shadow-color" inState: CPThemeStateDisabled | CPThemeStateHighlighted | CPThemeStateSelected] forThemeAttribute:@"text-shadow-color" inState: CPThemeStateDisabled | CPThemeStateHighlighted | CPThemeStateSelected];
-        [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-text-shadow-offset" inState: CPThemeStateDisabled | CPThemeStateHighlighted | CPThemeStateSelected] forThemeAttribute:@"text-shadow-offset" inState: CPThemeStateDisabled | CPThemeStateHighlighted | CPThemeStateSelected];
+        [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-font" inState:[CPThemeStateDisabled, CPThemeStateHighlighted, CPThemeStateSelected]] forThemeAttribute:@"font" inState:[CPThemeStateDisabled, CPThemeStateHighlighted, CPThemeStateSelected]];
+        [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-text-color" inState:[CPThemeStateDisabled, CPThemeStateHighlighted, CPThemeStateSelected]] forThemeAttribute:@"text-color" inState:[CPThemeStateDisabled, CPThemeStateHighlighted, CPThemeStateSelected]];
+        [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-text-shadow-color" inState:[CPThemeStateDisabled, CPThemeStateHighlighted, CPThemeStateSelected]] forThemeAttribute:@"text-shadow-color" inState:[CPThemeStateDisabled, CPThemeStateHighlighted, CPThemeStateSelected]];
+        [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-text-shadow-offset" inState:[CPThemeStateDisabled, CPThemeStateHighlighted, CPThemeStateSelected]] forThemeAttribute:@"text-shadow-offset" inState:[CPThemeStateDisabled, CPThemeStateHighlighted, CPThemeStateSelected]];
 
-        [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-font" inState: CPThemeStateDisabled | CPThemeStateHighlighted ] forThemeAttribute:@"font" inState: CPThemeStateDisabled | CPThemeStateHighlighted ];
-        [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-text-color" inState: CPThemeStateDisabled | CPThemeStateHighlighted ] forThemeAttribute:@"text-color" inState: CPThemeStateDisabled | CPThemeStateHighlighted ];
-        [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-text-shadow-color" inState: CPThemeStateDisabled | CPThemeStateHighlighted ] forThemeAttribute:@"text-shadow-color" inState: CPThemeStateDisabled | CPThemeStateHighlighted ];
-        [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-text-shadow-offset" inState: CPThemeStateDisabled | CPThemeStateHighlighted ] forThemeAttribute:@"text-shadow-offset" inState: CPThemeStateDisabled | CPThemeStateHighlighted];
+        [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-font" inState:[CPThemeStateDisabled, CPThemeStateHighlighted]] forThemeAttribute:@"font" inState:[CPThemeStateDisabled, CPThemeStateHighlighted]];
+        [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-text-color" inState:[CPThemeStateDisabled, CPThemeStateHighlighted]] forThemeAttribute:@"text-color" inState:[CPThemeStateDisabled, CPThemeStateHighlighted]];
+        [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-text-shadow-color" inState:[CPThemeStateDisabled, CPThemeStateHighlighted]] forThemeAttribute:@"text-shadow-color" inState:[CPThemeStateDisabled, CPThemeStateHighlighted]];
+        [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-text-shadow-offset" inState:[CPThemeStateDisabled, CPThemeStateHighlighted]] forThemeAttribute:@"text-shadow-offset" inState:[CPThemeStateDisabled, CPThemeStateHighlighted]];
 
         [self addSubview:_textField];
 
@@ -1053,7 +1153,7 @@ var CPShortWeekDayNameArrayEn = [@"Mo", @"Tu", @"We", @"Th", @"Fr", @"Sa", @"Su"
 
 /*! Set a theme
 */
-- (void)setThemeState:(CPThemeState)aState
+- (BOOL)setThemeState:(ThemeState)aState
 {
     [_textField setThemeState:aState];
     [super setThemeState:aState];
@@ -1061,7 +1161,7 @@ var CPShortWeekDayNameArrayEn = [@"Mo", @"Tu", @"We", @"Th", @"Fr", @"Sa", @"Su"
 
 /*! Unset a theme
 */
-- (void)unsetThemeState:(CPThemeState)aState
+- (BOOL)unsetThemeState:(ThemeState)aState
 {
     [_textField unsetThemeState:aState];
     [super unsetThemeState:aState];
@@ -1133,6 +1233,9 @@ var CPShortWeekDayNameArrayEn = [@"Mo", @"Tu", @"We", @"Th", @"Fr", @"Sa", @"Su"
 */
 - (void)layoutSubviews
 {
+    if ([_datePicker datePickerStyle] == CPTextFieldAndStepperDatePickerStyle || [_datePicker datePickerStyle] == CPTextFieldDatePickerStyle)
+        return;
+
     var bounds = [self bounds];
     [_textField sizeToFit];
     [_textField setFrameOrigin:CGPointMake(bounds.size.width / 2 - [_textField frameSize].width / 2 + [_datePicker valueForThemeAttribute:@"border-width"], bounds.size.height / 2 - [_textField frameSize].height / 2)];
@@ -1147,7 +1250,7 @@ var CPShortWeekDayNameArrayEn = [@"Mo", @"Tu", @"We", @"Th", @"Fr", @"Sa", @"Su"
     var themeState = [self themeState],
         context = [[CPGraphicsContext currentContext] graphicsPort];
 
-    if (themeState & CPThemeStateSelected)
+    if (themeState.hasThemeState(CPThemeStateSelected))
     {
         [self setBackgroundColor:[_datePicker valueForThemeAttribute:@"bezel-color-calendar" inState:themeState]];
         CGContextSetLineWidth(context, [_datePicker valueForThemeAttribute:@"border-width"]);
@@ -1166,19 +1269,11 @@ var CPShortWeekDayNameArrayEn = [@"Mo", @"Tu", @"We", @"Th", @"Fr", @"Sa", @"Su"
 @end
 
 
-@implementation _DatePickerBox : CPView
+@implementation _CPDatePickerBox : CPView
 {
     CPDatePicker _datePicker @accessors(property=datePicker);
 }
 
-- (id)init
-{
-    if (self = [super init])
-    {
-    }
-    return self;
-}
-
 - (void)drawRect:(CGRect)aRect
 {
     [super drawRect:aRect];
@@ -1192,10 +1287,10 @@ var CPShortWeekDayNameArrayEn = [@"Mo", @"Tu", @"We", @"Th", @"Fr", @"Sa", @"Su"
         CGContextSetStrokeColor(context, [_datePicker valueForThemeAttribute:@"border-color" inState:[_datePicker themeState]]);
         CGContextSetLineWidth(context,  [_datePicker valueForThemeAttribute:@"border-width"]);
 
-        CGContextMoveToPoint(context, borderWidth,borderWidth);
-        CGContextAddLineToPoint(context, aRect.size.width - borderWidth,borderWidth);
-        CGContextAddLineToPoint(context, aRect.size.width - borderWidth,aRect.size.height - borderWidth);
-        CGContextAddLineToPoint(context, borderWidth,aRect.size.height - borderWidth);
+        CGContextMoveToPoint(context, borderWidth, borderWidth);
+        CGContextAddLineToPoint(context, aRect.size.width - borderWidth, borderWidth);
+        CGContextAddLineToPoint(context, aRect.size.width - borderWidth, aRect.size.height - borderWidth);
+        CGContextAddLineToPoint(context, borderWidth, aRect.size.height - borderWidth);
         CGContextAddLineToPoint(context, borderWidth,borderWidth);
 
         CGContextStrokePath(context);
@@ -1205,11 +1300,13 @@ var CPShortWeekDayNameArrayEn = [@"Mo", @"Tu", @"We", @"Th", @"Fr", @"Sa", @"Su"
 
 - (void)layoutSubviews
 {
+    if ([_datePicker datePickerStyle] == CPTextFieldAndStepperDatePickerStyle || [_datePicker datePickerStyle] == CPTextFieldDatePickerStyle)
+        return;
+
     if ([_datePicker drawsBackground])
         [self setBackgroundColor:[_datePicker backgroundColor]];
     else
         [self setBackgroundColor:[CPColor clearColor]];
 }
 
-
 @end

AppKit/CPDatePicker/_CPDatePickerClock.j

@@ -1,4 +1,5 @@
-/* _CPDatePickerClock.j
+/*
+* _CPDatePickerClock.j
 * AppKit
 *
 * Created by Alexandre Wilhelm
@@ -24,9 +25,15 @@
 @import "CPImageView.j"
 @import "CALayer.j"
 
+@class _CPCibCustomResource
 @class CPDatePicker
 
 @global CPHourMinuteSecondDatePickerElementFlag
+@global CPTextFieldAndStepperDatePickerStyle
+@global CPTextFieldDatePickerStyle
+
+var RADIANS = Math.PI / 180;
+
 
 @implementation _CPDatePickerClock : CPView
 {
@@ -44,11 +51,6 @@
 #pragma mark -
 #pragma mark Init methods
 
-/*! Init a new _CPDatePickerClock
-    @param aFrame
-    @param aDatePicker
-    @return a new instance of _CPDatePickerClock
-*/
 - (id)initWithFrame:(CGRect)aFrame datePicker:(CPDatePicker)aDatePicker
 {
     if (self = [super initWithFrame:aFrame])
@@ -110,8 +112,8 @@
         [_rootLayer addSublayer:_middleHandLayer];
 
         [_rootLayer setNeedsDisplay];
-
     }
+
     return self;
 }
 
@@ -119,10 +121,11 @@
 #pragma mark -
 #pragma mark Layout methods
 
-/*! Layout the subviews
-*/
 - (void)layoutSubviews
 {
+    if ([_datePicker datePickerStyle] == CPTextFieldAndStepperDatePickerStyle || [_datePicker datePickerStyle] == CPTextFieldDatePickerStyle)
+        return;
+
     [super layoutSubviews];
 
     var bounds = [self bounds],
@@ -130,11 +133,11 @@
 
     [dateValue _dateWithTimeZone:[_datePicker timeZone]];
 
-    [self setBackgroundColor:[_datePicker valueForThemeAttribute:@"bezel-color-clock" inState:[_datePicker themeState]]];
-    [_middleHandLayer setBackgroundHandColor:[_datePicker valueForThemeAttribute:@"middle-hand-color" inState:[_datePicker themeState]]];
-    [_hourHandLayer setBackgroundHandColor:[_datePicker valueForThemeAttribute:@"hour-hand-color" inState:[_datePicker themeState]]];
-    [_minuteHandLayer setBackgroundHandColor:[_datePicker valueForThemeAttribute:@"minute-hand-color" inState:[_datePicker themeState]]];
-    [_secondHandLayer setBackgroundHandColor:[_datePicker valueForThemeAttribute:@"second-hand-color" inState:[_datePicker themeState]]];
+    [self setBackgroundColor:[_datePicker currentValueForThemeAttribute:@"bezel-color-clock"]];
+    [_middleHandLayer setImage:[_datePicker currentValueForThemeAttribute:@"middle-hand-image"]];
+    [_hourHandLayer setImage:[_datePicker currentValueForThemeAttribute:@"hour-hand-image"]];
+    [_minuteHandLayer setImage:[_datePicker currentValueForThemeAttribute:@"minute-hand-image"]];
+    [_secondHandLayer setImage:[_datePicker currentValueForThemeAttribute:@"second-hand-image"]];
 
     if ([_datePicker _isEnglishFormat])
     {
@@ -156,6 +159,12 @@
     [_minuteHandLayer setRotationRadians:[self _minutePositionRadianForDate:dateValue]];
     [_secondHandLayer setRotationRadians:[self _secondPositionRadianForDate:dateValue]];
 
+    [_PMAMTextField setEnabled:_isEnabled];
+    [_hourHandLayer setEnabled:_isEnabled];
+    [_middleHandLayer setEnabled:_isEnabled];
+    [_secondHandLayer setEnabled:_isEnabled];
+    [_minuteHandLayer setEnabled:_isEnabled];
+
     // Check if we have to display the hand second
     if (([_datePicker datePickerElements] & CPHourMinuteSecondDatePickerElementFlag) == CPHourMinuteSecondDatePickerElementFlag)
         [_secondHandLayer setHidden:NO];
@@ -167,46 +176,41 @@
 
 
 #pragma mark -
-#pragma mark Getter Setter methods
+#pragma mark Accessors
 
-/*! Return the radian position of the hour
-*/
 - (float)_hourPositionRadianForDate:(CPDate)aDate
 {
     var hours = aDate.getHours() + aDate.getMinutes() / 60;
 
-    return (360 * hours / 12) * (Math.PI / 180)
+    return (360 * hours / 12) * RADIANS;
 }
 
-/*! Return the radian position of the second
-*/
 - (float)_secondPositionRadianForDate:(CPDate)aDate
 {
-    return (360 * aDate.getSeconds() / 60) * (Math.PI / 180)
+    return (360 * aDate.getSeconds() / 60) * RADIANS;
 }
 
-/*! Return the radian position of the minute
-*/
 - (float)_minutePositionRadianForDate:(CPDate)aDate
 {
     var minutes = aDate.getMinutes() + aDate.getSeconds() / 60;
 
-    return (360 * minutes / 60) * (Math.PI / 180)
+    return (360 * minutes / 60) * RADIANS;
 }
 
-/*! Set enabled
-    @param aBoolean
-*/
-- (void)setEnabled:(BOOL)aBoolean
+- (void)setEnabled:(BOOL)shouldEnable
 {
-    _isEnabled = aBoolean;
-    [_PMAMTextField setEnabled:aBoolean];
-    [_hourHandLayer setEnabled:aBoolean];
-    [_middleHandLayer setEnabled:aBoolean];
-    [_secondHandLayer setEnabled:aBoolean];
-    [_minuteHandLayer setEnabled:aBoolean];
+    shouldEnable = !!shouldEnable;
 
+    if (shouldEnable === _isEnabled)
+        return;
+
+    _isEnabled = shouldEnable;
     [self setNeedsLayout];
+
+    // FIXME: This is a workaround for an apparent bug in CALayer.
+    // Without pumping the event loop, the sublayers of _rootLayer
+    // (the hands) are not redrawn until an event occurs.
+    [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
 }
 
 @end
@@ -216,6 +220,7 @@
 {
     BOOL    _isEnabled      @accessors(setter=setEnabled:, getter=isEnabled);
 
+    CPImage _image;
     CALayer _imageLayer;
     float   _rotationRadians;
 }
@@ -224,10 +229,6 @@
 #pragma mark -
 #pragma mark Init methods
 
-/*! Init a new hand layer with an image. The image will be draw in a ImageLayer
-    @param anImage
-    @return a new instance of handLayer
-*/
 - (id)initWithSize:(CGSize)aSize
 {
     if (self = [super init])
@@ -241,6 +242,7 @@
 
         [self addSublayer:_imageLayer];
     }
+
     return self;
 }
 
@@ -248,8 +250,8 @@
 #pragma mark -
 #pragma mark Setter Getter methods
 
-/*! Set the bounds of the layer. The imageLayer will be at the center of this bounds
-    @param aRect
+/*!
+    Set the bounds of the layer. The imageLayer will be at the center of this bounds.
 */
 - (void)setBounds:(CGRect)aRect
 {
@@ -258,12 +260,22 @@
     [_imageLayer setPosition:CGPointMake(CGRectGetMidX(aRect), CGRectGetMidY(aRect))];
 }
 
-/*! Set the rotation of the imageLayer
-    @param radians
-*/
+- (void)setImage:(CPImage)anImage
+{
+    if (_image === anImage)
+        return;
+
+    if ([anImage isKindOfClass:[_CPCibCustomResource class]])
+        _image = [anImage imageFromCoder:nil];
+    else
+        _image = anImage;
+
+    [_imageLayer setNeedsDisplay];
+}
+
 - (void)setRotationRadians:(float)radians
 {
-    if (_rotationRadians == radians)
+    if (_rotationRadians === radians)
         return;
 
     _rotationRadians = radians;
@@ -273,15 +285,29 @@
         1.0, 1.0)];
 }
 
-- (void)setBackgroundHandColor:(CPColor)aColor
+- (void)setEnabled:(BOOL)shouldEnable
 {
-    [_imageLayer setBackgroundColor:aColor];
+    shouldEnable = !!shouldEnable;
+
+    if (_isEnabled === shouldEnable)
+        return;
+
+    _isEnabled = shouldEnable;
+    [self setNeedsDisplay];
+    [_imageLayer setNeedsDisplay];
 }
 
-- (void)setEnabled:(BOOL)aBoolean
+- (void)imageDidLoad:(CPImage)anImage
 {
-    _isEnabled = aBoolean;
-    [self setNeedsDisplay];
+    [_imageLayer setNeedsDisplay];
+}
+
+- (void)drawLayer:(CALayer)aLayer inContext:(CGContext)aContext
+{
+    if ([_image loadStatus] != CPImageLoadStatusCompleted)
+        [_image setDelegate:self];
+    else
+        CGContextDrawImage(aContext, [aLayer bounds], _image);
 }
 
 @end

AppKit/CPDocument.j

@@ -244,11 +244,6 @@ var CPDocumentUntitledCount = 0;
 {
 }
 
-- (CPWindowController)firstEligibleExistingWindowController
-{
-    return nil;
-}
-
 // Creating and managing window controllers
 /*!
     Creates the window controller for this document.
@@ -261,6 +256,7 @@ var CPDocumentUntitledCount = 0;
 - (void)makeViewAndWindowControllers
 {
     var viewCibName = [self viewCibName],
+        windowCibName = [self windowCibName],
         viewController = nil,
         windowController = nil;
 
@@ -268,31 +264,21 @@ var CPDocumentUntitledCount = 0;
     if ([viewCibName length])
         viewController = [[CPViewController alloc] initWithCibName:viewCibName bundle:nil owner:self];
 
-    // If we have a view controller, check if we have a free window for it.
-    if (viewController)
-        windowController = [self firstEligibleExistingWindowController];
+    // From a cib if we have one.
+    if ([windowCibName length])
+        windowController = [[CPWindowController alloc] initWithWindowCibName:windowCibName owner:self];
 
-    // If not, create one.
-    if (!windowController)
+    // If not you get a standard window capable of displaying multiple documents and view
+    else if (viewController)
     {
-        var windowCibName = [self windowCibName];
+        var view = [viewController view],
+            viewFrame = [view frame];
 
-        // From a cib if we have one.
-        if ([windowCibName length])
-            windowController = [[CPWindowController alloc] initWithWindowCibName:windowCibName owner:self];
+        viewFrame.origin = CGPointMake(50, 50);
 
-        // If not you get a standard window capable of displaying multiple documents and view
-        else if (viewController)
-        {
-            var view = [viewController view],
-                viewFrame = [view frame];
+        var theWindow = [[CPWindow alloc] initWithContentRect:viewFrame styleMask:CPTitledWindowMask | CPClosableWindowMask | CPMiniaturizableWindowMask | CPResizableWindowMask];
 
-            viewFrame.origin = CGPointMake(50, 50);
-
-            var theWindow = [[CPWindow alloc] initWithContentRect:viewFrame styleMask:CPTitledWindowMask | CPClosableWindowMask | CPMiniaturizableWindowMask | CPResizableWindowMask];
-
-            windowController = [[CPWindowController alloc] initWithWindow:theWindow];
-        }
+        windowController = [[CPWindowController alloc] initWithWindow:theWindow];
     }
 
     if (windowController && viewController)

AppKit/CPDocumentController.j

@@ -253,6 +253,14 @@ var CPSharedDocumentController = nil;
     return _documents;
 }
 
+/*!
+    Returns the CPDocument object associated with the main window.
+*/
+- (CPDocument)currentDocument
+{
+    return [[[CPApp mainWindow] windowController] document];
+}
+
 /*!
     Adds \c aDocument under the control of the receiver.
     @param aDocument the document to add
@@ -271,6 +279,33 @@ var CPSharedDocumentController = nil;
     [_documents removeObjectIdenticalTo:aDocument];
 }
 
+/*!
+    Returns the document object whose window controller
+    owns a specified window.
+*/
+- (CPDocument)documentForWindow:(CPWindow)aWindow
+{
+   return [[aWindow windowController] document];
+}
+
+/*!
+    Returns a Boolean value that indicates whether the receiver
+    has any documents with unsaved changes.
+*/
+- (BOOL)hasEditedDocuments
+{
+    var iter = [_documents objectEnumerator],
+        obj;
+
+    while ((obj = [iter nextObject]) !== nil)
+    {
+        if ([obj isDocumentEdited])
+            return YES;
+    }
+
+    return NO;
+}
+
 - (CPString)defaultType
 {
     return [_documentTypes[0] objectForKey:@"CPBundleTypeName"];

AppKit/CPDragServer_Constants.j

@@ -20,6 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+@typedef CPDragOperation
 CPDragOperationNone     = 0;
 CPDragOperationCopy     = 1 << 1;
 CPDragOperationLink     = 1 << 1;

AppKit/CPEvent.j

@@ -31,9 +31,15 @@
 @import "CPText.j"
 
 @class CPTextField
+@class CPWindow
+@class CPGraphicsContext
 
 @global CPApp
 
+@typedef DOMEvent
+@typedef CPEventType
+
+
 var _CPEventPeriodicEventPeriod         = 0,
     _CPEventPeriodicEventTimer          = nil,
     _CPEventUpperCaseRegex              = new RegExp("[A-Z]"),
@@ -68,6 +74,14 @@ var _CPEventPeriodicEventPeriod         = 0,
     float               _deltaX;
     float               _deltaY;
     float               _deltaZ;
+    float               _scrollingDeltaX;
+    float               _scrollingDeltaY;
+    BOOL                _hasPreciseScrollingDeltas;
+
+#if PLATFORM(DOM)
+    BOOL                _suppressCappuccinoCut;
+    BOOL                _suppressCappuccinoPaste;
+#endif
 }
 
 /*!
@@ -158,7 +172,9 @@ var _CPEventPeriodicEventPeriod         = 0,
 
         // Make sure these are 0 rather than nil.
         _deltaX = 0;
+        _scrollingDeltaX = 0;
         _deltaY = 0;
+        _scrollingDeltaY = 0;
         _deltaZ = 0;
     }
 
@@ -412,6 +428,31 @@ var _CPEventPeriodicEventPeriod         = 0,
     return _deltaZ;
 }
 
+- (BOOL)hasPreciseScrollingDeltas
+{
+    return !!_hasPreciseScrollingDeltas;
+}
+
+/*!
+    Returns the change in points on the x-axis for a mouse movement, unless hasPreciseScrollingDeltas is NO,
+    in which case the change is measured in number of "lines" or "rows" and needs to be multiplied as appropriate
+    to get change in pixels.
+*/
+- (float)scrollingDeltaX
+{
+    return _scrollingDeltaX;
+}
+
+/*!
+    Returns the change in points on the y-axis for a mouse movement, unless hasPreciseScrollingDeltas is NO,
+    in which case the change is measured in number of "lines" or "columns" and needs to be multiplied as appropriate
+    to get change in pixels.
+*/
+- (float)scrollingDeltaY
+{
+    return _scrollingDeltaY;
+}
+
 - (BOOL)_triggersKeyEquivalent:(CPString)aKeyEquivalent withModifierMask:aKeyEquivalentModifierMask
 {
     if (!aKeyEquivalent)
@@ -473,6 +514,24 @@ var _CPEventPeriodicEventPeriod         = 0,
     return !firstResponderIsText;
 }
 
+/*!
+    Return YES if this event is a part of processing a browser controlled cut or paste event
+    where the browser will go ahead and do the work of cutting or pasting within the input
+    element after processing of this event. The implication is that it should not be done by
+    the CPTextField (or whatever else is controlling the input) since this would result in
+    nothing being cut (because the field already cut the text out), or a double paste
+    (because the field pasted as well as the browser).
+*/
+- (BOOL)_platformIsEffectingCutOrPaste
+{
+#if PLATFORM(DOM)
+    return _suppressCappuccinoCut || _suppressCappuccinoPaste;
+#else
+    return NO;
+#endif
+}
+
+
 /*!
     Generates periodic events every \c aPeriod seconds.
 

AppKit/CPFlashView.j

@@ -189,7 +189,7 @@ var IEFlashCLSID = "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000";
     return @"CPFV_" + [self UID];
 }
 
-- (void)mouseMoved:(id)sommit
+- (void)mouseMoved:(CPEvent)sommit
 {
     [[[self window] platformWindow] _propagateCurrentDOMEvent:YES];
 }

AppKit/CPFont.j

@@ -174,20 +174,20 @@ following:
     return _CPFontSystemFontSize;
 }
 
-+ (float)systemFontSizeForControlSize:(CPControlSize)aSize
++ (CPFont)systemFontForControlSize:(CPControlSize)aSize
 {
     // TODO These sizes should be themable or made less arbitrary in some other way.
     switch (aSize)
     {
         case CPSmallControlSize:
-            return _CPFontSystemFontSize - 1;
+            return [self systemFontOfSize:_CPFontSystemFontSize - 1];
 
         case CPMiniControlSize:
-            return _CPFontSystemFontSize - 2;
+            return [self systemFontOfSize:_CPFontSystemFontSize - 2];
 
         case CPRegularControlSize:
         default:
-            return _CPFontSystemFontSize;
+            return [self systemFontOfSize:_CPFontSystemFontSize];
     }
 }
 
@@ -208,7 +208,7 @@ following:
     var systemSize = String(_CPFontSystemFontSize),
         currentSize = String(CPFontCurrentSystemSize);
 
-    for (key in _CPSystemFontCache)
+    for (var key in _CPSystemFontCache)
     {
         if (_CPSystemFontCache.hasOwnProperty(key) &&
             (key.indexOf(systemSize) === 0 || key.indexOf(currentSize) === 0))

AppKit/CPImage.j

@@ -30,6 +30,20 @@
 @import "CGGeometry.j"
 @import "CPCompatibility.j"
 
+
+@protocol CPImageDelegate <CPObject>
+
+@optional
+- (void)imageDidLoad:(CPImage)anImage;
+- (void)imageDidError:(CPImage)anImage;
+- (void)imageDidAbort:(CPImage)anImage;
+
+@end
+
+var CPImageDelegate_imageDidLoad_   = 1 << 1,
+    CPImageDelegate_imageDidError_  = 1 << 2,
+    CPImageDelegate_imageDidAbort_  = 1 << 3;
+
 CPImageLoadStatusInitialized    = 0;
 CPImageLoadStatusLoading        = 1;
 CPImageLoadStatusCompleted      = 2;
@@ -119,14 +133,15 @@ function CPAppKitImage(aFilename, aSize)
 */
 @implementation CPImage : CPObject
 {
-    CGSize      _size;
-    CPString    _filename;
-    CPString    _name;
+    CGSize                  _size;
+    CPString                _filename;
+    CPString                _name;
 
-    id          _delegate;
-    unsigned    _loadStatus;
+    id <CPImageDelegate>    _delegate;
+    unsigned                _loadStatus;
+    unsigned                _implementedDelegateMethods;
 
-    Image       _image;
+    Image                   _image;
 }
 
 - (id)init
@@ -136,14 +151,19 @@ function CPAppKitImage(aFilename, aSize)
 
 /*!
     Initializes the image, by associating it with a filename. The image
-    denoted in \c aFilename is not actually loaded. It will
-    be loaded once needed.
+    denoted in \c aFilename is not actually loaded. It will be loaded
+    once needed.
+
     @param aFilename the file containing the image
     @param aSize the image's size
     @return the initialized image
 */
 - (id)initByReferencingFile:(CPString)aFilename size:(CGSize)aSize
 {
+    // Quietly return nil like in Cocoa, rather than crashing later.
+    if (aFilename === undefined || aFilename === nil)
+        return nil;
+
     self = [super init];
 
     if (self)
@@ -314,9 +334,22 @@ function CPAppKitImage(aFilename, aSize)
     Sets the receiver's delegate.
     @param the delegate
 */
-- (void)setDelegate:(id)aDelegate
+- (void)setDelegate:(id <CPImageDelegate>)aDelegate
 {
+    if (_delegate === aDelegate)
+        return;
+
     _delegate = aDelegate;
+    _implementedDelegateMethods = 0;
+
+    if ([_delegate respondsToSelector:@selector(imageDidLoad:)])
+        _implementedDelegateMethods |= CPImageDelegate_imageDidLoad_;
+
+    if ([_delegate respondsToSelector:@selector(imageDidError:)])
+        _implementedDelegateMethods |= CPImageDelegate_imageDidError_;
+
+    if ([_delegate respondsToSelector:@selector(imageDidAbort:)])
+        _implementedDelegateMethods |= CPImageDelegate_imageDidAbort_;
 }
 
 /*!
@@ -452,7 +485,7 @@ function CPAppKitImage(aFilename, aSize)
         postNotificationName:CPImageDidLoadNotification
         object:self];
 
-    if ([_delegate respondsToSelector:@selector(imageDidLoad:)])
+    if (_implementedDelegateMethods & CPImageDelegate_imageDidLoad_)
         [_delegate imageDidLoad:self];
 }
 
@@ -461,7 +494,7 @@ function CPAppKitImage(aFilename, aSize)
 {
     _loadStatus = CPImageLoadStatusReadError;
 
-    if ([_delegate respondsToSelector:@selector(imageDidError:)])
+    if (_implementedDelegateMethods & CPImageDelegate_imageDidError_)
         [_delegate imageDidError:self];
 }
 
@@ -470,7 +503,7 @@ function CPAppKitImage(aFilename, aSize)
 {
     _loadStatus = CPImageLoadStatusCancelled;
 
-    if ([_delegate respondsToSelector:@selector(imageDidAbort:)])
+    if (_implementedDelegateMethods & CPImageDelegate_imageDidAbort_)
         [_delegate imageDidAbort:self];
 }
 

AppKit/CPImageView.j

@@ -29,6 +29,7 @@
 @global CPImagesPboardType
 @global appkit_tag_dom_elements
 
+@typedef CPImageAlignment
 CPImageAlignCenter      = 0;
 CPImageAlignTop         = 1;
 CPImageAlignTopLeft     = 2;
@@ -87,26 +88,37 @@ var CPImageViewEmptyPlaceholderImage = nil;
     if (self)
     {
 #if PLATFORM(DOM)
-        _DOMImageElement = document.createElement("img");
-        _DOMImageElement.style.position = "absolute";
-        _DOMImageElement.style.left = "0px";
-        _DOMImageElement.style.top = "0px";
-
-        if ([CPPlatform supportsDragAndDrop])
-        {
-            _DOMImageElement.setAttribute("draggable", "true");
-            _DOMImageElement.style["-khtml-user-drag"] = "element";
-        }
-
-        CPDOMDisplayServerAppendChild(_DOMElement, _DOMImageElement);
-
-        _DOMImageElement.style.visibility = "hidden";
+        [self _createDOMImageElement];
 #endif
     }
 
     return self;
 }
 
+- (void)_createDOMImageElement
+{
+#if PLATFORM(DOM)
+    if (_DOMImageElement)
+        return;
+
+    _DOMImageElement = document.createElement("img");
+    _DOMImageElement.style.position = "absolute";
+    _DOMImageElement.style.left = "0px";
+    _DOMImageElement.style.top = "0px";
+
+    if ([CPPlatform supportsDragAndDrop])
+    {
+        _DOMImageElement.setAttribute("draggable", "true");
+        _DOMImageElement.style["-khtml-user-drag"] = "element";
+    }
+
+    _DOMImageElement.style.visibility = "hidden";
+    AppKitTagDOMElement(self, _DOMImageElement);
+
+    CPDOMDisplayServerAppendChild(_DOMElement, _DOMImageElement);
+#endif
+}
+
 /*!
     Returns the view's image.
 */
@@ -138,6 +150,9 @@ var CPImageViewEmptyPlaceholderImage = nil;
     var newImage = [self objectValue];
 
 #if PLATFORM(DOM)
+    if (!_DOMImageElement)
+        [self _createDOMImageElement];
+
     _DOMImageElement.src = newImage ? [newImage filename] : [CPImageViewEmptyPlaceholderImage filename];
 #endif
 
@@ -164,6 +179,7 @@ var CPImageViewEmptyPlaceholderImage = nil;
 
 - (void)imageDidLoad:(CPNotification)aNotification
 {
+    [[CPNotificationCenter defaultCenter] removeObserver:self name:CPImageDidLoadNotification object:[self objectValue]];
     [self hideOrDisplayContents];
 
     [self setNeedsLayout];
@@ -253,7 +269,7 @@ var CPImageViewEmptyPlaceholderImage = nil;
     [self setNeedsDisplay:YES];
 }
 
-- (unsigned)imageScaling
+- (CPUInteger)imageScaling
 {
     return [self currentValueForThemeAttribute:@"image-scaling"];
 }
@@ -488,7 +504,7 @@ var CPImageViewEmptyPlaceholderImage = nil;
     [_source setImage:image];
 }
 
-- (void)valueForBinding:(CPString)aBinding
+- (id)valueForBinding:(CPString)aBinding
 {
     var image = [_source image];
 
@@ -517,28 +533,12 @@ var CPImageViewImageKey          = @"CPImageViewImageKey",
 */
 - (id)initWithCoder:(CPCoder)aCoder
 {
-#if PLATFORM(DOM)
-    _DOMImageElement = document.createElement("img");
-    _DOMImageElement.style.position = "absolute";
-    _DOMImageElement.style.left = "0px";
-    _DOMImageElement.style.top = "0px";
-    _DOMImageElement.style.visibility = "hidden";
-    if ([CPPlatform supportsDragAndDrop])
-    {
-        _DOMImageElement.setAttribute("draggable", "true");
-        _DOMImageElement.style["-khtml-user-drag"] = "element";
-    }
-
-    if (typeof(appkit_tag_dom_elements) !== "undefined" && !!appkit_tag_dom_elements)
-        _DOMImageElement.setAttribute("data-cappuccino-view", [self className]);
-#endif
-
     self = [super initWithCoder:aCoder];
 
     if (self)
     {
 #if PLATFORM(DOM)
-        _DOMElement.appendChild(_DOMImageElement);
+        [self _createDOMImageElement];
 #endif
 
         [self setHasShadow:[aCoder decodeBoolForKey:CPImageViewHasShadowKey]];
@@ -564,17 +564,12 @@ var CPImageViewImageKey          = @"CPImageViewImageKey",
     // We do this in order to avoid encoding the _shadowView, which
     // should just automatically be created programmatically as needed.
     if (_shadowView)
-    {
-        var actualSubviews = _subviews;
-
-        _subviews = [_subviews copy];
-        [_subviews removeObjectIdenticalTo:_shadowView];
-    }
+        [_shadowView removeFromSuperview];
 
     [super encodeWithCoder:aCoder];
 
     if (_shadowView)
-        _subviews = actualSubviews;
+        [self addSubview:_shadowView];
 
     [aCoder encodeBool:_hasShadow forKey:CPImageViewHasShadowKey];
     [aCoder encodeInt:_imageAlignment forKey:CPImageViewImageAlignmentKey];

AppKit/CPKeyValueBinding.j

@@ -35,6 +35,7 @@
 var exposedBindingsMap = @{},
     bindingsMap = @{};
 
+@typedef CPBindingOperationKind
 var CPBindingOperationAnd = 0,
     CPBindingOperationOr  = 1;
 
@@ -70,6 +71,20 @@ var CPBindingOperationAnd = 0,
     return [[bindingsMap objectForKey:[anObject UID]] objectForKey:aBinding];
 }
 
++ (void)_reverseSetValueFromExclusiveBinderForObject:(id)anObject
+{
+    var bindersByBindingName = [bindingsMap objectForKey:[anObject UID]];
+
+    [bindersByBindingName enumerateKeysAndObjectsUsingBlock:function(binding, binder, stop)
+    {
+        if ([binder isKindOfClass:[self class]])
+        {
+            [binder reverseSetValueFor:binding];
+            stop(YES);
+        }
+    }];
+}
+
 + (CPDictionary)infoForBinding:(CPString)aBinding forObject:(id)anObject
 {
     var theBinding = [self getBinding:aBinding forObject:anObject];
@@ -116,7 +131,7 @@ var CPBindingOperationAnd = 0,
         count = allKeys.length;
 
     while (count--)
-        [anObject unbind:[bindings objectForKey:allKeys[count]]];
+        [anObject unbind:allKeys[count]];
 
     [bindingsMap removeObjectForKey:[anObject UID]];
 }
@@ -142,7 +157,7 @@ var CPBindingOperationAnd = 0,
 
         [self _updatePlaceholdersWithOptions:options forBinding:aName];
 
-        [aDestination addObserver:self forKeyPath:aKeyPath options:CPKeyValueObservingOptionNew context:aBinding];
+        [aDestination addObserver:self forKeyPath:aKeyPath options:0 context:aBinding];
 
         var bindings = [bindingsMap objectForKey:[_source UID]];
 
@@ -159,6 +174,24 @@ var CPBindingOperationAnd = 0,
     return self;
 }
 
++ (BOOL)isBindingAllowed:(CPString)aBinding forObject:(id)anObject
+{
+    if ([[anObject class] isBindingExclusive:aBinding])
+    {
+        var bindingsForObject = [bindingsMap objectForKey:[anObject UID]],
+            allBindings = [bindingsForObject allKeys],
+            count = [allBindings count];
+
+        while(count--)
+        {
+            if ([[anObject class] isBindingExclusive:allBindings[count]])
+                return NO;
+        }
+    }
+
+    return YES;
+}
+
 - (void)raiseIfNotApplicable:(id)aValue forKeyPath:(CPString)keyPath options:(CPDictionary)options
 {
     if (aValue === CPNotApplicableMarker && [options objectForKey:CPRaisesForNotApplicableKeysBindingOption])
@@ -387,6 +420,11 @@ var CPBindingOperationAnd = 0,
     return [CPBinder class];
 }
 
++ (BOOL)isBindingExclusive:(CPString)aBinding
+{
+    return NO;
+}
+
 - (CPArray)exposedBindings
 {
     var exposedBindings = [],
@@ -415,6 +453,11 @@ var CPBindingOperationAnd = 0,
     if (!anObject || !aKeyPath)
         return CPLog.error("Invalid object or path on " + self + " for " + aBinding);
 
+    if (![CPBinder isBindingAllowed:aBinding forObject:self])
+    {
+        CPLog.warn([self description] + " : cannot bind " + aBinding + " because another binding with the same functionality is already in use.");
+        return;
+    }
     //if (![[self exposedBindings] containsObject:aBinding])
     //    CPLog.warn("No binding exposed on " + self + " for " + aBinding);
 

AppKit/CPLevelIndicator.j

@@ -25,11 +25,13 @@
 
 @global CPApp
 
+@typedef CPTickMarkPosition
 CPTickMarkBelow                             = 0;
 CPTickMarkAbove                             = 1;
 CPTickMarkLeft                              = CPTickMarkAbove;
 CPTickMarkRight                             = CPTickMarkBelow;
 
+@typedef CPLevelIndicatorStyle
 CPRelevancyLevelIndicatorStyle              = 0;
 CPContinuousCapacityLevelIndicatorStyle     = 1;
 CPDiscreteCapacityLevelIndicatorStyle       = 2;
@@ -62,7 +64,7 @@ CPRatingLevelIndicatorStyle                 = 3;
     return "level-indicator";
 }
 
-+ (id)themeAttributes
++ (CPDictionary)themeAttributes
 {
     return @{
             @"bezel-color": [CPNull null],
@@ -105,10 +107,21 @@ CPRatingLevelIndicatorStyle                 = 3;
     var filledColor = [self valueForThemeAttribute:@"color-normal"],
         value = [self doubleValue];
 
-    if (value <= _criticalValue)
-        filledColor = [self valueForThemeAttribute:@"color-critical"];
-    else if (value <= _warningValue)
-        filledColor = [self valueForThemeAttribute:@"color-warning"];
+    if (_warningValue < _criticalValue)
+    {
+        if (value >= _criticalValue)
+            filledColor = [self valueForThemeAttribute:@"color-critical"];
+        else if (value >= _warningValue)
+            filledColor = [self valueForThemeAttribute:@"color-warning"];
+    }
+    else
+    {
+        if (value <= _criticalValue)
+            filledColor = [self valueForThemeAttribute:@"color-critical"];
+        else if (value <= _warningValue)
+            filledColor = [self valueForThemeAttribute:@"color-warning"];
+    }
+
 
     for (var i = 0; i < segmentCount; i++)
     {

AppKit/CPMenu/CPMenu.j

@@ -30,6 +30,17 @@
 
 @global CPApp
 
+@protocol CPMenuDelegate <CPObject>
+
+@optional
+- (void)menuWillOpen:(CPMenu)aMenu;
+- (void)menuDidClose:(CPMenu)aMenu;
+
+@end
+
+var CPMenuDelegate_menuWillOpen_ = 1 << 1,
+    CPMenuDelegate_menuDidClose_ = 1 << 2;
+
 CPMenuDidAddItemNotification        = @"CPMenuDidAddItemNotification";
 CPMenuDidChangeItemNotification     = @"CPMenuDidChangeItemNotification";
 CPMenuDidRemoveItemNotification     = @"CPMenuDidRemoveItemNotification";
@@ -50,26 +61,27 @@ var _CPMenuBarVisible               = NO,
 */
 @implementation CPMenu : CPObject
 {
-    CPMenu          _supermenu;
+    CPMenu              _supermenu;
 
-    CPString        _title;
-    CPString        _name;
+    CPString            _title;
+    CPString            _name;
 
-    CPFont          _font;
+    CPFont              _font;
 
-    float           _minimumWidth;
+    float               _minimumWidth;
 
-    CPMutableArray  _items;
+    CPMutableArray      _items;
 
-    BOOL            _autoenablesItems;
-    BOOL            _showsStateColumn;
+    BOOL                _autoenablesItems;
+    BOOL                _showsStateColumn;
 
-    id              _delegate;
+    id <CPMenuDelegate> _delegate;
+    unsigned            _implementedDelegateMethods;
 
-    int             _highlightedIndex;
-    _CPMenuWindow   _menuWindow;
+    int                 _highlightedIndex;
+    _CPMenuWindow       _menuWindow;
 
-    CPEvent         _lastCloseEvent;
+    CPEvent             _lastCloseEvent;
 }
 
 // Managing the Menu Bar
@@ -278,7 +290,7 @@ var _CPMenuBarVisible               = NO,
     @param aMenuItem the item to insert
     @param anIndex the index in the menu to insert the item.
 */
-- (void)insertItem:(CPMenuItem)aMenuItem atIndex:(unsigned)anIndex
+- (void)insertItem:(CPMenuItem)aMenuItem atIndex:(CPUInteger)anIndex
 {
     [self insertObject:aMenuItem inItemsAtIndex:anIndex];
 }
@@ -291,7 +303,7 @@ var _CPMenuBarVisible               = NO,
     @param anIndex the index location in the menu for the new item
     @return the new menu item
 */
-- (CPMenuItem)insertItemWithTitle:(CPString)aTitle action:(SEL)anAction keyEquivalent:(CPString)aKeyEquivalent atIndex:(unsigned)anIndex
+- (CPMenuItem)insertItemWithTitle:(CPString)aTitle action:(SEL)anAction keyEquivalent:(CPString)aKeyEquivalent atIndex:(CPUInteger)anIndex
 {
     var item = [[CPMenuItem alloc] initWithTitle:aTitle action:anAction keyEquivalent:aKeyEquivalent];
 
@@ -335,7 +347,7 @@ var _CPMenuBarVisible               = NO,
     Removes the item at the specified index from the menu
     @param anIndex the index of the item to remove
 */
-- (void)removeItemAtIndex:(unsigned)anIndex
+- (void)removeItemAtIndex:(CPUInteger)anIndex
 {
     [self removeObjectFromItemsAtIndex:anIndex];
 }
@@ -621,7 +633,7 @@ var _CPMenuBarVisible               = NO,
 */
 - (void)update
 {
-    if (![self autoenablesItems])
+    if (!_autoenablesItems)
         return;
 
     var items = [self itemArray];
@@ -633,14 +645,25 @@ var _CPMenuBarVisible               = NO,
         if ([item hasSubmenu])
             continue;
 
-        var validator = [CPApp targetForAction:[item action] to:[item target] from:item];
+        // If there are enabled bindings for the item, they override anything else
+        var binder = [CPBinder getBinding:CPEnabledBinding forObject:item];
+
+        if (binder)
+        {
+            [binder setValueFor:CPEnabledBinding];
+            [[_menuWindow _menuView] tile];
+            return;
+        }
+
+        var validator = [CPApp targetForAction:[item action] to:[item target] from:item],
+            shouldBeEnabled = YES;
 
         if (!validator)
         {
             // If targetForAction: returns nil, it could be that there is no action.
             // If there is an action and nil is returned, no valid target could be found.
             if ([item action] || [item target])
-                [item setEnabled:NO];
+                shouldBeEnabled = NO;
             else
             {
                 // Check to see if there is a target binding with an invalid selector
@@ -655,16 +678,18 @@ var _CPMenuBarVisible               = NO,
                         selector = [options valueForKey:CPSelectorNameBindingOption];
 
                     if (target && selector && ![target respondsToSelector:CPSelectorFromString(selector)])
-                        [item setEnabled:NO];
+                        shouldBeEnabled = NO;
                 }
             }
         }
         else if (![validator respondsToSelector:[item action]])
-            [item setEnabled:NO];
+            shouldBeEnabled = NO;
         else if ([validator respondsToSelector:@selector(validateMenuItem:)])
-            [item setEnabled:[validator validateMenuItem:item]];
+            shouldBeEnabled = [validator validateMenuItem:item];
         else if ([validator respondsToSelector:@selector(validateUserInterfaceItem:)])
-            [item setEnabled:[validator validateUserInterfaceItem:item]];
+            shouldBeEnabled = [validator validateUserInterfaceItem:item];
+
+        [item setEnabled:shouldBeEnabled];
     }
 
     [[_menuWindow _menuView] tile];
@@ -843,6 +868,9 @@ var _CPMenuBarVisible               = NO,
 
 + (void)popUpContextMenu:(CPMenu)aMenu withEvent:(CPEvent)anEvent forView:(CPView)aView withFont:(CPFont)aFont
 {
+    // This is needed when we are making several rights click
+    [[_CPMenuManager sharedMenuManager] cancelActiveMenu];
+
     [aMenu _menuWillOpen];
 
     if (!aFont)
@@ -851,8 +879,6 @@ var _CPMenuBarVisible               = NO,
     var theWindow = [aView window],
         menuWindow = [_CPMenuWindow menuWindowWithMenu:aMenu font:aFont];
 
-    [_CPMenuWindow poolMenuWindow:menuWindow];
-
     [menuWindow setBackgroundStyle:_CPMenuWindowPopUpBackgroundStyle];
 
     var constraintRect = [CPMenu _constraintRectForView:aView],
@@ -928,9 +954,19 @@ var _CPMenuBarVisible               = NO,
 
 // Managing the Delegate
 
-- (void)setDelegate:(id)aDelegate
+- (void)setDelegate:(id <CPMenuDelegate>)aDelegate
 {
+    if (_delegate === aDelegate)
+        return;
+
     _delegate = aDelegate;
+    _implementedDelegateMethods = 0;
+
+    if ([_delegate respondsToSelector:@selector(menuWillOpen:)])
+         _implementedDelegateMethods |= CPMenuDelegate_menuWillOpen_;
+
+    if ([_delegate respondsToSelector:@selector(menuDidClose:)])
+        _implementedDelegateMethods |= CPMenuDelegate_menuDidClose_;
 }
 
 - (id)delegate
@@ -940,10 +976,7 @@ var _CPMenuBarVisible               = NO,
 
 - (void)_menuWillOpen
 {
-    var delegate = [self delegate];
-
-    if ([delegate respondsToSelector:@selector(menuWillOpen:)])
-        [delegate menuWillOpen:self];
+    [self _sendDelegateMenuWillOpen];
 }
 
 - (void)_menuDidClose
@@ -952,10 +985,7 @@ var _CPMenuBarVisible               = NO,
     // when a click on the button itself caused the menu to close.
     _lastCloseEvent = [CPApp currentEvent];
 
-    var delegate = [self delegate];
-
-    if ([delegate respondsToSelector:@selector(menuDidClose:)])
-        [delegate menuDidClose:self];
+    [self _sendDelegateMenuDidClose];
 }
 
 // Handling Tracking
@@ -1048,7 +1078,7 @@ var _CPMenuBarVisible               = NO,
     Sends the action of the menu item at the specified index.
     @param anIndex the index of the item
 */
-- (void)performActionForItemAtIndex:(unsigned)anIndex
+- (void)performActionForItemAtIndex:(CPUInteger)anIndex
 {
     var item = _items[anIndex];
 
@@ -1119,6 +1149,36 @@ var _CPMenuBarVisible               = NO,
 
 @end
 
+
+@implementation CPMenu (CPMenuDelegate)
+
+/*!
+    @ignore
+    Call delegate menuWillOpen
+*/
+- (void)_sendDelegateMenuWillOpen
+{
+    if (!(_implementedDelegateMethods & CPMenuDelegate_menuWillOpen_))
+        return;
+
+    [_delegate menuWillOpen:self];
+}
+
+/*!
+    @ignore
+    Call delegate menuDidClose
+*/
+- (void)_sendDelegateMenuDidClose
+{
+    if (!(_implementedDelegateMethods & CPMenuDelegate_menuDidClose_))
+        return;
+
+    [_delegate menuDidClose:self];
+}
+
+@end
+
+
 @implementation CPMenu (CPKeyValueCoding)
 
 - (CPUInteger)countOfItems
@@ -1180,7 +1240,8 @@ var _CPMenuBarVisible               = NO,
 var CPMenuTitleKey              = @"CPMenuTitleKey",
     CPMenuNameKey               = @"CPMenuNameKey",
     CPMenuItemsKey              = @"CPMenuItemsKey",
-    CPMenuShowsStateColumnKey   = @"CPMenuShowsStateColumnKey";
+    CPMenuShowsStateColumnKey   = @"CPMenuShowsStateColumnKey",
+    CPMenuAutoEnablesItemsKey   = @"CPMenuAutoEnablesItemsKey";
 
 @implementation CPMenu (CPCoding)
 
@@ -1202,7 +1263,7 @@ var CPMenuTitleKey              = @"CPMenuTitleKey",
 
         _showsStateColumn = ![aCoder containsValueForKey:CPMenuShowsStateColumnKey] || [aCoder decodeBoolForKey:CPMenuShowsStateColumnKey];
 
-        _autoenablesItems = YES;
+        _autoenablesItems = ![aCoder containsValueForKey:CPMenuAutoEnablesItemsKey] || [aCoder decodeBoolForKey:CPMenuAutoEnablesItemsKey];
 
         [self setMinimumWidth:0];
     }
@@ -1225,6 +1286,9 @@ var CPMenuTitleKey              = @"CPMenuTitleKey",
 
     if (!_showsStateColumn)
         [aCoder encodeBool:_showsStateColumn forKey:CPMenuShowsStateColumnKey];
+
+    if (!_autoenablesItems)
+        [aCoder encodeBool:_autoenablesItems forKey:CPMenuAutoEnablesItemsKey];
 }
 
 @end

AppKit/CPMenu/_CPMenuBarWindow.j

@@ -24,6 +24,7 @@
 @import "_CPMenuManager.j"
 
 @class _CPMenuView
+@class CPMenu
 
 @global CPMenuDidAddItemNotification
 @global CPMenuDidChangeItemNotification

AppKit/CPMenu/_CPMenuManager.j

@@ -407,6 +407,15 @@ var STICKY_TIME_INTERVAL            = 0.4,
         [menu cancelTracking];
 }
 
+- (void)cancelActiveMenu
+{
+    if (CPApp._activeMenu)
+    {
+        [self completeTracking];
+        _menuContainerStack = [];
+    }
+}
+
 - (void)completeTracking
 {
     var trackingMenu = [self trackingMenu];

AppKit/CPMenu/_CPMenuWindow.j

@@ -25,6 +25,8 @@
 @import "CPWindow.j"
 @import "_CPMenuManager.j"
 
+@class _CPMenuView
+
 var _CPMenuWindowPool                       = [],
     _CPMenuWindowPoolCapacity               = 5,
 
@@ -72,7 +74,8 @@ _CPMenuWindowAttachedMenuBackgroundStyle    = 2;
 
 + (void)poolMenuWindow:(_CPMenuWindow)aMenuWindow
 {
-    if (!aMenuWindow || _CPMenuWindowPool.length >= _CPMenuWindowPoolCapacity)
+    // FIXME :the poolMenuWindow is called too many times somewhere....
+    if (!aMenuWindow || _CPMenuWindowPool.length >= _CPMenuWindowPoolCapacity || [_CPMenuWindowPool containsObject:aMenuWindow])
         return;
 
     _CPMenuWindowPool.push(aMenuWindow);
@@ -409,7 +412,7 @@ _CPMenuWindowAttachedMenuBackgroundStyle    = 2;
 {
     // Don't return indexes of items that aren't visible.
     if (!CGRectContainsPoint([_menuClipView bounds], [_menuClipView convertPoint:aPoint fromView:nil]))
-        return NO;
+        return CPNotFound;
 
     return [_menuView itemIndexAtPoint:[_menuView convertPoint:aPoint fromView:nil]];
 }
@@ -434,7 +437,7 @@ _CPMenuWindowAttachedMenuBackgroundStyle    = 2;
     return "menu-view";
 }
 
-+ (id)themeAttributes
++ (CPDictionary)themeAttributes
 {
     return @{
             @"menu-window-more-above-image": [CPNull null],

AppKit/CPMenuItem/CPMenuItem.j

@@ -166,6 +166,9 @@ var CPMenuItemStringRepresentationDictionary = @{
     if (_isEnabled === isEnabled)
         return;
 
+    if (!isEnabled && [self isHighlighted])
+        [_menu _highlightItemAtIndex:CPNotFound];
+
     _isEnabled = !!isEnabled;
 
     [_menuItemView setDirty];

AppKit/CPMenuItem/_CPMenuItemMenuBarView.j

@@ -25,6 +25,7 @@
 
 @class _CPMenuBarWindow
 @class _CPMenuView
+@class CPMenuItem
 
 @implementation _CPMenuItemMenuBarView : CPView
 {
@@ -49,7 +50,7 @@
     return "menu-item-bar-view";
 }
 
-+ (id)themeAttributes
++ (CPDictionary)themeAttributes
 {
     return @{
             @"horizontal-margin": 9.0,
@@ -84,25 +85,25 @@
     return self;
 }
 
-- (CPColor)setTextColor:(CPColor)aColor
+- (void)setTextColor:(CPColor)aColor
 {
     _textColor = aColor;
     [self setNeedsLayout];
 }
 
-- (CPColor)setTextShadowColor:(CPColor)aColor
+- (void)setTextShadowColor:(CPColor)aColor
 {
     _textShadowColor = aColor;
     [self setNeedsLayout];
 }
 
-- (CPColor)setHighlightTextColor:(CPColor)aColor
+- (void)setHighlightTextColor:(CPColor)aColor
 {
     _highlightTextColor = aColor;
     [self setNeedsLayout];
 }
 
-- (CPColor)setHighlightTextShadowColor:(CPColor)aColor
+- (void)setHighlightTextShadowColor:(CPColor)aColor
 {
     _highlightTextShadowColor = aColor;
     [self setNeedsLayout];

AppKit/CPMenuItem/_CPMenuItemStandardView.j

@@ -24,6 +24,9 @@
 @import "CPImageView.j"
 @import "_CPImageAndTextView.j"
 
+@class CPMenuItem
+
+
 @implementation _CPMenuItemStandardView : CPView
 {
     CPMenuItem              _menuItem @accessors(property=menuItem);
@@ -45,7 +48,7 @@
     return "menu-item-standard-view";
 }
 
-+ (id)themeAttributes
++ (CPDictionary)themeAttributes
 {
     return @{
             @"submenu-indicator-color": [CPNull null],

AppKit/CPMenuItem/_CPMenuItemView.j

@@ -26,6 +26,7 @@
 @import "_CPMenuItemStandardView.j"
 @import "_CPMenuItemMenuBarView.j"
 
+@class CPMenuItem
 @global CPApp
 
 /*
@@ -53,7 +54,7 @@
     return "menu-item-view";
 }
 
-+ (id)themeAttributes
++ (CPDictionary)themeAttributes
 {
     return @{};
 }
@@ -112,7 +113,6 @@
             _view = menuItemView;
         }
     }
-
     else if ([_menuItem menu] == [CPApp mainMenu])
     {
         if (![_view isKindOfClass:[_CPMenuItemMenuBarView class]])

AppKit/CPObjectController.j

@@ -51,7 +51,7 @@
     CPCountedSet    _observedKeys;
 }
 
-+ (id)initialize
++ (void)initialize
 {
     if (self !== [CPObjectController class])
         return;
@@ -459,13 +459,13 @@ var CPObjectControllerContentKey                        = @"CPObjectControllerCo
 
 - (BOOL)isEqual:(id)anObject
 {
-    if ([anObject class] === [self class])
-    {
-        if (anObject._observer === _observer && [anObject._keyPath isEqual:_keyPath] && [anObject._object isEqual:_object])
-            return YES;
-    }
+    if (self === anObject)
+        return YES;
 
-    return NO;
+    if (!anObject || [anObject class] !== [self class] || anObject._observer !== _observer || anObject._keyPath !== _keyPath || anObject._object !== _object)
+            return NO;
+
+    return YES;
 }
 
 - (void)observeValueForKeyPath:(CPString)aKeyPath ofObject:(id)anObject change:(CPDictionary)change context:(id)context
@@ -572,7 +572,7 @@ var CPObjectControllerContentKey                        = @"CPObjectControllerCo
     }
 }
 
-- (void)insertObject:(id)anObject atIndex:(unsigned)anIndex
+- (void)insertObject:(id)anObject atIndex:(CPUInteger)anIndex
 {
     for (var i = 0, count = [_observationProxies count]; i < count; i++)
     {
@@ -592,7 +592,7 @@ var CPObjectControllerContentKey                        = @"CPObjectControllerCo
     [super insertObject:anObject atIndex:anIndex];
 }
 
-- (void)removeObjectAtIndex:(unsigned)anIndex
+- (void)removeObjectAtIndex:(CPUInteger)anIndex
 {
     var currentObject = [self objectAtIndex:anIndex];
 
@@ -614,7 +614,7 @@ var CPObjectControllerContentKey                        = @"CPObjectControllerCo
     [super removeObjectAtIndex:anIndex];
 }
 
-- (_CPObservableArray)objectsAtIndexes:(CPIndexSet)theIndexes
+- (CPArray)objectsAtIndexes:(CPIndexSet)theIndexes
 {
     return [_CPObservableArray arrayWithArray:[super objectsAtIndexes:theIndexes]];
 }
@@ -629,7 +629,7 @@ var CPObjectControllerContentKey                        = @"CPObjectControllerCo
    [self removeObjectAtIndex:[self count]];
 }
 
-- (void)replaceObjectAtIndex:(unsigned)anIndex withObject:(id)anObject
+- (void)replaceObjectAtIndex:(CPUInteger)anIndex withObject:(id)anObject
 {
     var currentObject = [self objectAtIndex:anIndex];
 
@@ -808,15 +808,20 @@ var CPObjectControllerContentKey                        = @"CPObjectControllerCo
 
 - (void)removeObserver:(id)anObject forKeyPath:(CPString)aKeyPath
 {
-    var proxy = [[_CPObservationProxy alloc] initWithKeyPath:aKeyPath observer:anObject object:self],
-        index = [_observationProxies indexOfObject:proxy];
+    [_observationProxies enumerateObjectsUsingBlock:function(aProxy, idx, stop)
+    {
+        if (aProxy._object === self && aProxy._keyPath == aKeyPath && aProxy._observer === anObject)
+        {
+            var observedObjects = _observedObjectsByKeyPath[aKeyPath];
 
-    var observedObjects = _observedObjectsByKeyPath[aKeyPath];
-    [observedObjects removeObserver:[_observationProxies objectAtIndex:index] forKeyPath:aKeyPath];
+            [observedObjects removeObserver:aProxy forKeyPath:aKeyPath];
+            [_observationProxies removeObjectAtIndex:idx];
 
-    [_observationProxies removeObjectAtIndex:index];
+            _observedObjectsByKeyPath[aKeyPath] = nil;
 
-    _observedObjectsByKeyPath[aKeyPath] = nil;
+            stop(YES);
+        }
+    }];
 }
 
 @end

AppKit/CPOutlineView.j

@@ -52,7 +52,6 @@ var CPOutlineViewDataSource_outlineView_objectValue_forTableColumn_byItem_
     CPOutlineViewDataSource_outlineView_sortDescriptorsDidChange_                                   = 1 << 11;
 
 var CPOutlineViewDelegate_outlineView_dataViewForTableColumn_item_                                  = 1 << 1,
-    CPOutlineViewDelegate_outlineView_viewForTableColumn_item_                                      = 1 << 26,
     CPOutlineViewDelegate_outlineView_didClickTableColumn_                                          = 1 << 2,
     CPOutlineViewDelegate_outlineView_didDragTableColumn_                                           = 1 << 3,
     CPOutlineViewDelegate_outlineView_heightOfRowByItem_                                            = 1 << 4,
@@ -75,8 +74,10 @@ var CPOutlineViewDelegate_outlineView_dataViewForTableColumn_item_
     CPOutlineViewDelegate_outlineView_typeSelectStringForTableColumn_item_                          = 1 << 21,
     CPOutlineViewDelegate_outlineView_willDisplayOutlineView_forTableColumn_item_                   = 1 << 22,
     CPOutlineViewDelegate_outlineView_willDisplayView_forTableColumn_item_                          = 1 << 23,
-    CPOutlineViewDelegate_selectionShouldChangeInOutlineView_                                       = 1 << 24,
-    CPOutlineViewDelegate_outlineView_menuForTableColumn_item_                                      = 1 << 25;
+    CPOutlineViewDelegate_outlineView_willRemoveView_forTableColumn_item_                           = 1 << 24,
+    CPOutlineViewDelegate_selectionShouldChangeInOutlineView_                                       = 1 << 25,
+    CPOutlineViewDelegate_outlineView_menuForTableColumn_item_                                      = 1 << 26,
+    CPOutlineViewDelegate_outlineView_viewForTableColumn_item_                                      = 1 << 27;
 
 CPOutlineViewDropOnItemIndex = -1;
 
@@ -88,6 +89,58 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
 
 #define SHOULD_SELECT_ITEM(anOutlineView, anItem) (!((anOutlineView)._implementedOutlineViewDelegateMethods & CPOutlineViewDelegate_outlineView_shouldSelectItem_) || [(anOutlineView)._outlineViewDelegate outlineView:(anOutlineView) shouldSelectItem:(anItem)])
 
+
+@protocol CPOutlineViewDelegate <CPObject>
+
+@optional
+- (BOOL)outlineView:(CPOutlineView)anOutlineView isGroupItem:(id)anItem;
+- (BOOL)outlineView:(CPOutlineView)anOutlineView shouldCollapseItem:(id)anItem;
+- (BOOL)outlineView:(CPOutlineView)anOutlineView shouldEditTableColumn:(CPTableColumn)aTableColumn item:(id)anItem;
+- (BOOL)outlineView:(CPOutlineView)anOutlineView shouldExpandItem:(id)anItem;
+- (BOOL)outlineView:(CPOutlineView)anOutlineView shouldReorderColumn:(CPInteger)columnIndex toColumn:(CPInteger)newColumnIndex;
+- (BOOL)outlineView:(CPOutlineView)anOutlineView shouldSelectItem:(id)anItem;
+- (BOOL)outlineView:(CPOutlineView)anOutlineView shouldSelectTableColumn:(CPTableColumn)aTableColumn;
+- (BOOL)outlineView:(CPOutlineView)anOutlineView shouldShowOutlineDisclosureControlForItem:(id)anItem;
+- (BOOL)outlineView:(CPOutlineView)anOutlineView shouldShowViewExpansionForTableColumn:(CPTableColumn)aTableColumn item:(id)anItem;
+- (BOOL)outlineView:(CPOutlineView)anOutlineView shouldTrackView:(CPView)aView forTableColumn:(CPTableColumn)aTableColumn item:(id)anItem;
+- (BOOL)outlineView:(CPOutlineView)anOutlineView shouldTypeSelectForEvent:(CPEvent)anEvent withCurrentSearchString:(CPString)searchString;
+- (BOOL)selectionShouldChangeInOutlineView:(CPOutlineView)anOutlineView;
+- (CPIndexSet)outlineView:(CPOutlineView)anOutlineView selectionIndexesForProposedSelection:(CPIndexSet)proposedSelectionIndexes;
+- (CPMenu)outlineView:(CPOutlineView)anOutlineView menuForTableColumn:(CPTableColumn)aTableColumn item:(id)anItem;
+- (CPString)outlineView:(CPOutlineView)anOutlineView toolTipForView:(CPView)aView rect:(CGRect)aRect tableColumn:(CPTableColumn)aTableColumn item:(id)anItem mouseLocation:(CGPoint)mouseLocation;
+- (CPString)outlineView:(CPOutlineView)anOutlineView typeSelectStringForTableColumn:(CPTableColumn)aTableColumn item:(id)anItem;
+- (CPView)outlineView:(CPOutlineView)anOutlineView dataViewForTableColumn:(CPTableColumn)aTableColumn item:(id)anItem;
+- (CPView)outlineView:(CPOutlineView)anOutlineView viewForTableColumn:(CPTableColumn)aTableColumn item:(id)anItem;
+- (float)outlineView:(CPOutlineView)anOutlineView heightOfRowByItem:(id)anItem;
+- (float)outlineView:(CPOutlineView)anOutlineView sizeToFitWidthOfColumn:(CPTableColumn)aTableColumn;
+- (id)outlineView:(CPOutlineView)anOutlineView nextTypeSelectMatchFromItem:(id)startItem toItem:(id)endItem forString:(CPString)searchString;
+- (void)outlineView:(CPOutlineView)anOutlineView didClickTableColumn:(CPTableColumn)aTableColumn;
+- (void)outlineView:(CPOutlineView)anOutlineView didDragTableColumn:(CPTableColumn)aTableColumn;
+- (void)outlineView:(CPOutlineView)anOutlineView mouseDownInHeaderOfTableColumn:(CPTableColumn)aTableColumn;
+- (void)outlineView:(CPOutlineView)anOutlineView willDisplayOutlineView:(CPView)aView forTableColumn:(CPTableColumn)aTableColumn item:(id)anItem;
+- (void)outlineView:(CPOutlineView)anOutlineView willDisplayView:(CPView)aView forTableColumn:(CPTableColumn)aTableColumn item:(id)anItem;
+- (void)outlineView:(CPOutlineView)anOutlineView willRemoveView:(CPView)aView forTableColumn:(CPTableColumn)aTableColumn item:(id)anItem;
+
+@end
+
+
+@protocol CPOutlineViewDataSource <CPObject>
+
+@optional
+- (BOOL)outlineView:(CPOutlineView)anOutlineView acceptDrop:(id /*<CPDraggingInfo>*/)info item:(id)anItem childIndex:(CPInteger)anIndex;
+- (BOOL)outlineView:(CPOutlineView)anOutlineView shouldDeferDisplayingChildrenOfItem:(id)anItem;
+- (BOOL)outlineView:(CPOutlineView)anOutlineView writeItems:(CPArray)items toPasteboard:(CPPasteboard)pboard;
+- (CPArray)outlineView:(CPOutlineView)anOutlineView namesOfPromisedFilesDroppedAtDestination:(CPURL)dropDestination forDraggedItems:(CPArray)items;
+- (CPDragOperation)outlineView:(CPOutlineView)anOutlineView validateDrop:(id /*<CPDraggingInfo>*/)info proposedItem:(id)anItem proposedChildIndex:(CPInteger)anIndex;
+- (CPDragOperation)outlineView:(CPOutlineView)anOutlineView validateDrop:(id /*<CPDraggingInfo>*/)info proposedRow:(int)theRow proposedDropOperation:(CPTableViewDropOperation)theOperation;
+- (id)outlineView:(CPOutlineView)anOutlineView itemForPersistentObject:(id)anObject;
+- (id)outlineView:(CPOutlineView)anOutlineView objectValueforTableColumn:(CPTableColumn)aTableColumn byItem:(id)anItem;
+- (id)outlineView:(CPOutlineView)anOutlineView persistentObjectForItem:(id)anItem;
+- (void)outlineView:(CPOutlineView)anOutlineView setObjectValue:(id)anObject forTableColumn:(CPTableColumn)aTableColumn byItem:(id)anItem;
+- (void)outlineView:(CPOutlineView)anOutlineView sortDescriptorsDidChange:(CPArray)oldDescriptors;
+
+@end
+
 /*!
     @ingroup appkit
     @class CPOutlineView
@@ -105,34 +158,37 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
 */
 @implementation CPOutlineView : CPTableView
 {
-    id              _outlineViewDataSource;
-    id              _outlineViewDelegate;
-    CPTableColumn   _outlineTableColumn;
+    id <CPOutlineViewDataSource>    _outlineViewDataSource;
+    id <CPOutlineViewDelegate>      _outlineViewDelegate;
+    CPTableColumn                   _outlineTableColumn;
 
-    float           _indentationPerLevel;
-    BOOL            _indentationMarkerFollowsDataView;
+    float                           _indentationPerLevel;
+    BOOL                            _indentationMarkerFollowsDataView;
 
-    CPInteger       _implementedOutlineViewDataSourceMethods;
-    CPInteger       _implementedOutlineViewDelegateMethods;
+    CPInteger                       _implementedOutlineViewDataSourceMethods;
+    CPInteger                       _implementedOutlineViewDelegateMethods;
 
-    Object          _rootItemInfo;
-    CPMutableArray  _itemsForRows;
-    Object          _itemInfosForItems;
+    Object                          _rootItemInfo;
+    CPMutableArray                  _itemsForRows;
+    Object                          _itemInfosForItems;
 
-    CPControl       _disclosureControlPrototype;
-    CPArray         _disclosureControlsForRows;
-    CPData          _disclosureControlData;
-    CPArray         _disclosureControlQueue;
+    CPControl                       _disclosureControlPrototype;
+    CPArray                         _disclosureControlsForRows;
+    CPData                          _disclosureControlData;
+    CPArray                         _disclosureControlQueue;
 
-    BOOL            _shouldRetargetItem;
-    id              _retargetedItem;
+    BOOL                            _shouldRetargetItem;
+    id                              _retargetedItem;
 
-    BOOL            _shouldRetargetChildIndex;
-    CPInteger       _retargedChildIndex;
-    CPTimer         _dragHoverTimer;
-    id              _dropItem;
+    BOOL                            _shouldRetargetChildIndex;
+    CPInteger                       _retargedChildIndex;
+    CPTimer                         _dragHoverTimer;
+    id                              _dropItem;
 
-    BOOL            _coalesceSelectionNotificationState;
+    BOOL                            _coalesceSelectionNotificationState;
+
+    CPArray                         _pendingItemToClean;
+    CPArray                         _itemAddedDuringLastLoading;
 }
 
 - (id)initWithFrame:(CGRect)aFrame
@@ -218,7 +274,7 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
     If you want the drag to begin you should return YES and place the drag data on the pboard.
     @code - (BOOL)outlineView:(CPOutlineView)outlineView writeItems:(CPArray)items toPasteboard:(CPPasteboard)pboard; @endcode
 */
-- (void)setDataSource:(id)aDataSource
+- (void)setDataSource:(id <CPOutlineViewDataSource>)aDataSource
 {
     if (_outlineViewDataSource === aDataSource)
         return;
@@ -293,7 +349,7 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
     if (!anItem)
         return YES;
 
-    var itemInfo = _itemInfosForItems[[anItem UID]];
+    var itemInfo = [self _itemInfosForItem:anItem];
 
     if (!itemInfo)
         return NO;
@@ -326,7 +382,7 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
     if (!anItem)
         return YES;
 
-    var itemInfo = _itemInfosForItems[[anItem UID]];
+    var itemInfo = [self _itemInfosForItem:anItem];
 
     if (!itemInfo)
         return NO;
@@ -334,6 +390,107 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
     return itemInfo.isExpanded;
 }
 
+/*!
+    Returns the item at a given row index. If no item exists nil is returned.
+
+    @param aRow - The row index you want to find the item at.
+    @return id - The item at a given index.
+*/
+- (id)itemAtRow:(CPInteger)aRow
+{
+    return _itemsForRows[aRow] || nil;
+}
+
+/*!
+    Returns the row of a given item
+
+    @param anItem - The item you want to find the row of.
+    @return int - The row index of a given item.
+*/
+- (CPInteger)rowForItem:(id)anItem
+{
+    if (!anItem)
+        return _rootItemInfo.row;
+
+    var itemInfo = [self _itemInfosForItem:anItem];
+
+    if (!itemInfo)
+        return CPNotFound;
+
+    return itemInfo.row;
+}
+
+/*!
+    Returns the indentation level of a given item. If the item is nil (the top
+    level root item) CPNotFound is returned. Indentation levels are zero
+    based, thus items that are not indented return 0.
+
+    @param anItem - The item you want the indentation level for.
+    @return int - the indentation level of anItem.
+*/
+- (CPInteger)levelForItem:(id)anItem
+{
+    if (!anItem)
+        return _rootItemInfo.level;
+
+    var itemInfo = [self _itemInfosForItem:anItem];
+
+    if (!itemInfo)
+        return CPNotFound;
+
+    return itemInfo.level;
+}
+
+/*!
+    Returns the indentation level for a given row. If the row is invalid
+    CPNotFound is returned. Rows that are not indented return 0.
+
+    @param aRow - the row of the receiver
+    @return int - the indentation level of aRow.
+*/
+- (CPInteger)levelForRow:(CPInteger)aRow
+{
+    var item = [self itemAtRow:aRow];
+
+    if (!item && aRow >= 0)
+        item = [CPObject new];
+
+    return [self levelForItem:item];
+}
+
+/*!
+    @ignore
+    Return the itemInfos for the given item.
+    The method returns only itemInfo for displayed items
+*/
+- (Object)_itemInfosForItem:(id)anItem
+{
+    var itemInfo = _itemInfosForItems[[anItem UID]];
+
+    if (!itemInfo || [self _parentIsCollapsed:[self parentForItem:anItem]])
+        return nil;
+
+    return itemInfo;
+}
+
+/*!
+    @ignore
+    Return a boolean to know if one parent of the given item is collapsed or not
+*/
+- (BOOL)_parentIsCollapsed:(id)anItem
+{
+    var parentItem = [self parentForItem:anItem],
+        itemInfo = _itemInfosForItems[[anItem UID]];
+
+    if (!itemInfo)
+        return NO;
+
+    if (!itemInfo.isExpanded)
+        return YES;
+
+    return [self _parentIsCollapsed:parentItem];
+}
+
 /*!
     Expands a given item.
 
@@ -352,6 +509,10 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
 */
 - (void)expandItem:(id)anItem expandChildren:(BOOL)shouldExpandChildren
 {
+    if ([self _delegateRespondsToShouldExpandItem])
+        if ([_outlineViewDelegate outlineView:self shouldExpandItem:anItem] == NO)
+            return;
+
     var itemInfo = null;
 
     if (!anItem)
@@ -366,6 +527,7 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
     // selection notifications so that exactly one IsChanging and one
     // DidChange is sent as needed, for the totality of the operation.
     var isTopLevel = NO;
+
     if (!_coalesceSelectionNotificationState)
     {
         isTopLevel = YES;
@@ -385,6 +547,7 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
 
         // Shift selection indexes below so that the same items remain selected.
         var rowCountDelta = [self numberOfRows] - previousRowCount;
+
         if (rowCountDelta)
         {
             var selection = [self selectedRowIndexes],
@@ -427,6 +590,10 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
     if (!anItem)
         return;
 
+    if ([self _delegateRespondsToShouldCollapseItem])
+        if ([_outlineViewDelegate outlineView:self shouldCollapseItem:anItem] == NO)
+            return;
+
     var itemInfo = _itemInfosForItems[[anItem UID]];
 
     if (!itemInfo)
@@ -470,6 +637,7 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
             [self _setSelectedRowIndexes:selection]; // _noteSelectionDidChange will be suppressed.
         }
     }
+
     itemInfo.isExpanded = NO;
 
     [self reloadItem:anItem reloadChildren:YES];
@@ -501,42 +669,205 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
 */
 - (void)reloadItem:(id)anItem reloadChildren:(BOOL)shouldReloadChildren
 {
+    _pendingItemToClean = [];
+    _itemAddedDuringLastLoading = [];
+
     if (!!shouldReloadChildren || !anItem)
-        _loadItemInfoForItem(self, anItem);
+        [self _loadItemInfoForItem:anItem intermediate:NO];
     else
-        _reloadItem(self, anItem);
+        [self _reloadItem:anItem];
+
+    [self _cleanPendingItem];
 
     [super reloadData];
 }
 
-/*!
-    Returns the item at a given row index. If no item exists nil is returned.
-
-    @param aRow - The row index you want to find the item at.
-    @return id - The item at a given index.
-*/
-- (id)itemAtRow:(CPInteger)aRow
-{
-    return _itemsForRows[aRow] || nil;
-}
-
-/*!
-    Returns the row of a given item
-
-    @param anItem - The item you want to find the row of.
-    @return int - The row index of a given item.
-*/
-- (CPInteger)rowForItem:(id)anItem
+- (void)_reloadItem:(id)anItem
 {
     if (!anItem)
-        return _rootItemInfo.row;
+        return;
 
+    // Get the existing info if it exists.
+    var itemUID = [anItem UID],
+        itemInfo = _itemInfosForItems[itemUID];
+
+    // If we're not in the tree, then just bail.
+    if (!itemInfo)
+        return [];
+
+    // See if the item itself can be swapped out.
+    var parent = itemInfo.parent,
+        parentItemInfo = parent ? _itemInfosForItems[[parent UID]] : _rootItemInfo,
+        parentChildren = parentItemInfo.children,
+        index = [parentChildren indexOfObjectIdenticalTo:anItem],
+        newItem = [_outlineViewDataSource outlineView:self child:index ofItem:parent];
+
+    if (anItem !== newItem)
+    {
+        _itemInfosForItems[[anItem UID]] = nil;
+        _itemInfosForItems[[newItem UID]] = itemInfo;
+
+        parentChildren[index] = newItem;
+        _itemsForRows[itemInfo.row] = newItem;
+    }
+
+    itemInfo.isExpandable = [_outlineViewDataSource outlineView:self isItemExpandable:newItem];
+    itemInfo.isExpanded = itemInfo.isExpandable && itemInfo.isExpanded;
+    itemInfo.shouldShowOutlineDisclosureControl = [self _sendDelegateShouldShowOutlineDisclosureControlForItem:newItem];
+}
+
+- (void)_addPendingItemsFromPreviousItems:(CPArray)previousItems forItemInfo:(Object)itemInfo
+{
+    if (!itemInfo)
+        return;
+
+    var children = itemInfo.children;
+
+    for (var i = [previousItems count] - 1; i >= 0; i--)
+    {
+        var item = previousItems[i];
+
+        if (![children containsObject:item])
+            [self _addPendingItem:item];
+    }
+}
+
+- (void)_addPendingItem:(id)anItem
+{
     var itemInfo = _itemInfosForItems[[anItem UID]];
 
     if (!itemInfo)
-        return CPNotFound;
+        return;
 
-    return itemInfo.row;
+    var children = itemInfo.children;
+
+    for (var i = [children count]; i >= 0; i--)
+    {
+        var child = children[i];
+        [self _addPendingItem:child];
+    }
+
+    [_pendingItemToClean addObject:anItem];
+}
+
+- (void)_cleanPendingItem
+{
+    for (var i = [_pendingItemToClean count]; i >= 0; i--)
+    {
+        var item = _pendingItemToClean[i];
+
+        if (![_itemAddedDuringLastLoading containsObject:item])
+            delete _itemInfosForItems[[item UID]];
+    }
+
+    _pendingItemToClean = [];
+    _itemAddedDuringLastLoading = [];
+}
+
+- (CPArray)_loadItemInfoForItem:(id)anItem intermediate:(BOOL)isIntermediate
+{
+    if (!anItem)
+    {
+        var itemInfo = _rootItemInfo;
+    }
+    else
+    {
+        // Get the existing info if it exists.
+        var itemUID = [anItem UID],
+            itemInfo = _itemInfosForItems[itemUID];
+
+        // If we're not in the tree, then just bail.
+        if (!itemInfo)
+            return [];
+
+        itemInfo.isExpandable = [_outlineViewDataSource outlineView:self isItemExpandable:anItem];
+        itemInfo.shouldShowOutlineDisclosureControl = [self _sendDelegateShouldShowOutlineDisclosureControlForItem:anItem];
+
+        // If we were previously expanded, but now no longer expandable, "de-expand".
+        // NOTE: we are *not* collapsing, thus no notification is posted.
+        if (!itemInfo.isExpandable && itemInfo.isExpanded)
+        {
+            itemInfo.isExpanded = NO;
+            itemInfo.children = [];
+        }
+    }
+
+    // The root item does not count as a descendant.
+    var weight = itemInfo.weight,
+        descendants = anItem ? [anItem] : [];
+
+    [_itemAddedDuringLastLoading addObject:anItem];
+
+    if (itemInfo.isExpanded && [self _sendDataSourceShouldDeferDisplayingChildrenOfItem:anItem])
+    {
+        var index = 0,
+            count = [_outlineViewDataSource outlineView:self numberOfChildrenOfItem:anItem],
+            level = itemInfo.level + 1,
+            previousChildren = itemInfo.children;
+
+        itemInfo.children = [];
+
+        for (; index < count; ++index)
+        {
+            var childItem = [_outlineViewDataSource outlineView:self child:index ofItem:anItem],
+                childItemInfo = _itemInfosForItems[[childItem UID]];
+
+            if (!childItemInfo)
+            {
+                childItemInfo = { isExpanded:NO, isExpandable:NO, shouldShowOutlineDisclosureControl:YES, children:[], weight:1 };
+                _itemInfosForItems[[childItem UID]] = childItemInfo;
+            }
+
+            itemInfo.children[index] = childItem;
+
+            var childDescendants = [self _loadItemInfoForItem:childItem intermediate:YES];
+
+            childItemInfo.parent = anItem;
+            childItemInfo.level = level;
+            descendants = descendants.concat(childDescendants);
+        }
+
+        // Here we clean the itemInfos dictionary
+        // Some items could have been removed at this point, we don't need to keep a ref of them anymore
+        [self _addPendingItemsFromPreviousItems:previousChildren forItemInfo:itemInfo];
+    }
+
+    itemInfo.weight = descendants.length;
+
+    if (!isIntermediate)
+    {
+        // row = -1 is the root item, so just go to row 0 since it is ignored.
+        var index = MAX(itemInfo.row, 0);
+
+        descendants.unshift(index, weight);
+
+        _itemsForRows.splice.apply(_itemsForRows, descendants);
+
+        var count = _itemsForRows.length;
+
+        for (; index < count; ++index)
+            _itemInfosForItems[[_itemsForRows[index] UID]].row = index;
+
+        var deltaWeight = itemInfo.weight - weight;
+
+        if (deltaWeight !== 0)
+        {
+            var parent = itemInfo.parent;
+
+            while (parent)
+            {
+                var parentItemInfo = _itemInfosForItems[[parent UID]];
+
+                parentItemInfo.weight += deltaWeight;
+                parent = parentItemInfo.parent;
+            }
+
+            if (anItem)
+                _rootItemInfo.weight += deltaWeight;
+        }
+    }
+
+    return descendants;
 }
 
 /*!
@@ -566,39 +897,6 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
     return _outlineTableColumn;
 }
 
-/*!
-    Returns the indentation level of a given item. If the item is nil (the top
-    level root item) CPNotFound is returned. Indentation levels are zero
-    based, thus items that are not indented return 0.
-
-    @param anItem - The item you want the indentation level for.
-    @return int - the indentation level of anItem.
-*/
-- (CPInteger)levelForItem:(id)anItem
-{
-    if (!anItem)
-        return _rootItemInfo.level;
-
-    var itemInfo = _itemInfosForItems[[anItem UID]];
-
-    if (!itemInfo)
-        return CPNotFound;
-
-    return itemInfo.level;
-}
-
-/*!
-    Returns the indentation level for a given row. If the row is invalid
-    CPNotFound is returned. Rows that are not indented return 0.
-
-    @param aRow - the row of the receiver
-    @return int - the indentation level of aRow.
-*/
-- (CPInteger)levelForRow:(CPInteger)aRow
-{
-    return [self levelForItem:[self itemAtRow:aRow]];
-}
-
 /*!
     Sets the number of pixels to indent an item at each indentation level.
 
@@ -709,6 +1007,7 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
 - (CGRect)frameOfOutlineDisclosureControlAtRow:(CPInteger)aRow
 {
     var theItem = [self itemAtRow:aRow];
+
     if (![self isExpandable:theItem] || ![self _shouldShowOutlineDisclosureControlForItem:theItem])
         return CGRectMakeZero();
 
@@ -818,7 +1117,7 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
     @code - (int)outlineView:(CPOutlineView)outlineView heightOfRowByItem:(id)anItem; @endcode
 
 */
-- (void)setDelegate:(id)aDelegate
+- (void)setDelegate:(id <CPOutlineViewDelegate>)aDelegate
 {
     if (_outlineViewDelegate === aDelegate)
         return;
@@ -904,6 +1203,7 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
             CPOutlineViewDelegate_outlineView_typeSelectStringForTableColumn_item_               , @selector(outlineView:typeSelectStringForTableColumn:item:),
             CPOutlineViewDelegate_outlineView_willDisplayOutlineView_forTableColumn_item_        , @selector(outlineView:willDisplayOutlineView:forTableColumn:item:),
             CPOutlineViewDelegate_outlineView_willDisplayView_forTableColumn_item_               , @selector(outlineView:willDisplayView:forTableColumn:item:),
+            CPOutlineViewDelegate_outlineView_willRemoveView_forTableColumn_item_                , @selector(outlineView:willRemoveView:forTableColumn:item:),
             CPOutlineViewDelegate_selectionShouldChangeInOutlineView_                            , @selector(selectionShouldChangeInOutlineView:),
             CPOutlineViewDelegate_outlineView_menuForTableColumn_item_                           , @selector(outlineView:menuForTableColumn:item:)
         ],
@@ -980,17 +1280,6 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
         CPLog.warn("outlineView:dataViewForTableColumn:item: is deprecated. You should use -outlineView:viewForTableColumn:item: where you can request the view with -makeViewWithIdentifier:owner:");
 }
 
-- (BOOL)_sendDelegateDeleteKeyPressed
-{
-    if ([[self delegate] respondsToSelector: @selector(outlineViewDeleteKeyPressed:)])
-    {
-        [[self delegate] outlineViewDeleteKeyPressed:self];
-        return YES;
-    }
-
-    return NO;
-}
-
 /*!
     Returns the delegate object for the outlineview.
 */
@@ -1070,7 +1359,7 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
     @ignore
     We need to offset the dataview and add the disclosure triangle.
 */
-- (CPView)_dragViewForColumn:(int)theColumnIndex event:(CPEvent)theDragEvent offset:(CGPoint)theDragViewOffset
+- (CPView)_dragViewForColumn:(CPInteger)theColumnIndex event:(CPEvent)theDragEvent offset:(CGPoint)theDragViewOffset
 {
     var dragView = [[_CPColumnDragView alloc] initWithLineColor:[self gridColor]],
         tableColumn = [[self tableColumns] objectAtIndex:theColumnIndex],
@@ -1203,7 +1492,7 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
 /*!
     @ignore
 */
-- (id)_parentItemForUpperRow:(int)theUpperRowIndex andLowerRow:(int)theLowerRowIndex atMouseOffset:(CGPoint)theOffset
+- (id)_parentItemForUpperRow:(CPInteger)theUpperRowIndex andLowerRow:(CPInteger)theLowerRowIndex atMouseOffset:(CGPoint)theOffset
 {
     if (_shouldRetargetItem)
         return _retargetedItem;
@@ -1233,7 +1522,7 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
 /*!
     @ignore
 */
-- (CGRect)_rectForDropHighlightViewBetweenUpperRow:(int)theUpperRowIndex andLowerRow:(int)theLowerRowIndex offset:(CGPoint)theOffset
+- (CGRect)_rectForDropHighlightViewBetweenUpperRow:(CPInteger)theUpperRowIndex andLowerRow:(CPInteger)theLowerRowIndex offset:(CGPoint)theOffset
 {
     // Call super and the update x to reflect the current indentation level
     var rect = [super _rectForDropHighlightViewBetweenUpperRow:theUpperRowIndex andLowerRow:theLowerRowIndex offset:theOffset],
@@ -1549,12 +1838,39 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
     [super keyDown:anEvent];
 }
 
-- (CPView)_viewForTableColumn:(CPTableColumn)aTableColumn row:(CPInteger)aRow
+- (BOOL)_sendDelegateDeleteKeyPressed
+{
+    if ([[self delegate] respondsToSelector: @selector(outlineViewDeleteKeyPressed:)])
+    {
+        [[self delegate] outlineViewDeleteKeyPressed:self];
+        return YES;
+    }
+
+    return NO;
+}
+
+- (BOOL)_sendDelegateShouldShowOutlineDisclosureControlForItem:(id)anItem
+{
+    if (!(_implementedOutlineViewDelegateMethods & CPOutlineViewDelegate_outlineView_shouldShowOutlineDisclosureControlForItem_))
+        return YES;
+
+    return [_outlineViewDelegate outlineView:self shouldShowOutlineDisclosureControlForItem:anItem];
+}
+
+- (BOOL)_sendDataSourceShouldDeferDisplayingChildrenOfItem:(id)anItem
+{
+    if (!(_implementedOutlineViewDataSourceMethods & CPOutlineViewDataSource_outlineView_shouldDeferDisplayingChildrenOfItem_))
+        return YES;
+
+    return [_outlineViewDataSource outlineView:self shouldDeferDisplayingChildrenOfItem:anItem];
+}
+
+- (CPView)_sendDelegateViewForTableColumn:(CPTableColumn)aTableColumn row:(CPInteger)aRow
 {
     return [_outlineViewDelegate outlineView:self viewForTableColumn:aTableColumn item:[self itemAtRow:aRow]];
 }
 
-- (CPView)_dataViewForTableColumn:(CPTableColumn)aTableColumn row:(CPInteger)aRow
+- (CPView)_sendDelegateDataViewForTableColumn:(CPTableColumn)aTableColumn row:(CPInteger)aRow
 {
     return [_outlineViewDelegate outlineView:self dataViewForTableColumn:aTableColumn item:[self itemAtRow:aRow]];
 }
@@ -1574,154 +1890,36 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
     return _implementedOutlineViewDelegateMethods & CPOutlineViewDelegate_outlineView_dataViewForTableColumn_item_;
 }
 
+- (BOOL)_delegateRespondsToShouldExpandItem
+{
+    return _implementedOutlineViewDelegateMethods & CPOutlineViewDelegate_outlineView_shouldExpandItem_;
+}
+
+- (BOOL)_delegateRespondsToShouldCollapseItem
+{
+    return _implementedOutlineViewDelegateMethods & CPOutlineViewDelegate_outlineView_shouldCollapseItem_;
+}
+
+/*!
+    @ignore
+    Return YES if the delegate implements outlineView:selectionIndexesForProposedSelection
+*/
+- (BOOL)_delegateRespondsToSelectionIndexesForProposedSelection
+{
+    return _implementedOutlineViewDelegateMethods & CPOutlineViewDelegate_outlineView_selectionIndexesForProposedSelection_;
+}
+
+/*!
+    @ignore
+    Return YES if the delegate implements outlineView:shouldSelectItem:
+*/
+- (BOOL)_delegateRespondsToShouldSelectRow
+{
+    return _implementedOutlineViewDelegateMethods & CPOutlineViewDelegate_outlineView_shouldSelectItem_;
+}
+
 @end
 
-// FIX ME: We're using with() here because Safari fails if we use anOutlineView._itemInfosForItems or whatever...
-var _reloadItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anItem)
-{
-    if (!anItem)
-        return;
-
-    with (anOutlineView)
-    {
-        // Get the existing info if it exists.
-        var itemInfosForItems = _itemInfosForItems,
-            dataSource = _outlineViewDataSource,
-            itemUID = [anItem UID],
-            itemInfo = itemInfosForItems[itemUID];
-
-        // If we're not in the tree, then just bail.
-        if (!itemInfo)
-            return [];
-
-        // See if the item itself can be swapped out.
-        var parent = itemInfo.parent,
-            parentItemInfo = parent ? itemInfosForItems[[parent UID]] : _rootItemInfo,
-            parentChildren = parentItemInfo.children,
-            index = [parentChildren indexOfObjectIdenticalTo:anItem],
-            newItem = [dataSource outlineView:anOutlineView child:index ofItem:parent];
-
-        if (anItem !== newItem)
-        {
-            itemInfosForItems[[anItem UID]] = nil;
-            itemInfosForItems[[newItem UID]] = itemInfo;
-
-            parentChildren[index] = newItem;
-            _itemsForRows[itemInfo.row] = newItem;
-        }
-
-        itemInfo.isExpandable = [dataSource outlineView:anOutlineView isItemExpandable:newItem];
-        itemInfo.isExpanded = itemInfo.isExpandable && itemInfo.isExpanded;
-        itemInfo.shouldShowOutlineDisclosureControl = !(_implementedOutlineViewDelegateMethods & CPOutlineViewDelegate_outlineView_shouldShowOutlineDisclosureControlForItem_) || [_outlineViewDelegate outlineView:self shouldShowOutlineDisclosureControlForItem:newItem];
-    }
-};
-
-// FIX ME: We're using with() here because Safari fails if we use anOutlineView._itemInfosForItems or whatever...
-var _loadItemInfoForItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anItem,  /*BOOL*/ isIntermediate)
-{
-    with (anOutlineView)
-    {
-        var itemInfosForItems = _itemInfosForItems,
-            dataSource = _outlineViewDataSource;
-
-        if (!anItem)
-            var itemInfo = _rootItemInfo;
-
-        else
-        {
-            // Get the existing info if it exists.
-            var itemUID = [anItem UID],
-                itemInfo = itemInfosForItems[itemUID];
-
-            // If we're not in the tree, then just bail.
-            if (!itemInfo)
-                return [];
-
-            itemInfo.isExpandable = [dataSource outlineView:anOutlineView isItemExpandable:anItem];
-            itemInfo.shouldShowOutlineDisclosureControl = !(_implementedOutlineViewDelegateMethods & CPOutlineViewDelegate_outlineView_shouldShowOutlineDisclosureControlForItem_) || [_outlineViewDelegate outlineView:self shouldShowOutlineDisclosureControlForItem:anItem];
-
-            // If we were previously expanded, but now no longer expandable, "de-expand".
-            // NOTE: we are *not* collapsing, thus no notification is posted.
-            if (!itemInfo.isExpandable && itemInfo.isExpanded)
-            {
-                itemInfo.isExpanded = NO;
-                itemInfo.children = [];
-            }
-        }
-
-        // The root item does not count as a descendant.
-        var weight = itemInfo.weight,
-            descendants = anItem ? [anItem] : [];
-
-        if (itemInfo.isExpanded && (!(_implementedOutlineViewDataSourceMethods & CPOutlineViewDataSource_outlineView_shouldDeferDisplayingChildrenOfItem_) ||
-            ![dataSource outlineView:anOutlineView shouldDeferDisplayingChildrenOfItem:anItem]))
-        {
-            var index = 0,
-                count = [dataSource outlineView:anOutlineView numberOfChildrenOfItem:anItem],
-                level = itemInfo.level + 1;
-
-            itemInfo.children = [];
-
-            for (; index < count; ++index)
-            {
-                var childItem = [dataSource outlineView:anOutlineView child:index ofItem:anItem],
-                    childItemInfo = itemInfosForItems[[childItem UID]];
-
-                if (!childItemInfo)
-                {
-                    childItemInfo = { isExpanded:NO, isExpandable:NO, shouldShowOutlineDisclosureControl:YES, children:[], weight:1 };
-                    itemInfosForItems[[childItem UID]] = childItemInfo;
-                }
-
-                itemInfo.children[index] = childItem;
-
-                var childDescendants = _loadItemInfoForItem(anOutlineView, childItem, YES);
-
-                childItemInfo.parent = anItem;
-                childItemInfo.level = level;
-                descendants = descendants.concat(childDescendants);
-            }
-        }
-
-        itemInfo.weight = descendants.length;
-
-        if (!isIntermediate)
-        {
-            // row = -1 is the root item, so just go to row 0 since it is ignored.
-            var index = MAX(itemInfo.row, 0),
-                itemsForRows = _itemsForRows;
-
-            descendants.unshift(index, weight);
-
-            itemsForRows.splice.apply(itemsForRows, descendants);
-
-            var count = itemsForRows.length;
-
-            for (; index < count; ++index)
-                itemInfosForItems[[itemsForRows[index] UID]].row = index;
-
-            var deltaWeight = itemInfo.weight - weight;
-
-            if (deltaWeight !== 0)
-            {
-                var parent = itemInfo.parent;
-
-                while (parent)
-                {
-                    var parentItemInfo = itemInfosForItems[[parent UID]];
-
-                    parentItemInfo.weight += deltaWeight;
-                    parent = parentItemInfo.parent;
-                }
-
-                if (anItem)
-                    _rootItemInfo.weight += deltaWeight;
-            }
-        }
-    }//end of with
-    return descendants;
-};
-
 @implementation _CPOutlineViewTableViewDataSource : CPObject
 {
     CPObject _outlineView;
@@ -1771,7 +1969,7 @@ var _loadItemInfoForItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anIt
     return [_outlineView._outlineViewDataSource outlineView:_outlineView writeItems:items toPasteboard:thePasteboard];
 }
 
-- (int)_childIndexForDropOperation:(CPTableViewDropOperation)theDropOperation row:(int)theRow offset:(CGPoint)theOffset
+- (int)_childIndexForDropOperation:(CPTableViewDropOperation)theDropOperation row:(CPInteger)theRow offset:(CGPoint)theOffset
 {
     if (_outlineView._shouldRetargetChildIndex)
         return _outlineView._retargedChildIndex;
@@ -1795,7 +1993,7 @@ var _loadItemInfoForItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anIt
     return childIndex;
 }
 
-- (void)_parentItemForDropOperation:(CPTableViewDropOperation)theDropOperation row:(int)theRow offset:(CGPoint)theOffset
+- (void)_parentItemForDropOperation:(CPTableViewDropOperation)theDropOperation row:(CPInteger)theRow offset:(CGPoint)theOffset
 {
     if (theDropOperation === CPTableViewDropAbove)
         return [_outlineView _parentItemForUpperRow:theRow - 1 andLowerRow:theRow atMouseOffset:theOffset]
@@ -1803,8 +2001,8 @@ var _loadItemInfoForItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anIt
     return [_outlineView itemAtRow:theRow];
 }
 
-- (CPDragOperation)tableView:(CPTableView)aTableView validateDrop:(id < CPDraggingInfo >)theInfo
-    proposedRow:(int)theRow proposedDropOperation:(CPTableViewDropOperation)theOperation
+- (CPDragOperation)tableView:(CPTableView)aTableView validateDrop:(id /*< CPDraggingInfo >*/)theInfo
+    proposedRow:(CPInteger)theRow proposedDropOperation:(CPTableViewDropOperation)theOperation
 {
     if (!(_outlineView._implementedOutlineViewDataSourceMethods & CPOutlineViewDataSource_outlineView_validateDrop_proposedItem_proposedChildIndex_))
         return CPDragOperationNone;
@@ -1823,7 +2021,7 @@ var _loadItemInfoForItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anIt
     return [_outlineView._outlineViewDataSource outlineView:_outlineView validateDrop:theInfo proposedItem:parentItem proposedChildIndex:childIndex];
 }
 
-- (BOOL)tableView:(CPTableView)aTableView acceptDrop:(id <CPDraggingInfo>)theInfo row:(int)theRow dropOperation:(CPTableViewDropOperation)theOperation
+- (BOOL)tableView:(CPTableView)aTableView acceptDrop:(id /*<CPDraggingInfo>*/)theInfo row:(CPInteger)theRow dropOperation:(CPTableViewDropOperation)theOperation
 {
     if (!(_outlineView._implementedOutlineViewDataSourceMethods & CPOutlineViewDataSource_outlineView_acceptDrop_item_childIndex_))
         return NO;
@@ -1867,7 +2065,7 @@ var _loadItemInfoForItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anIt
     return self;
 }
 
-- (BOOL)tableView:(CPTableView)theTableView shouldSelectRow:(int)theRow
+- (BOOL)tableView:(CPTableView)theTableView shouldSelectRow:(CPInteger)theRow
 {
     return SHOULD_SELECT_ITEM(_outlineView, [_outlineView itemAtRow:theRow]);
 }
@@ -1877,7 +2075,7 @@ var _loadItemInfoForItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anIt
     return SELECTION_SHOULD_CHANGE(_outlineView);
 }
 
-- (BOOL)tableView:(CPTableView)aTableView shouldEditTableColumn:(CPTableColumn)aColumn row:(int)aRow
+- (BOOL)tableView:(CPTableView)aTableView shouldEditTableColumn:(CPTableColumn)aColumn row:(CPInteger)aRow
 {
     if ((_outlineView._implementedOutlineViewDelegateMethods & CPOutlineViewDelegate_outlineView_shouldEditTableColumn_item_))
         return [_outlineView._outlineViewDelegate outlineView:_outlineView shouldEditTableColumn:aColumn item:[_outlineView itemAtRow:aRow]];
@@ -1885,7 +2083,7 @@ var _loadItemInfoForItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anIt
     return NO;
 }
 
-- (float)tableView:(CPTableView)theTableView heightOfRow:(int)theRow
+- (float)tableView:(CPTableView)theTableView heightOfRow:(CPInteger)theRow
 {
     if ((_outlineView._implementedOutlineViewDelegateMethods & CPOutlineViewDelegate_outlineView_heightOfRowByItem_))
         return [_outlineView._outlineViewDelegate outlineView:_outlineView heightOfRowByItem:[_outlineView itemAtRow:theRow]];
@@ -1893,7 +2091,7 @@ var _loadItemInfoForItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anIt
     return [theTableView rowHeight];
 }
 
-- (void)tableView:(CPTableView)aTableView willDisplayView:(id)aView forTableColumn:(CPTableColumn)aTableColumn row:(int)aRowIndex
+- (void)tableView:(CPTableView)aTableView willDisplayView:(id)aView forTableColumn:(CPTableColumn)aTableColumn row:(CPInteger)aRowIndex
 {
     if ((_outlineView._implementedOutlineViewDelegateMethods & CPOutlineViewDelegate_outlineView_willDisplayView_forTableColumn_item_))
     {
@@ -1902,7 +2100,16 @@ var _loadItemInfoForItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anIt
     }
 }
 
-- (BOOL)tableView:(CPTableView)aTableView isGroupRow:(int)aRow
+- (void)tableView:(CPTableView)aTableView willRemoveView:(id)aView forTableColumn:(CPTableColumn)aTableColumn row:(CPInteger)aRowIndex
+{
+    if ((_outlineView._implementedOutlineViewDelegateMethods & CPOutlineViewDelegate_outlineView_willRemoveView_forTableColumn_item_))
+    {
+        var item = [_outlineView itemAtRow:aRowIndex];
+        [_outlineView._outlineViewDelegate outlineView:_outlineView willRemoveView:aView forTableColumn:aTableColumn item:item];
+    }
+}
+
+- (BOOL)tableView:(CPTableView)aTableView isGroupRow:(CPInteger)aRow
 {
     if ((_outlineView._implementedOutlineViewDelegateMethods & CPOutlineViewDelegate_outlineView_isGroupItem_))
         return [_outlineView._outlineViewDelegate outlineView:_outlineView isGroupItem:[_outlineView itemAtRow:aRow]];
@@ -1910,7 +2117,7 @@ var _loadItemInfoForItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anIt
     return NO;
 }
 
-- (CPMenu)tableView:(CPTableView)aTableView menuForTableColumn:(CPTableColumn)aTableColumn row:(int)aRow
+- (CPMenu)tableView:(CPTableView)aTableView menuForTableColumn:(CPTableColumn)aTableColumn row:(CPInteger)aRow
 {
     if ((_outlineView._implementedOutlineViewDelegateMethods & CPOutlineViewDelegate_outlineView_menuForTableColumn_item_))
     {
@@ -1923,6 +2130,22 @@ var _loadItemInfoForItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anIt
     return [_outlineView menu] || [[_outlineView class] defaultMenu];
 }
 
+- (CPIndexSet)tableView:(CPTableView)aTableView selectionIndexesForProposedSelection:(CPIndexSet)anIndexSet
+{
+    if ((_outlineView._implementedOutlineViewDelegateMethods & CPOutlineViewDelegate_outlineView_selectionIndexesForProposedSelection_))
+        return [_outlineView._outlineViewDelegate outlineView:_outlineView selectionIndexesForProposedSelection:anIndexSet];
+
+    return anIndexSet;
+}
+
+- (BOOL)tableView:(CPTableView)aTableView shouldSelectTableColumn:(CPTableColumn)aTableColumn
+{
+    if ((_outlineView._implementedOutlineViewDelegateMethods & CPOutlineViewDelegate_outlineView_shouldSelectTableColumn_))
+        return [_outlineView._outlineViewDelegate outlineView:_outlineView shouldSelectTableColumn:aTableColumn];
+
+    return YES;
+}
+
 @end
 
 @implementation CPDisclosureButton : CPButton
@@ -1940,7 +2163,7 @@ var _loadItemInfoForItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anIt
     return self;
 }
 
-- (void)setState:(CPState)aState
+- (void)setState:(CPInteger)aState
 {
     [super setState:aState];
 

AppKit/CPPanel.j

@@ -119,4 +119,24 @@ CPDocModalWindowMask    = 1 << 6;
     return YES;
 }
 
+
+#pragma mark -
+#pragma mark Overrides
+
+/*!
+    @ignore
+*/
+- (void)cancelOperation:(id)sender
+{
+    if ([[CPApp currentEvent] _couldBeKeyEquivalent] && [self performKeyEquivalent:[CPApp currentEvent]])
+        return;
+
+    [[self firstResponder] tryToPerform:@selector(cancel:) with:self];
+}
+
+- (void)cancel:(id)sender
+{
+    [self performClose:sender];
+}
+
 @end

AppKit/CPPasteboard.j

@@ -26,6 +26,9 @@
 @import <Foundation/CPDictionary.j>
 @import <Foundation/CPPropertyListSerialization.j>
 
+@class CPWebScriptObject
+
+@typedef DataTransfer
 
 CPGeneralPboard         = @"CPGeneralPboard";
 CPFontPboard            = @"CPFontPboard";
@@ -66,7 +69,7 @@ var CPPasteboards = nil,
     unsigned        _changeCount;
     CPString        _stateUID;
 
-    WebScriptObject _nativePasteboard;
+    CPWebScriptObject _nativePasteboard;
 }
 
 /*
@@ -191,10 +194,12 @@ var CPPasteboards = nil,
     _owners = @{};
     _provided = @{};
 
-    var count = _types.length;
-
-    while (count--)
-        [_owners setObject:anOwner forKey:_types[count]];
+    if (anOwner)
+    {
+        var count = _types.length;
+        while (count--)
+            [_owners setObject:anOwner forKey:_types[count]];
+    }
 
     if (_nativePasteboard && shouldUpdate)
     {
@@ -205,6 +210,7 @@ var CPPasteboards = nil,
         _nativePasteboard.declareTypes_(nativeTypes);
         _changeCount = _nativePasteboard.changeCount();
     }
+
     return ++_changeCount;
 }
 
@@ -243,6 +249,10 @@ var CPPasteboards = nil,
 */
 - (void)setString:(CPString)aString forType:(CPString)aType
 {
+    // Putting a non-string on the string pasteboard can lead to strange crashes.
+    if (aString && aString.isa && ![aString isKindOfClass:CPString])
+        [CPException raise:CPInvalidArgumentException reason:"CPPasteboard setString:forType: must be called with a string."];
+
     [self setPropertyList:aString forType:aType];
 }
 

AppKit/CPPopUpButton.j

@@ -26,8 +26,6 @@
 @import "CPMenu.j"
 @import "CPMenuItem.j"
 
-var VISIBLE_MARGIN = 7.0;
-
 CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
 
 /*!
@@ -279,7 +277,7 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
     Selects the item at the specified index
     @param anIndex the index of the item to select
 */
-- (void)setObjectValue:(int)anIndex
+- (void)setObjectValue:(id)anIndex
 {
     var indexOfSelectedItem = [self objectValue];
 
@@ -344,7 +342,7 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
     Returns the item at the specified index or \c nil if the item does not exist.
     @param anIndex the index of the item to obtain
 */
-- (CPMenuItem)itemAtIndex:(unsigned)anIndex
+- (CPMenuItem)itemAtIndex:(CPUInteger)anIndex
 {
     return [[self menu] itemAtIndex:anIndex];
 }
@@ -353,7 +351,7 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
     Returns the title of the item at the specified index or \c nil if no item exists.
     @param anIndex the index of the item
 */
-- (CPString)itemTitleAtIndex:(unsigned)anIndex
+- (CPString)itemTitleAtIndex:(CPUInteger)anIndex
 {
     return [[[self menu] itemAtIndex:anIndex] title];
 }
@@ -773,13 +771,6 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
             [[self selectedItem] setState:CPOffState];
 }
 
-- (void)_reverseSetBinding
-{
-    [_CPPopUpButtonSelectionBinder reverseSetValueForObject:self];
-
-    [super _reverseSetBinding];
-}
-
 @end
 
 @implementation CPPopUpButton (BindingSupport)
@@ -802,6 +793,20 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
     return [super _binderClassForBinding:aBinding];
 }
 
++ (BOOL)isBindingExclusive:(CPString)aBinding
+{
+    return (aBinding == CPSelectedIndexBinding ||
+           aBinding == CPSelectedTagBinding ||
+           aBinding == CPSelectedValueBinding);
+}
+
+- (void)_reverseSetBinding
+{
+    [_CPPopUpButtonSelectionBinder _reverseSetValueFromExclusiveBinderForObject:self];
+
+    [super _reverseSetBinding];
+}
+
 @end
 
 @implementation _CPPopUpButtonContentBinder : CPBinder
@@ -838,7 +843,7 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
     [self _setContentValuesIfNeeded:contentArray];
 }
 
-- (void)valueForBinding:(CPString)aBinding
+- (id)valueForBinding:(CPString)aBinding
 {
     return [self _content];
 }
@@ -910,7 +915,7 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
 {
 }
 
-- (void)setValue:(id)aValue forBinding:(CPString)aBinding
+- (void)setValue:(CPArray)aValue forBinding:(CPString)aBinding
 {
     [super _setContent:aValue];
 }
@@ -931,30 +936,8 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
 
 @end
 
-var binderForObject = {};
-
 @implementation _CPPopUpButtonSelectionBinder : CPBinder
 {
-    CPString _selectionBinding @accessors;
-}
-
-- (id)initWithBinding:(CPString)aBinding name:(CPString)aName to:(id)aDestination keyPath:(CPString)aKeyPath options:(CPDictionary)options from:(id)aSource
-{
-    self = [super initWithBinding:aBinding name:aName to:aDestination keyPath:aKeyPath options:options from:aSource];
-
-    if (self)
-    {
-        binderForObject[[aSource UID]] = self;
-        _selectionBinding = aName;
-    }
-
-    return self;
-}
-
-+ (void)reverseSetValueForObject:(id)aSource
-{
-    var binder = binderForObject[[aSource UID]];
-    [binder reverseSetValueFor:[binder _selectionBinding]];
 }
 
 - (void)setPlaceholderValue:(id)aValue withMarker:(CPString)aMarker forBinding:(CPString)aBinding

AppKit/CPPopover.j

@@ -28,8 +28,19 @@
 @import "CPImageView.j"
 @import "CPResponder.j"
 @import "CPView.j"
+@import "CPViewController.j"
 @import "_CPPopoverWindow.j"
 
+@protocol CPPopoverDelegate <CPObject>
+
+@optional
+- (BOOL)popoverShouldClose:(CPPopover)aPopover;
+- (void)popoverWillClose:(CPPopover)aPopover;
+- (void)popoverDidClose:(CPPopover)aPopover;
+- (void)popoverWillShow:(CPPopover)aPopover;
+- (void)popoverDidShow:(CPPopover)aPopover;
+
+@end
 
 CPPopoverBehaviorApplicationDefined = 0;
 CPPopoverBehaviorTransient          = 1;
@@ -60,15 +71,16 @@ var CPPopoverDelegate_popover_willShow_     = 1 << 0,
 */
 @implementation CPPopover : CPResponder
 {
-    @outlet CPViewController    _contentViewController  @accessors(property=contentViewController);
-    @outlet id                  _delegate               @accessors(getter=delegate);
+    @outlet CPViewController        _contentViewController  @accessors(property=contentViewController);
+    @outlet id <CPPopoverDelegate>  _delegate               @accessors(getter=delegate);
 
-    BOOL                        _animates               @accessors(getter=animates);
-    int                         _appearance             @accessors(property=appearance);
-    int                         _behavior               @accessors(getter=behavior);
+    BOOL                            _animates               @accessors(getter=animates);
+    int                             _appearance             @accessors(property=appearance);
+    int                             _behavior               @accessors(getter=behavior);
 
-    _CPPopoverWindow            _popoverWindow;
-    int                         _implementedDelegateMethods;
+    _CPPopoverWindow                _popoverWindow;
+    CPView                          _positioningView;
+    int                             _implementedDelegateMethods;
 }
 
 
@@ -127,9 +139,6 @@ var CPPopoverDelegate_popover_willShow_     = 1 << 0,
 */
 - (CGSize)contentSize
 {
-    if (![_popoverWindow isVisible])
-        return CGRectMakeZero();
-
     return [[_contentViewController view] frameSize];
 }
 
@@ -140,7 +149,10 @@ var CPPopoverDelegate_popover_willShow_     = 1 << 0,
 */
 - (void)setContentSize:(CGSize)aSize
 {
-    [[_contentViewController view] setFrameSize:aSize];
+    if (!_popoverWindow)
+        [[_contentViewController view] setFrameSize:aSize];
+    else
+        [_popoverWindow updateFrameWithSize:aSize];
 }
 
 /*!
@@ -181,10 +193,10 @@ Set the behavior of the CPPopover. It can be:
         return;
 
     _behavior = aBehavior;
-    [_popoverWindow setStyleMask:[self styleMaskForBehavior]];
+    [_popoverWindow setStyleMask:[self _styleMaskForBehavior]];
 }
 
-- (void)setDelegate:(id)aDelegate
+- (void)setDelegate:(id <CPPopoverDelegate>)aDelegate
 {
     if (_delegate === aDelegate)
         return;
@@ -226,17 +238,14 @@ Set the behavior of the CPPopover. It can be:
     if (!_contentViewController)
         [CPException raise:CPInternalInconsistencyException reason:@"contentViewController must not be nil"];
 
-    // If the popover is currently closing, do nothing. That is what Cocoa does.
-    if ([_popoverWindow isClosing])
+    // If the popover is currently closing or opening, do nothing. That is what Cocoa does.
+    if ([_popoverWindow isClosing] || [_popoverWindow isOpening])
         return;
 
-    if (_implementedDelegateMethods & CPPopoverDelegate_popover_willShow_)
-        [_delegate popoverWillShow:self];
+    _positioningView = positioningView;
 
     if (!_popoverWindow)
-    {
-        _popoverWindow = [[_CPPopoverWindow alloc] initWithContentRect:CGRectMakeZero() styleMask:[self styleMaskForBehavior]];
-    }
+        _popoverWindow = [[_CPPopoverWindow alloc] initWithContentRect:CGRectMakeZero() styleMask:[self _styleMaskForBehavior]];
 
     [_popoverWindow setPlatformWindow:[[positioningView window] platformWindow]];
     [_popoverWindow setAppearance:_appearance];
@@ -245,15 +254,22 @@ Set the behavior of the CPPopover. It can be:
     [_popoverWindow setMovableByWindowBackground:NO];
     [_popoverWindow setFrame:[_popoverWindow frameRectForContentRect:[[_contentViewController view] frame]]];
     [_popoverWindow setContentView:[_contentViewController view]];
+
+    if (![self isShown])
+        [self _popoverWillShow];
+
     [_popoverWindow positionRelativeToRect:positioningRect ofView:positioningView preferredEdge:preferredEdge];
 
-    if (!_animates && _implementedDelegateMethods & CPPopoverDelegate_popover_didShow_)
-        [_delegate popoverDidShow:self];
+    if (![self isShown])
+        [self _popoverWindowDidShow];
 }
 
-- (unsigned)styleMaskForBehavior
+- (unsigned)_styleMaskForBehavior
 {
-    return (_behavior == CPPopoverBehaviorTransient) ? CPClosableOnBlurWindowMask : 0;
+    if (_behavior == CPPopoverBehaviorApplicationDefined)
+        return 0;
+
+    return CPClosableOnBlurWindowMask
 }
 
 /*!
@@ -272,9 +288,9 @@ Set the behavior of the CPPopover. It can be:
     if ([_popoverWindow isClosing] || ![self isShown])
         return;
 
-    if (_implementedDelegateMethods & CPPopoverDelegate_popover_willClose_)
-        [_delegate popoverWillClose:self];
+    [self _popoverWillClose];
 
+    _positioningView = nil;
     [_popoverWindow close];
 
     // popoverDidClose will be sent from popoverWindowDidClose, since
@@ -295,9 +311,8 @@ Set the behavior of the CPPopover. It can be:
     if ([_popoverWindow isClosing])
         return;
 
-    if (_implementedDelegateMethods & CPPopoverDelegate_popover_shouldClose_)
-        if (![_delegate popoverShouldClose:self])
-            return;
+    if (![self _popoverShouldClose])
+        return;
 
     [self _close];
 }
@@ -307,7 +322,7 @@ Set the behavior of the CPPopover. It can be:
 #pragma mark Delegates
 
 /*! @ignore */
-- (BOOL)popoverWindowShouldClose:(_CPPopoverWindow)aPopoverWindow
+- (BOOL)_popoverWindowShouldClose
 {
     [self performClose:self];
 
@@ -318,19 +333,42 @@ Set the behavior of the CPPopover. It can be:
 }
 
 /*! @ignore */
-- (void)popoverWindowDidClose:(_CPPopoverWindow)aPopoverWindow
+- (void)_popoverWindowDidClose
 {
     if (_implementedDelegateMethods & CPPopoverDelegate_popover_didClose_)
         [_delegate popoverDidClose:self];
 }
 
 /*! @ignore */
-- (void)popoverWindowDidShow:(_CPPopoverWindow)aPopoverWindow
+- (void)_popoverWindowDidShow
 {
     if (_implementedDelegateMethods & CPPopoverDelegate_popover_didShow_)
         [_delegate popoverDidShow:self];
 }
 
+/*! @ignore */
+- (BOOL)_popoverShouldClose
+{
+    if (_implementedDelegateMethods & CPPopoverDelegate_popover_shouldClose_)
+        return [_delegate popoverShouldClose:self];
+
+    return YES;
+}
+
+/*! @ignore */
+- (void)_popoverWillClose
+{
+    if (_implementedDelegateMethods & CPPopoverDelegate_popover_willClose_)
+        [_delegate popoverWillClose:self];
+}
+
+/*! @ignore */
+- (void)_popoverWillShow
+{
+    if (_implementedDelegateMethods & CPPopoverDelegate_popover_willShow_)
+        [_delegate popoverWillShow:self];
+}
+
 @end
 
 @implementation CPPopover (Deprecated)

AppKit/CPProgressIndicator.j

@@ -26,6 +26,7 @@
 @import "CPWindow_Constants.j"
 
 
+@typedef CPProgressIndicatorStyle
 /*
     @global
     @group CPProgressIndicatorStyle

AppKit/CPRadio.j

@@ -25,6 +25,8 @@
 
 @import "CPButton.j"
 
+@class CPRadioGroup
+
 @global CPApp
 
 
@@ -152,7 +154,7 @@ CPRadioImageOffset = 4.0;
         [_radioGroup _setSelectedRadio:self];
 }
 
-- (void)sendAction:(SEL)anAction to:(id)anObject
+- (BOOL)sendAction:(SEL)anAction to:(id)anObject
 {
     [super sendAction:anAction to:anObject];
 
@@ -356,7 +358,7 @@ var CPRadioRadioGroupKey    = @"CPRadioRadioGroupKey";
     [_selectedRadio setState:CPOffState];
 
     _selectedRadio = aRadio;
-    [_CPRadioGroupSelectionBinder reverseSetValueForObject:self];
+    [_CPRadioGroupSelectionBinder _reverseSetValueFromExclusiveBinderForObject:self];
 }
 
 @end
@@ -407,32 +409,17 @@ var CPRadioGroupRadiosKey           = @"CPRadioGroupRadiosKey",
     return [super _binderClassForBinding:aBinding];
 }
 
-@end
++ (BOOL)isBindingExclusive:(CPString)aBinding
+{
+    return (aBinding == CPSelectedIndexBinding ||
+           aBinding == CPSelectedTagBinding ||
+           aBinding == CPSelectedValueBinding);
+}
 
-var binderForObject = {};
+@end
 
 @implementation _CPRadioGroupSelectionBinder : CPBinder
 {
-    CPString _selectionBinding @accessors;
-}
-
-- (id)initWithBinding:(CPString)aBinding name:(CPString)aName to:(id)aDestination keyPath:(CPString)aKeyPath options:(CPDictionary)options from:(id)aSource
-{
-    self = [super initWithBinding:aBinding name:aName to:aDestination keyPath:aKeyPath options:options from:aSource];
-
-    if (self)
-    {
-        binderForObject[[aSource UID]] = self;
-        _selectionBinding = aName;
-    }
-
-    return self;
-}
-
-+ (void)reverseSetValueForObject:(id)aSource
-{
-    var binder = binderForObject[[aSource UID]];
-    [binder reverseSetValueFor:[binder _selectionBinding]];
 }
 
 - (void)setPlaceholderValue:(id)aValue withMarker:(CPString)aMarker forBinding:(CPString)aBinding

AppKit/CPResponder.j

@@ -26,6 +26,7 @@
 @import "CPEvent.j"
 
 @class CPKeyBinding
+@class CPMenu
 
 CPDeleteKeyCode         = 8;
 CPTabKeyCode            = 9;
@@ -356,7 +357,7 @@ CPDeleteForwardKeyCode  = 46;
 var CPResponderNextResponderKey = @"CPResponderNextResponderKey",
     CPResponderMenuKey = @"CPResponderMenuKey";
 
-@implementation CPResponder (CPCoding)
+@implementation CPResponder (CPCoding) <CPCoding>
 
 /*!
     Initializes the responder with data from a coder.

AppKit/CPRuleEditor/CPPredicateEditor.j

@@ -484,7 +484,7 @@
 
 #pragma mark RuleEditor delegate methods
 
-- (int)_queryNumberOfChildrenOfItem:(id)rowItem withRowType:(int)type
+- (int)_queryNumberOfChildrenOfItem:(id)rowItem withRowType:(CPRuleEditorRowType)type
 {
     if (rowItem == nil)
     {
@@ -494,7 +494,7 @@
     return [[rowItem children] count];
 }
 
-- (id)_queryChild:(int)childIndex ofItem:(id)rowItem withRowType:(int)type
+- (id)_queryChild:(int)childIndex ofItem:(id)rowItem withRowType:(CPRuleEditorRowType)type
 {
     if (rowItem == nil)
     {
@@ -505,7 +505,7 @@
     return [[rowItem children] objectAtIndex:childIndex];
 }
 
-- (id)_queryValueForItem:(id)rowItem inRow:(int)rowIndex
+- (id)_queryValueForItem:(id)rowItem inRow:(CPInteger)rowIndex
 {
     return [rowItem displayValue];
 }
@@ -516,7 +516,7 @@ var CPPredicateTemplatesKey = @"CPPredicateTemplates";
 
 @implementation CPPredicateEditor (CPCoding)
 
-- (id)initWithCoder:(id)aCoder
+- (id)initWithCoder:(CPCoder)aCoder
 {
     self = [super initWithCoder:aCoder];
 
@@ -531,7 +531,7 @@ var CPPredicateTemplatesKey = @"CPPredicateTemplates";
     return self;
 }
 
-- (void)encodeWithCoder:(id)aCoder
+- (void)encodeWithCoder:(CPCoder)aCoder
 {
     [super encodeWithCoder:aCoder];
     [aCoder encodeObject:_allTemplates forKey:CPPredicateTemplatesKey];

AppKit/CPRuleEditor/CPPredicateEditorRowTemplate.j

@@ -27,8 +27,7 @@
 @import "CPMenuItem.j"
 @import "CPTextField.j"
 
-// NOTE: CPDatePicker is not implemented yet
-@class CPDatePicker
+@import "CPDatePicker.j"
 
 
 CPUndefinedAttributeType     = 0;
@@ -488,7 +487,36 @@ CPTransformableAttributeType = 1800;
 
 - (id)copy
 {
-    return [CPKeyedUnarchiver unarchiveObjectWithData:[CPKeyedArchiver archivedDataWithRootObject:self]];
+    var views = [CPArray array];
+
+    var copy = [[[self class] alloc] init];
+    [copy _setTemplateType:_templateType];
+    [copy _setOptions:_predicateOptions];
+    [copy _setModifier:_predicateModifier];
+    [copy _setLeftAttributeType:_leftAttributeType];
+    [copy _setRightAttributeType:_rightAttributeType];
+    [copy setLeftIsWildcard:_leftIsWildcard];
+    [copy setRightIsWildcard:_rightIsWildcard];
+
+    [_views enumerateObjectsUsingBlock:function(aView, idx, stop)
+    {
+        var vcopy;
+
+        if ([aView implementsSelector:@selector(copy)])
+        {
+            vcopy = [aView copy];
+        }
+        else
+        {
+            vcopy = [CPKeyedUnarchiver unarchiveObjectWithData:[CPKeyedArchiver archivedDataWithRootObject:aView]];
+        }
+
+        [views addObject:vcopy];
+    }];
+
+    [copy setTemplateViews:views];
+
+    return copy;
 }
 
 + (id)_operatorsForAttributeType:(CPAttributeType)attributeType
@@ -680,7 +708,10 @@ CPTransformableAttributeType = 1800;
         view = [[CPCheckBox alloc] initWithFrame:CGRectMake(0, 0, 50, 26)];
     }
     else if (attributeType == CPDateAttributeType)
-        view = [[CPDatePicker alloc] initWithFrame:CGRectMake(0, 0, 150, 26)];
+    {
+        view = [[CPDatePicker alloc] initWithFrame:CGRectMake(0, 0, 180, 26)];
+        [view setDatePickerElements:CPYearMonthDayDatePickerElementFlag];
+    }
     else
         return nil;
 
@@ -702,12 +733,12 @@ CPTransformableAttributeType = 1800;
     return textField;
 }
 
-- (void)_setOptions:(unsigned int)options
+- (void)_setOptions:(unsigned)options
 {
     _predicateOptions = options;
 }
 
-- (void)_setModifier:(unsigned int)modifier
+- (void)_setModifier:(unsigned)modifier
 {
     _predicateModifier = modifier;
 }
@@ -797,5 +828,31 @@ var CPPredicateTemplateTypeKey = @"CPPredicateTemplateType",
     [coder encodeObject:_views forKey:CPPredicateTemplateViewsKey];
 }
 
+@end
+
+// Copy support for built-in types
+@implementation CPDatePicker (CPCopying)
+
+- (id)copy
+{
+    var ret = [[[self class] alloc] initWithFrame:[self frame]];
+
+    [ret setTextFont:[self textFont]];
+    [ret setMinDate:[self minDate]];
+    [ret setMaxDate:[self maxDate]];
+    [ret setTimeInterval:[self timeInterval]];
+    [ret setDatePickerMode:[self datePickerMode]];
+    [ret setDatePickerElements:[self datePickerElements]];
+    [ret setDatePickerStyle:[self datePickerStyle]];
+    [ret setLocale:[self locale]];
+    [ret setDateValue:[self dateValue]];
+    [ret setBackgroundColor:[self backgroundColor]];
+    [ret setDrawsBackground:[self drawsBackground]];
+    [ret setBordered:[self isBordered]];
+    [ret _init];
+
+    return ret;
+}
+
 @end
 /*! @endcond */

AppKit/CPRuleEditor/CPRuleEditor.j

@@ -41,6 +41,21 @@
 @global CPCaseInsensitivePredicateOption
 @global CPOrPredicateType
 
+@protocol CPRuleEditorDelegate <CPObject>
+
+@required
+- (id)ruleEditor:(CPRuleEditor)editor child:(CPInteger)index forCriterion:(id)criterion withRowType:(CPRuleEditorRowType)rowType;
+- (id)ruleEditor:(CPRuleEditor)editor displayValueForCriterion:(id)criterion inRow:(CPInteger)row;
+- (CPInteger)ruleEditor:(CPRuleEditor)editor numberOfChildrenForCriterion:(id)criterion withRowType:(CPRuleEditorRowType)rowType;
+
+@optional
+- (CPDictionary)ruleEditor:(CPRuleEditor)editor predicatePartsForCriterion:(id)criterion withDisplayValue:(id)value inRow:(CPInteger)row;
+- (void)ruleEditorRowsDidChange:(CPNotification)notification;
+
+@end
+
+var CPRuleEditorDelegate_ruleEditor_predicatePartsForCriterion_withDisplayValue_inRow_   = 1 << 1;
+
 var CPRuleEditorItemPBoardType  = @"CPRuleEditorItemPBoardType",
     itemsContext                = "items",
     valuesContext               = "values",
@@ -69,50 +84,51 @@ var CPRuleEditorItemPBoardType  = @"CPRuleEditorItemPBoardType",
 
 @implementation CPRuleEditor : CPControl
 {
-    BOOL             _suppressKeyDownHandling;
-    BOOL             _allowsEmptyCompoundRows;
-    BOOL             _disallowEmpty;
-    BOOL             _delegateWantsValidation;
-    BOOL             _editable;
-    BOOL             _sendAction;
+    BOOL                        _suppressKeyDownHandling;
+    BOOL                        _allowsEmptyCompoundRows;
+    BOOL                        _disallowEmpty;
+    BOOL                        _delegateWantsValidation;
+    BOOL                        _editable;
+    BOOL                        _sendAction;
 
-    Class           _rowClass;
+    Class                       _rowClass;
 
-    CPIndexSet      _draggingRows;
-    CPInteger       _subviewIndexOfDropLine;
-    CPView          _dropLineView;
+    CPIndexSet                  _draggingRows;
+    CPInteger                   _subviewIndexOfDropLine;
+    CPView                      _dropLineView;
 
-    CPMutableArray  _rowCache;
-    CPMutableArray  _slices;
+    CPMutableArray              _rowCache;
+    CPMutableArray              _slices;
 
-    CPPredicate     _predicate;
+    CPPredicate                 _predicate;
 
-    CPString        _itemsKeyPath;
-    CPString        _subrowsArrayKeyPath;
-    CPString        _typeKeyPath;
-    CPString        _valuesKeyPath;
-    CPString        _boundArrayKeyPath @accessors(property=boundArrayKeyPath);
+    CPString                    _itemsKeyPath;
+    CPString                    _subrowsArrayKeyPath;
+    CPString                    _typeKeyPath;
+    CPString                    _valuesKeyPath;
+    CPString                    _boundArrayKeyPath @accessors(property=boundArrayKeyPath);
 
-    CPView          _slicesHolder;
-    CPViewAnimation _currentAnimation;
+    CPView                      _slicesHolder;
+    CPViewAnimation             _currentAnimation;
 
-    CPInteger       _lastRow;
-    CPInteger       _nestingMode;
+    CPInteger                   _lastRow;
+    CPInteger                   _nestingMode;
 
-    float           _alignmentGridWidth;
-    float           _sliceHeight;
+    float                       _alignmentGridWidth;
+    float                       _sliceHeight;
 
-    id              _ruleDataSource;
-    id              _ruleDelegate;
-    id              _boundArrayOwner;
+    id                          _ruleDataSource;
+    id <CPRuleEditorDelegate>   _ruleDelegate;
+    id                          _boundArrayOwner;
+    unsigned                    _implementedDelegateMethods;
 
-    CPString        _stringsFilename;
+    CPString                    _stringsFilename;
 
-    BOOL            _isKeyDown;
-    BOOL            _nestingModeDidChange;
+    BOOL                        _isKeyDown;
+    BOOL                        _nestingModeDidChange;
 
-    _CPRuleEditorLocalizer _standardLocalizer @accessors(property=standardLocalizer);
-    CPDictionary           _itemsAndValuesToAddForRowType;
+    _CPRuleEditorLocalizer      _standardLocalizer @accessors(property=standardLocalizer);
+    CPDictionary                _itemsAndValuesToAddForRowType;
 }
 
 /*! @cond */
@@ -122,7 +138,7 @@ var CPRuleEditorItemPBoardType  = @"CPRuleEditorItemPBoardType",
     return @"rule-editor";
 }
 
-+ (id)themeAttributes
++ (CPDictionary)themeAttributes
 {
     return @{
             @"alternating-row-colors": [CPNull null],
@@ -131,8 +147,10 @@ var CPRuleEditorItemPBoardType  = @"CPRuleEditorItemPBoardType",
             @"slice-bottom-border-color": [CPNull null],
             @"slice-last-bottom-border-color": [CPNull null],
             @"font": [CPNull null],
+            @"font-color": [CPNull null],
             @"add-image": [CPNull null],
             @"remove-image": [CPNull null],
+            @"vertical-alignment": [CPNull null]
         };
 }
 
@@ -143,7 +161,7 @@ var CPRuleEditorItemPBoardType  = @"CPRuleEditorItemPBoardType",
     {
         _slices = [[CPMutableArray alloc] init];
 
-        _sliceHeight = 26.;
+        _sliceHeight = 26.0;
         _nestingMode = CPRuleEditorNestingModeSimple; // 10.5 default is CPRuleEditorNestingModeCompound
         _editable = YES;
         _allowsEmptyCompoundRows = NO;
@@ -213,19 +231,24 @@ var CPRuleEditorItemPBoardType  = @"CPRuleEditorItemPBoardType",
     @discussion CPRuleEditor requires a delegate that implements the required delegate methods to function.
     @see delegate
 */
-- (void)setDelegate:(id)aDelegate
+- (void)setDelegate:(id <CPRuleEditorDelegate>)aDelegate
 {
     if (_ruleDelegate === aDelegate)
         return;
 
     var nc = [CPNotificationCenter defaultCenter];
+
     if (_ruleDelegate)
         [nc removeObserver:_ruleDelegate name:nil object:self];
 
     _ruleDelegate = aDelegate;
+    _implementedDelegateMethods = 0;
 
     if ([_ruleDelegate respondsToSelector:@selector(ruleEditorRowsDidChange:)])
         [nc addObserver:_ruleDelegate selector:@selector(ruleEditorRowsDidChange:) name:CPRuleEditorRowsDidChangeNotification object:nil];
+
+    if ([_ruleDelegate respondsToSelector:@selector(ruleEditor:predicatePartsForCriterion:withDisplayValue:inRow:)])
+        _implementedDelegateMethods |= CPRuleEditorDelegate_ruleEditor_predicatePartsForCriterion_withDisplayValue_inRow_;
 }
 /*!
     @brief Returns a Boolean value that indicates whether the receiver is editable.
@@ -461,7 +484,7 @@ var CPRuleEditorItemPBoardType  = @"CPRuleEditorItemPBoardType",
     @param row The index of a row in the receiver.
     @return The currently chosen items for row @a row.
 */
-- (id)criteriaForRow:(int)row
+- (id)criteriaForRow:(CPInteger)row
 {
     var rowcache = [self _rowCacheForIndex:row];
     if (rowcache)
@@ -480,7 +503,7 @@ var CPRuleEditorItemPBoardType  = @"CPRuleEditorItemPBoardType",
     @return The chosen values (strings, views, or menu items) for row row.
     @discussion The values returned are the same as those returned from the delegate method -#ruleEditor:displayValueForCriterion:inRow:
 */
-- (CPMutableArray)displayValuesForRow:(int)row
+- (CPMutableArray)displayValuesForRow:(CPInteger)row
 {
     var rowcache = [self _rowCacheForIndex:row];
     if (rowcache)
@@ -503,7 +526,7 @@ var CPRuleEditorItemPBoardType  = @"CPRuleEditorItemPBoardType",
     @param rowIndex The index of a row in the receiver.
     @return The index of the parent of the row at @a rowIndex. If the row at @a rowIndex is a root row, returns @c -1.
 */
-- (int)parentRowForRow:(int)rowIndex
+- (int)parentRowForRow:(CPInteger)rowIndex
 {
     if (rowIndex < 0 || rowIndex >= [self numberOfRows])
         [CPException raise:CPRangeException reason:_cmd + @" row " + rowIndex + " is out of range"];
@@ -544,7 +567,7 @@ TODO: implement
     @return The type of the row at @a rowIndex.
     @warning Raises a @c CPRangeException if rowIndex is less than @c 0 or greater than or equal to the number of rows.
 */
-- (CPRuleEditorRowType)rowTypeForRow:(int)rowIndex
+- (CPRuleEditorRowType)rowTypeForRow:(CPInteger)rowIndex
 {
     if (rowIndex < 0 || rowIndex > [self numberOfRows])
         [CPException raise:CPRangeException reason:_cmd + @"row " + rowIndex + " is out of range"];
@@ -565,7 +588,7 @@ TODO: implement
     @return The immediate subrows of the row at @a rowIndex.
     @discussion Rows are numbered starting at @c 0.
 */
-- (CPIndexSet)subrowIndexesForRow:(int)rowIndex
+- (CPIndexSet)subrowIndexesForRow:(CPInteger)rowIndex
 {
     var object;
 
@@ -691,7 +714,7 @@ TODO: implement
     @note Currently, @a shouldAnimate has no effect, rows are always animated when calling this method.
     @see addRow:
 */
-- (void)insertRowAtIndex:(int)rowIndex withType:(unsigned int)rowType asSubrowOfRow:(int)parentRow animate:(BOOL)shouldAnimate
+- (void)insertRowAtIndex:(int)rowIndex withType:(unsigned int)rowType asSubrowOfRow:(CPInteger)parentRow animate:(BOOL)shouldAnimate
 {
 /*
     TODO: raise exceptions if parentRow is greater than or equal to rowIndex, or if rowIndex would fall amongst the children of some other parent, or if the nesting mode forbids this configuration.
@@ -810,7 +833,7 @@ TODO: implement
         var item = [items objectAtIndex:i],
         //var displayValue = [self _queryValueForItem:item inRow:aRow]; Ask the delegate or get cached value ?.
             displayValue = [[self displayValuesForRow:aRow] objectAtIndex:i],
-            predpart = [_ruleDelegate ruleEditor:self predicatePartsForCriterion:item withDisplayValue:displayValue inRow:aRow];
+            predpart = [self _sendDelegateRuleEditorPredicatePartsForCriterion:item withDisplayValue:displayValue inRow:aRow];
 
         if (predpart)
             [predicateParts addEntriesFromDictionary:predpart];
@@ -1313,7 +1336,7 @@ TODO: implement
     return [_boundArrayOwner mutableArrayValueForKey:_boundArrayKeyPath];
 }
 
-- (BOOL)_nextUnusedItems:(CPArray)items andValues:(CPArray)values forRow:(int)rowIndex forRowType:(unsigned int)type
+- (BOOL)_nextUnusedItems:(CPArray)items andValues:(CPArray)values forRow:(CPInteger)rowIndex forRowType:(unsigned int)type
 {
     var parentItem = [items lastObject], // if empty items array, this is NULL aka the root item;
         childrenCount = [self _queryNumberOfChildrenOfItem:parentItem withRowType:type],
@@ -1375,7 +1398,7 @@ TODO: implement
     return YES;
 }
 
-- (CPMutableArray)_getItemsAndValuesToAddForRow:(int)rowIndex ofType:(CPRuleEditorRowType)type
+- (CPMutableArray)_getItemsAndValuesToAddForRow:(CPInteger)rowIndex ofType:(CPRuleEditorRowType)type
 {
     //var cachedItemsAndValues = _itemsAndValuesToAddForRowType[type];
     //if (cachedItemsAndValues)
@@ -1418,7 +1441,7 @@ TODO: implement
     [self insertRowAtIndex:insertIndex withType:type asSubrowOfRow:parentRowIndex animate:YES];
 }
 
-- (id)_insertNewRowAtIndex:(int)insertIndex ofType:(CPRuleEditorRowType)rowtype withParentRow:(int)parentRowIndex
+- (id)_insertNewRowAtIndex:(int)insertIndex ofType:(CPRuleEditorRowType)rowtype withParentRow:(CPInteger)parentRowIndex
 {
     var row = [[[self rowClass] alloc] init],
         itemsandvalues = [self _getItemsAndValuesToAddForRow:insertIndex ofType:rowtype],
@@ -1520,7 +1543,7 @@ TODO: implement
     }
 }
 
-- (void)_changedItem:(id)fromItem toItem:(id)toItem inRow:(int)aRow atCriteriaIndex:(int)fromItemIndex
+- (void)_changedItem:(id)fromItem toItem:(id)toItem inRow:(CPInteger)aRow atCriteriaIndex:(int)fromItemIndex
 {
     var criteria = [self criteriaForRow:aRow],
         displayValues = [self displayValuesForRow:aRow],
@@ -1684,7 +1707,7 @@ TODO: implement
     [super bind:aBinding toObject:observableController withKeyPath:aKeyPath options:options];
 }
 
-- (void)unbind:(id)object
+- (void)unbind:(CPString)object
 {
     _rowClass = [_CPRuleEditorRowObject class];
     [super unbind:object];
@@ -1716,8 +1739,7 @@ TODO: implement
 {
     if (_delegateWantsValidation)
     {
-        var selector = @selector(ruleEditor:predicatePartsForCriterion:withDisplayValue:inRow:);
-        if (![_ruleDelegate respondsToSelector:selector])
+        if (![self _delegateRespondsToRuleEditorPredicatePartsForCriterionWithDisplayValueInRow])
             return;
 
         _delegateWantsValidation = NO;
@@ -1865,14 +1887,34 @@ TODO: implement
     return [self valueForThemeAttribute:@"font"];
 }
 
-- (CPImage)_addImage
+- (CPColor)_fontColor
 {
-    return [self valueForThemeAttribute:@"add-image"];
+    return [self valueForThemeAttribute:@"font-color"];
 }
 
-- (CPImage)_removeImage
+- (CPImage)_imageAdd
 {
-    return [self valueForThemeAttribute:@"remove-image"];
+    return [self valueForThemeAttribute:@"add-image" inState:CPThemeStateNormal];
+}
+
+- (CPImage)_imageAddHighlighted
+{
+    return [self valueForThemeAttribute:@"add-image" inState:CPThemeStateHighlighted];
+}
+
+- (CPImage)_imageRemove
+{
+    return [self valueForThemeAttribute:@"remove-image" inState:CPThemeStateNormal];
+}
+
+- (CPImage)_imageRemoveHighlighted
+{
+    return [self valueForThemeAttribute:@"remove-image" inState:CPThemeStateHighlighted];
+}
+
+- (CPVerticalTextAlignment)_verticalAlignment
+{
+    return [self valueForThemeAttribute:@"vertical-alignment"];
 }
 
 - (CPString)_toolTipForAddCompoundRowButton
@@ -2005,7 +2047,7 @@ TODO: implement
     return [_ruleDelegate ruleEditor:self child:childIndex forCriterion:item withRowType:type];
 }
 
-- (id)_queryValueForItem:(id)item inRow:(int)row
+- (id)_queryValueForItem:(id)item inRow:(CPInteger)row
 {
     return [_ruleDelegate ruleEditor:self displayValueForCriterion:item inRow:row];
 }
@@ -2026,12 +2068,12 @@ TODO: implement
     _alignmentGridWidth = width;
 }
 
-- (BOOL)_validateItem:(id)item value:(id)value inRow:(int)row
+- (BOOL)_validateItem:(id)item value:(id)value inRow:(CPInteger)row
 {
     return [self _queryCanSelectItem:item displayValue:value inRow:row];
 }
 
-- (BOOL)_queryCanSelectItem:(id)item displayValue:(id)value inRow:(int)row
+- (BOOL)_queryCanSelectItem:(id)item displayValue:(id)value inRow:(CPInteger)row
 {
     return YES;
 }
@@ -2128,7 +2170,7 @@ TODO: implement
     return YES;
 }
 
-- (CPDragOperation)draggingEntered:(id < CPDraggingInfo >)sender
+- (CPDragOperation)draggingEntered:(id /*< CPDraggingInfo >*/)sender
 {
     if ([sender draggingSource] === self)
     {
@@ -2158,14 +2200,14 @@ TODO: implement
     _subviewIndexOfDropLine = CPNotFound;
 }
 
-- (CPDragOperation)draggingUpdated:(id <CPDraggingInfo>)sender
+- (CPDragOperation)draggingUpdated:(id /*<CPDraggingInfo>*/)sender
 {
     var point = [self convertPoint:[sender draggingLocation] fromView:nil],
         y = point.y + _sliceHeight / 2,
         indexOfDropLine =  FLOOR(y / _sliceHeight),
         numberOfRows = [self numberOfRows];
 
-    if (indexOfDropLine < 0 || indexOfDropLine > numberOfRows || (indexOfDropLine >= [_draggingRows firstIndex] && indexOfDropLine <= [_draggingRows lastIndex] + 1))
+    if (indexOfDropLine <= 0 || indexOfDropLine > numberOfRows || (indexOfDropLine >= [_draggingRows firstIndex] && indexOfDropLine <= [_draggingRows lastIndex] + 1))
     {
         if (_subviewIndexOfDropLine !== CPNotFound && indexOfDropLine !== _subviewIndexOfDropLine)
             [self _clearDropLine];
@@ -2195,12 +2237,12 @@ TODO: implement
     return CPDragOperationMove;
 }
 
-- (BOOL)prepareForDragOperation:(id < CPDraggingInfo >)sender
+- (BOOL)prepareForDragOperation:(id /*< CPDraggingInfo >*/)sender
 {
     return (_subviewIndexOfDropLine !== CPNotFound);
 }
 
-- (BOOL)performDragOperation:(id < CPDraggingInfo >)info
+- (BOOL)performDragOperation:(id /*< CPDraggingInfo >*/)info
 {
     var aboveInsertIndexCount = 0,
         object,
@@ -2262,7 +2304,7 @@ TODO: implement
 {
 }
 
-- (void)_setWindow:(id)window
+- (void)_setWindow:(CPWindow)window
 {
     [super _setWindow:window];
 }
@@ -2325,7 +2367,7 @@ TODO: implement
     return YES;
 }
 
-- (void)_getAllAvailableItems:(id)items values:(id)values asChildrenOfItem:(id)parentItem inRow:(int)aRow
+- (void)_getAllAvailableItems:(id)items values:(id)values asChildrenOfItem:(id)parentItem inRow:(CPInteger)aRow
 {
     var type,
         indexofCriterion,
@@ -2377,6 +2419,33 @@ TODO: implement
 
 @end
 
+
+@implementation CPRuleEditor (CPRuleEditorDelegate)
+
+/*!
+    @ignore
+    Check if the delegate responds to ruleEditor:predicatePartsForCriterion:withDisplayValue:inRow:
+*/
+- (BOOL)_delegateRespondsToRuleEditorPredicatePartsForCriterionWithDisplayValueInRow
+{
+    return _implementedDelegateMethods & CPRuleEditorDelegate_ruleEditor_predicatePartsForCriterion_withDisplayValue_inRow_;
+}
+
+/*!
+    @ignore
+    Call delegate ruleEditor:predicatePartsForCriterion:withDisplayValue:inRow:
+*/
+- (CPDictionary)_sendDelegateRuleEditorPredicatePartsForCriterion:(id)criterion withDisplayValue:(id)value inRow:(CPInteger)row
+{
+    if (!(_implementedDelegateMethods & CPRuleEditorDelegate_ruleEditor_predicatePartsForCriterion_withDisplayValue_inRow_))
+        return @{};
+
+    return [_ruleDelegate ruleEditor:self predicatePartsForCriterion:criterion withDisplayValue:value inRow:row];
+}
+
+@end
+
+
 var CPRuleEditorAlignmentGridWidthKey       = @"CPRuleEditorAlignmentGridWidth",
     CPRuleEditorSliceHeightKey              = @"CPRuleEditorSliceHeight",
     CPRuleEditorStringsFilenameKey          = @"CPRuleEditorStringsFilename",
@@ -2426,7 +2495,7 @@ var CPRuleEditorAlignmentGridWidthKey       = @"CPRuleEditorAlignmentGridWidth",
     return self;
 }
 
-- (void)encodeWithCoder:(id)coder
+- (void)encodeWithCoder:(CPCoder)coder
 {
     [super encodeWithCoder:coder];
 
@@ -2481,7 +2550,7 @@ var CriteriaKey         = @"criteria",
     return "<" + [self className] + ">\nsubrows = " + [subrows description] + "\ncriteria = " + [criteria description] + "\ndisplayValues = " + [displayValues description];
 }
 
-- (id)initWithCoder:(id)coder
+- (id)initWithCoder:(CPCoder)coder
 {
     self = [super init];
     if (self !== nil)
@@ -2495,7 +2564,7 @@ var CriteriaKey         = @"criteria",
     return self;
 }
 
-- (void)encodeWithCoder:(id)coder
+- (void)encodeWithCoder:(CPCoder)coder
 {
     [coder encodeObject:subrows forKey:SubrowsKey];
     [coder encodeObject:criteria forKey:CriteriaKey];
@@ -2534,7 +2603,7 @@ var CPBoundArrayKey = @"CPBoundArray";
     return self;
 }
 
-- (id)initWithCoder:(id)coder
+- (id)initWithCoder:(CPCoder)coder
 {
     if (self = [super init])
         boundArray = [coder decodeObjectForKey:CPBoundArrayKey];
@@ -2542,7 +2611,7 @@ var CPBoundArrayKey = @"CPBoundArray";
     return self;
 }
 
-- (void)encodeWithCoder:(id)coder
+- (void)encodeWithCoder:(CPCoder)coder
 {
     [coder encodeObject:boundArray forKey:CPBoundArrayKey];
 }

AppKit/CPRuleEditor/CPRuleEditor_Constants.j

@@ -20,6 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+
 CPRuleEditorPredicateLeftExpression     = "CPRuleEditorPredicateLeftExpression";
 CPRuleEditorPredicateRightExpression    = "CPRuleEditorPredicateRightExpression";
 CPRuleEditorPredicateComparisonModifier = "CPRuleEditorPredicateComparisonModifier";
@@ -36,5 +37,6 @@ CPRuleEditorNestingModeList     = 1;        // Allows a single list, with no nes
 CPRuleEditorNestingModeCompound = 2;        // Unlimited nesting and compound rows; this is the default
 CPRuleEditorNestingModeSimple   = 3;        // One compound row at the top with subrows beneath it, and no further nesting allowed
 
+@typedef CPRuleEditorRowType
 CPRuleEditorRowTypeSimple       = 0;
 CPRuleEditorRowTypeCompound     = 1;

AppKit/CPRuleEditor/_CPPredicateEditorTree.j

@@ -20,6 +20,8 @@
 @import <Foundation/CPObject.j>
 @import <Foundation/CPString.j>
 
+@class CPPredicateEditorRowTemplate
+
 @implementation _CPPredicateEditorTree : CPObject
 {
     CPPredicateEditorRowTemplate         template @accessors;

AppKit/CPRuleEditor/_CPRuleEditorPopUpButton.j

@@ -1,203 +0,0 @@
-/*
- * Created by cacaodev@gmail.com.
- * Copyright (c) 2011 Pear, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-@import "CPBezierPath.j"
-@import "CPPopUpButton.j"
-
-@class _CPRuleEditorViewSlice
-
-var GRADIENT_START_COLOR = "#fcfcfc",
-    GRADIENT_END_COLOR = "#dfdfdf",
-    BORDER_COLOR = "#BDBDBD";
-
-var GRADIENT_NORMAL,
-    GRADIENT_HIGHLIGHTED,
-    GRADIENT_PROPERTY;
-
-if (CPBrowserIsEngine(CPWebKitBrowserEngine))
-{
-    GRADIENT_NORMAL = "-webkit-gradient(linear, left top, left bottom, from(" + GRADIENT_START_COLOR + "), to(" + GRADIENT_END_COLOR + "))",
-    GRADIENT_HIGHLIGHTED = "-webkit-gradient(linear, left top, left bottom, from(" + GRADIENT_END_COLOR + "), to(" + GRADIENT_START_COLOR + "))";
-    GRADIENT_PROPERTY = "background";
-}
-else if (CPBrowserIsEngine(CPGeckoBrowserEngine))
-{
-    GRADIENT_NORMAL = "-moz-linear-gradient(top, " + GRADIENT_START_COLOR + ", " + GRADIENT_END_COLOR + ")",
-    GRADIENT_HIGHLIGHTED = "-moz-linear-gradient(top, " + GRADIENT_END_COLOR + ", " + GRADIENT_START_COLOR + ")";
-    GRADIENT_PROPERTY = "background";
-}
-else if (CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
-{
-    GRADIENT_NORMAL = "progid:DXImageTransform.Microsoft.gradient(startColorstr='" + GRADIENT_START_COLOR + "', endColorstr='" + GRADIENT_END_COLOR + "')";
-    GRADIENT_HIGHLIGHTED = "progid:DXImageTransform.Microsoft.gradient(startColorstr='" + GRADIENT_END_COLOR + "', endColorstr='" + GRADIENT_START_COLOR + "')";
-    GRADIENT_PROPERTY = "filter";
-}else
-{
-    GRADIENT_NORMAL = GRADIENT_START_COLOR;
-    GRADIENT_HIGHLIGHTED = GRADIENT_END_COLOR;
-    GRADIENT_PROPERTY = "background";
-}
-
-@implementation _CPRuleEditorPopUpButton : CPPopUpButton
-{
-    CPInteger radius;
-}
-
-- (void)_sharedInit
-{
-    [self setBordered:NO];
-
-#if PLATFORM(DOM)
-    var style = _DOMElement.style;
-    style.border = "1px solid " + BORDER_COLOR;
-    style[GRADIENT_PROPERTY] = GRADIENT_NORMAL;
-#endif
-}
-
-- (id)initWithFrame:(CGRect)aFrame
-{
-    if (self = [super initWithFrame:aFrame])
-        [self _sharedInit];
-
-    return self;
-}
-
-- (id)initWithCoder:(CPCoder)aCoder
-{
-    self = [super initWithCoder:aCoder];
-    [self _sharedInit];
-
-    return self;
-}
-
-- (id)hitTest:(CGPoint)point
-{
-    if (!CGRectContainsPoint([self frame], point) || ![self sliceIsEditable])
-        return nil;
-
-    return self;
-}
-
-- (BOOL)sliceIsEditable
-{
-    var superview = [self superview];
-    return ![superview isKindOfClass:[_CPRuleEditorViewSlice]] || [superview isEditable];
-}
-
-- (BOOL)trackMouse:(CPEvent)theEvent
-{
-    if (![self sliceIsEditable])
-        return NO;
-
-    return [super trackMouse:theEvent];
-}
-
-- (CGRect)contentRectForBounds:(CGRect)bounds
-{
-    var contentRect = [super contentRectForBounds:bounds];
-    contentRect.origin.x += radius;
-    contentRect.size.width -= 2 * radius;
-
-    return contentRect;
-}
-
-- (void)layoutSubviews
-{
-#if PLATFORM(DOM)
-    radius = FLOOR(CGRectGetHeight([self bounds]) / 2);
-    var style = _DOMElement.style,
-        radiusCSS = radius + "px";
-
-    style.borderRadius = radiusCSS;
-#endif
-
-    [super layoutSubviews];
-}
-
-- (void)drawRect:(CGRect)aRect
-{
-    var context = [[CPGraphicsContext currentContext] graphicsPort],
-        bounds = [self bounds],
-        arrow_width = FLOOR(CGRectGetHeight(bounds) / 3.5);
-
-    CGContextTranslateCTM(context, CGRectGetWidth(bounds) - radius - arrow_width, CGRectGetHeight(bounds) / 2);
-
-    var arrowsPath = [CPBezierPath bezierPath];
-    [arrowsPath moveToPoint:CGPointMake(0, 1)];
-    [arrowsPath lineToPoint:CGPointMake(arrow_width, 1)];
-    [arrowsPath lineToPoint:CGPointMake(arrow_width / 2, arrow_width + 1)];
-    [arrowsPath closePath];
-
-    CGContextSetFillColor(context, [CPColor colorWithWhite:101 / 255 alpha:1]);
-    [arrowsPath fill];
-
-    CGContextScaleCTM(context, 1 , -1);
-    [arrowsPath fill];
-}
-
-@end
-
-@implementation _CPRuleEditorButton : CPButton
-{
-    CPInteger radius;
-}
-
-- (void)_sharedInit
-{
-    [self setBordered:NO];
-
-#if PLATFORM(DOM)
-    var style = _DOMElement.style;
-    style.border = "1px solid " + BORDER_COLOR;
-    style[GRADIENT_PROPERTY] = GRADIENT_NORMAL;
-#endif
-}
-
-- (id)initWithFrame:(CGRect)aFrame
-{
-    if (self = [super initWithFrame:aFrame])
-        [self _sharedInit];
-
-    return self;
-}
-
-- (id)initWithCoder:(CPCoder)aCoder
-{
-    self = [super initWithCoder:aCoder];
-    [self _sharedInit];
-
-    return self;
-}
-
-- (void)layoutSubviews
-{
-#if PLATFORM(DOM)
-    radius = FLOOR(CGRectGetHeight([self bounds]) / 2);
-
-    var style = _DOMElement.style,
-        radiusCSS = radius + "px";
-
-    style.borderRadius = radiusCSS;
-    style[GRADIENT_PROPERTY] = ([self isHighlighted]) ? GRADIENT_HIGHLIGHTED : GRADIENT_NORMAL;
-#endif
-
-    [super layoutSubviews];
-}
-
-@end

AppKit/CPRuleEditor/_CPRuleEditorViewSlice.j

@@ -19,6 +19,8 @@
 
 @import "CPView.j"
 
+@class CPRuleEditor
+
 @implementation _CPRuleEditorViewSlice : CPView
 {
     CPRuleEditor _ruleEditor;
@@ -61,9 +63,9 @@
 - (void)drawRect:(CGRect)rect
 {
     var context = [[CPGraphicsContext currentContext] graphicsPort],
-        bounds = [self bounds],
-        maxX = CGRectGetWidth(bounds),
-        maxY = CGRectGetHeight(bounds);
+        bounds  = [self bounds],
+        maxX    = CGRectGetWidth(bounds),
+        maxY    = CGRectGetHeight(bounds);
 
     // Draw background
     if ([self _isSelected])

AppKit/CPRuleEditor/_CPRuleEditorViewSliceRow.j

@@ -19,24 +19,27 @@
 
 @import "CPRuleEditor_Constants.j"
 @import "_CPRuleEditorViewSlice.j"
-@import "_CPRuleEditorPopUpButton.j"
+
+@import "CPButton.j"
+@import "CPDatePicker.j"
+@import "CPPopUpButton.j"
 
 @global CPApp
-
-var CONTROL_HEIGHT = 16.,
-    BUTTON_HEIGHT = 16.;
+@global CPMiniControlSize
+@global CPSmallControlSize
 
 @implementation _CPRuleEditorViewSliceRow : _CPRuleEditorViewSlice
 {
-    CPMutableArray  _ruleOptionViews;
-    CPMutableArray  _ruleOptionFrames;
-    CPMutableArray  _correspondingRuleItems;
-    CPMutableArray  _ruleOptionInitialViewFrames;
-    CPButton        _addButton;
-    CPButton        _subtractButton;
+    CPButton                _addButton;
+    CPButton                _subtractButton;
+    CPMutableArray          _correspondingRuleItems;
+    CPMutableArray          _ruleOptionFrames;
+    CPMutableArray          _ruleOptionInitialViewFrames;
+    CPMutableArray          _ruleOptionViews;
 
-    CPRuleEditorRowType _rowType @accessors;
-    CPRuleEditorRowType _plusButtonRowType;
+
+    CPRuleEditorRowType     _rowType @accessors;
+    CPRuleEditorRowType     _plusButtonRowType;
 }
 
 - (id)initWithFrame:(CGRect)frame ruleEditorView:(id)editor
@@ -49,34 +52,33 @@ var CONTROL_HEIGHT = 16.,
 
 - (void)_initShared
 {
-    _correspondingRuleItems = [[CPMutableArray alloc] init];
-    _ruleOptionFrames = [[CPMutableArray alloc] init];
-    _ruleOptionInitialViewFrames = [[CPMutableArray alloc] init];
-    _ruleOptionViews = [[CPMutableArray alloc] init];
-     _editable = [_ruleEditor isEditable];
+    _correspondingRuleItems         = [[CPMutableArray alloc] init];
+    _ruleOptionFrames               = [[CPMutableArray alloc] init];
+    _ruleOptionInitialViewFrames    = [[CPMutableArray alloc] init];
+    _ruleOptionViews                = [[CPMutableArray alloc] init];
+    _editable                       = [_ruleEditor isEditable];
+
+    _addButton                      = [self _createAddRowButton];
+    _subtractButton                 = [self _createDeleteRowButton];
 
-    _addButton = [self _createAddRowButton];
-    _subtractButton = [self _createDeleteRowButton];
-    [_addButton setToolTip:[_ruleEditor _toolTipForAddSimpleRowButton]];
-    [_subtractButton setToolTip:[_ruleEditor _toolTipForDeleteRowButton]];
-    [_addButton setHidden:!_editable];
-    [_subtractButton setHidden:!_editable];
     [self addSubview:_addButton];
     [self addSubview:_subtractButton];
 
     [self setAutoresizingMask:CPViewWidthSizable];
-
-    var center = [CPNotificationCenter defaultCenter];
-    [center addObserver:self selector:@selector(_textDidChange:) name:CPControlTextDidChangeNotification object:nil];
 }
 
 - (CPButton)_createRowButton
 {
-    var button = [[_CPRuleEditorButton alloc] initWithFrame:CGRectMakeZero()];
-    [button setFont:[CPFont boldFontWithName:@"Apple Symbol" size:12.0]];
-    [button setTextColor:[CPColor colorWithWhite:150 / 255 alpha:1]];
+    var button = [[CPButton alloc] initWithFrame:CGRectMakeZero()];
+
+    [button setFont:[_ruleEditor font]];
+    [button setTextColor:[_ruleEditor _fontColor]];
+
     [button setAlignment:CPCenterTextAlignment];
     [button setAutoresizingMask:CPViewMinXMargin];
+    [button setButtonType:CPMomentaryChangeButton];
+    [button setBordered:NO];
+    [button setHidden:!_editable];
     [button setImagePosition:CPImageOnly];
 
     return button;
@@ -86,7 +88,10 @@ var CONTROL_HEIGHT = 16.,
 {
     var button = [self _createRowButton];
 
-    [button setImage:[_ruleEditor _addImage]];
+    [button setToolTip:[_ruleEditor _toolTipForAddSimpleRowButton]];
+    [button setValue:[_ruleEditor _imageAdd] forThemeAttribute:@"image" inState:CPThemeStateNormal];
+    [button setValue:[_ruleEditor _imageAddHighlighted] forThemeAttribute:@"image" inState:CPThemeStateHighlighted];
+
     [button setAction:@selector(_addOption:)];
     [button setTarget:self];
 
@@ -97,7 +102,10 @@ var CONTROL_HEIGHT = 16.,
 {
     var button = [self _createRowButton];
 
-    [button setImage:[_ruleEditor _removeImage]];
+    [button setToolTip:[_ruleEditor _toolTipForDeleteRowButton]];
+    [button setValue:[_ruleEditor _imageRemove] forThemeAttribute:@"image" inState:CPThemeStateNormal];
+    [button setValue:[_ruleEditor _imageRemoveHighlighted] forThemeAttribute:@"image" inState:CPThemeStateHighlighted];
+
     [button setAction:@selector(_deleteOption:)];
     [button setTarget:self];
 
@@ -107,20 +115,17 @@ var CONTROL_HEIGHT = 16.,
 - (CPMenuItem)_createMenuItemWithTitle:(CPString )title
 {
     title = [[_ruleEditor standardLocalizer] localizedStringForString:title];
-    var mItem = [[CPMenuItem alloc] initWithTitle:title action:nil keyEquivalent:@""];
-    return mItem;
+    return [[CPMenuItem alloc] initWithTitle:title action:nil keyEquivalent:@""];
 }
 
 - (CPPopUpButton)_createPopUpButtonWithItems:(CPArray)itemsArray selectedItemIndex:(int)index
 {
-    var title = [[itemsArray objectAtIndex:index] title],
-        font = [_ruleEditor font],
-        width = [title sizeWithFont:font].width + 20,
-        rect = CGRectMake(0, 0, (width - width % 40) + 80, CONTROL_HEIGHT),
+    var title   = [[itemsArray objectAtIndex:index] title],
+        font    = [_ruleEditor font],
+        width   = [title sizeWithFont:font].width + 35, // 35 for right arrows + margins
+        rect    = CGRectMake(0, 0, width, [_ruleEditor rowHeight]),
+        popup   = [[CPPopUpButton alloc] initWithFrame:rect];
 
-        popup = [[_CPRuleEditorPopUpButton alloc] initWithFrame:rect];
-
-    [popup setTextColor:[CPColor colorWithWhite:101 / 255 alpha:1]];
     [popup setValue:font forThemeAttribute:@"font"];
 
     var count = [itemsArray count];
@@ -137,17 +142,17 @@ var CONTROL_HEIGHT = 16.,
     return [CPMenuItem separatorItem];
 }
 
-- (_CPRuleEditorTextField)_createStaticTextFieldWithStringValue:(CPString)text
+- (CPTextField)_createStaticTextFieldWithStringValue:(CPString)text
 {
-    var textField = [[_CPRuleEditorTextField alloc] initWithFrame:CGRectMakeZero()],
-        ruleEditorFont = [_ruleEditor font],
-        font = [CPFont fontWithName:[ruleEditorFont familyName] size:[ruleEditorFont size] + 2],
-        localizedText = [[_ruleEditor standardLocalizer] localizedStringForString:text],
-        size = [localizedText sizeWithFont:font];
-
-    [textField setFrameSize:CGSizeMake(size.width + 4, CONTROL_HEIGHT + 2)];
+    var textField       = [[CPTextField alloc] initWithFrame:CGRectMakeZero()],
+        ruleEditorFont  = [_ruleEditor font],
+        font            = [CPFont fontWithName:[ruleEditorFont familyName] size:[ruleEditorFont size] + 2],
+        localizedText   = [[_ruleEditor standardLocalizer] localizedStringForString:text],
+        size            = [localizedText sizeWithFont:font];
 
+    [textField setFrameSize:CGSizeMake(size.width + 4, [_ruleEditor rowHeight])];
     [textField setValue:font forThemeAttribute:@"font"];
+    [textField setValue:[_ruleEditor _verticalAlignment] forThemeAttribute:@"vertical-alignment"];
     [textField setStringValue:localizedText];
 
     return textField;
@@ -159,6 +164,7 @@ var CONTROL_HEIGHT = 16.,
         [self setNeedsDisplay:YES];
 
     var type = _plusButtonRowType;
+
     if ([_ruleEditor nestingMode] == CPRuleEditorNestingModeCompound && ([[CPApp currentEvent] modifierFlags] & CPAlternateKeyMask))
         type = CPRuleEditorRowTypeCompound;
 
@@ -170,12 +176,12 @@ var CONTROL_HEIGHT = 16.,
     [_ruleEditor _deleteSlice:self];
 }
 
-- (void)_ruleOptionPopupChangedAction:(CPMenuItem )sender
+- (void)_ruleOptionPopupChangedAction:(CPMenuItem)sender
 {
-    var layoutdict = [sender representedObject],
-        newItem = [layoutdict objectForKey:@"item"],
+    var layoutdict      = [sender representedObject],
+        newItem         = [layoutdict objectForKey:@"item"],
         indexInCriteria = [layoutdict objectForKey:@"indexInCriteria"],
-        oldItem = [_correspondingRuleItems objectAtIndex:indexInCriteria];
+        oldItem         = [_correspondingRuleItems objectAtIndex:indexInCriteria];
 
     if (![newItem isEqual:oldItem])
     {
@@ -307,8 +313,16 @@ var CONTROL_HEIGHT = 16.,
 
         if (ruleView != nil)
         {
+            [ruleView setControlSize:CPSmallControlSize];
+
+            var minSize = [ruleView currentValueForThemeAttribute:@"min-size"],
+                frame = [ruleView frame];
+
+            // Force controls to their minimum size
+            frame.size.height = minSize.height;
+            [ruleView setFrame:frame];
+
             [_ruleOptionViews addObject:ruleView];
-            var frame = [ruleView frame];
             [_ruleOptionInitialViewFrames addObject:frame];
             [_ruleOptionFrames addObject:frame];
 
@@ -331,8 +345,6 @@ var CONTROL_HEIGHT = 16.,
         var aView = [_ruleOptionViews objectAtIndex:firstResponderIndex];
         [[self window] makeFirstResponder:aView]; // This is not working. bug in CPPopUpButton firstResponder ?
     }
-
-    //[self setNeedsDisplay:YES];
 }
 
 - (void)_updateEnabledStateForSubviews
@@ -350,14 +362,15 @@ var CONTROL_HEIGHT = 16.,
     var optionViewOriginX,
         leftHorizontalPadding,
         leftButtonMinX,
-        rowHeight = [_ruleEditor rowHeight],
-        count = [_ruleOptionViews count],
-        sliceFrame = [self frame],
+        rowHeight   = [_ruleEditor rowHeight],
+        count       = [_ruleOptionViews count],
+        sliceFrame  = [self frame],
+        image       = [_ruleEditor _imageAdd],
 
-        buttonFrame = CGRectMake(CGRectGetWidth(sliceFrame) - BUTTON_HEIGHT - [self _rowButtonsRightHorizontalPadding], ([_ruleEditor rowHeight] - BUTTON_HEIGHT) / 2 - 2, BUTTON_HEIGHT, BUTTON_HEIGHT);
+        buttonFrame = CGRectMake(CGRectGetWidth(sliceFrame) - [image size].width - [self _rowButtonsRightHorizontalPadding], ([_ruleEditor rowHeight] - [image size].height) / 2 - 1, [image size].width, [image size].height);
 
     [_addButton setFrame:buttonFrame];
-    buttonFrame.origin.x -= BUTTON_HEIGHT + [self _rowButtonsInterviewHorizontalPadding];
+    buttonFrame.origin.x -= [image size].width + [self _rowButtonsInterviewHorizontalPadding];
     [_subtractButton setFrame:buttonFrame];
 
     if (widthChanged)
@@ -372,7 +385,8 @@ var CONTROL_HEIGHT = 16.,
         var ruleOptionView = _ruleOptionViews[i],
             optionFrame = _ruleOptionFrames[i];
 
-        optionFrame.origin.y = (rowHeight - CGRectGetHeight(optionFrame)) / 2 - 2;
+        // Use a pixel correction to align controls
+        optionFrame.origin.y = (rowHeight - CGRectGetHeight(optionFrame)) / 2;
 
         if (widthChanged)
         {
@@ -481,6 +495,26 @@ var CONTROL_HEIGHT = 16.,
     [self layoutSubviews];
 }
 
+- (void)_addObservers
+{
+    if (_isObserving)
+        return;
+
+    [super _addObservers];
+
+    [[CPNotificationCenter defaultCenter] addObserver:self selector:@selector(_textDidChange:) name:CPControlTextDidChangeNotification object:nil];
+}
+
+- (void)_removeObservers
+{
+    if (!_isObserving)
+        return;
+
+    [super _removeObservers];
+
+    [[CPNotificationCenter defaultCenter] removeObserver:self name:CPControlTextDidChangeNotification object:nil];
+}
+
 - (void)drawRect:(CGRect)rect
 {
     [super drawRect:rect];
@@ -488,8 +522,9 @@ var CONTROL_HEIGHT = 16.,
 
 - (BOOL)_isRulePopup:(CPView)view
 {
-    if ([view isKindOfClass:[_CPRuleEditorPopUpButton class]])
+    if ([view isKindOfClass:[CPPopUpButton class]])
         return YES;
+
     return NO;
 }
 
@@ -506,28 +541,3 @@ var CONTROL_HEIGHT = 16.,
 }
 
 @end
-
-@implementation _CPRuleEditorTextField : CPTextField
-{
-}
-
-- (id)initWithFrame:(CGRect)frame
-{
-    self = [super initWithFrame:frame];
-    if (self)
-    {
-        [self setDrawsBackground:NO];
-    }
-
-    return self;
-}
-
-- (id)hitTest:(CGPoint)point
-{
-    if (!CGRectContainsPoint([self frame], point))
-        return nil;
-
-    return [self superview];
-}
-
-@end

AppKit/CPScrollView.j

@@ -34,34 +34,44 @@
 
 
 /*! @ignore */
-var _isSystemUsingOverlayScrollers = function()
+var _isBrowserUsingOverlayScrollers = function()
 {
 #if PLATFORM(DOM)
-    var inner = document.createElement('p'),
-        outer = document.createElement('div');
+    /*
+        Even if the system supports overlay (Lion) scrollers,
+        the browser (e.g. FireFox *cough*) may not.
 
-    inner.style.width = "100%";
-    inner.style.height = "200px";
+        To determine if the browser is using overlay scrollbars,
+        we put a <p> element inside a shorter <div> and set its
+        overflow to scroll. If the browser is using visible scrollers,
+        the outer div's clientWidth will less than the offsetWidth, because
+        clientWidth does not include scrollbars, whereas offsetWidth does.
+        So if clientWidth === offsetWidth, the scrollers must be overlay.
+        Even IE gets this right.
+    */
+    var outer = document.createElement('div'),
+        inner = document.createElement('p');
 
+    // position it absolute so it doesn't affect existing DOM elements
     outer.style.position = "absolute";
     outer.style.top = "0px";
     outer.style.left = "0px";
     outer.style.visibility = "hidden";
     outer.style.width = "200px";
     outer.style.height = "150px";
-    outer.style.overflow = "hidden";
-    outer.appendChild (inner);
+    outer.style.overflow = "scroll";
 
-    document.body.appendChild (outer);
-    var w1 = inner.offsetWidth;
-    outer.style.overflow = 'scroll';
-    var w2 = inner.offsetWidth;
-    if (w1 == w2)
-        w2 = outer.clientWidth;
+    inner.style.width = "100%";
+    inner.style.height = "200px";
+    outer.appendChild(inner);
 
-    document.body.removeChild (outer);
+    document.body.appendChild(outer);
 
-    return (w1 - w2 == 0);
+    var usingOverlayScrollers = outer.clientWidth === outer.offsetWidth;
+
+    document.body.removeChild(outer);
+
+    return usingOverlayScrollers;
 #else
     return NO;
 #endif
@@ -130,8 +140,8 @@ var CPScrollerStyleGlobal                       = CPScrollerStyleOverlay,
 
     var globalValue = [[CPBundle mainBundle] objectForInfoDictionaryKey:@"CPScrollersGlobalStyle"];
 
-    if (globalValue == nil || globalValue == -1)
-        CPScrollerStyleGlobal = _isSystemUsingOverlayScrollers() ? CPScrollerStyleOverlay : CPScrollerStyleLegacy
+    if (globalValue === nil || globalValue === -1)
+        CPScrollerStyleGlobal = _isBrowserUsingOverlayScrollers() ? CPScrollerStyleOverlay : CPScrollerStyleLegacy
     else
         CPScrollerStyleGlobal = globalValue;
 }
@@ -254,11 +264,6 @@ var CPScrollerStyleGlobal                       = CPScrollerStyleOverlay,
         _delegate = nil;
         _scrollTimer = nil;
         _implementedDelegateMethods = 0;
-
-        [[CPNotificationCenter defaultCenter] addObserver:self
-                                 selector:@selector(_didReceiveDefaultStyleChange:)
-                                     name:CPScrollerStyleGlobalChangeNotification
-                                   object:nil];
     }
 
     return self;
@@ -1252,10 +1257,45 @@ Notifies the delegate when the scroll view has finished scrolling.
     [self reflectScrolledClipView:_contentView];
 }
 
+- (CGRect)documentVisibleRect
+{
+    return [_contentView documentVisibleRect];
+}
 
 #pragma mark -
 #pragma mark Overrides
 
+
+- (void)_removeObservers
+{
+    if (!_isObserving)
+        return;
+
+    [[CPNotificationCenter defaultCenter] removeObserver:self
+                                                    name:CPScrollerStyleGlobalChangeNotification
+                                                  object:nil];
+
+    [super _removeObservers];
+}
+
+- (void)_addObservers
+{
+    if (_isObserving)
+        return;
+
+    //Make sure to have the last global style for the scroller
+    [self _didReceiveDefaultStyleChange:nil];
+
+    [[CPNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(_didReceiveDefaultStyleChange:)
+                                                 name:CPScrollerStyleGlobalChangeNotification
+                                               object:nil];
+
+    [super _addObservers];
+}
+
+
+
 - (void)drawRect:(CGRect)aRect
 {
     [super drawRect:aRect];
@@ -1389,7 +1429,16 @@ Notifies the delegate when the scroll view has finished scrolling.
     if (![_horizontalScroller isHidden] || ![_verticalScroller isHidden])
         _timerScrollersHide = [CPTimer scheduledTimerWithTimeInterval:CPScrollViewFadeOutTime target:self selector:@selector(_hideScrollers:) userInfo:nil repeats:NO];
 
-    [self _respondToScrollWheelEventWithDeltaX:[anEvent deltaX] deltaY:[anEvent deltaY]];
+    var deltaX = [anEvent scrollingDeltaX],
+        deltaY = [anEvent scrollingDeltaY];
+
+    if (![anEvent hasPreciseScrollingDeltas])
+    {
+        deltaX *= (_horizontalLineScroll || 1.0);
+        deltaY *= (_verticalLineScroll || 1.0);
+    }
+
+    [self _respondToScrollWheelEventWithDeltaX:deltaX deltaY:deltaY];
 }
 
 - (void)scrollPageUp:(id)sender

AppKit/CPScroller.j

@@ -33,6 +33,7 @@
 @global CPApp
 
 // CPScroller Constants
+@typedef CPScrollerPart
 CPScrollerNoPart            = 0;
 CPScrollerDecrementPage     = 1;
 CPScrollerKnob              = 2;
@@ -44,6 +45,7 @@ CPScrollerKnobSlot          = 6;
 CPScrollerIncrementArrow    = 0;
 CPScrollerDecrementArrow    = 1;
 
+@typedef CPUsableScrollerParts
 CPNoScrollerParts           = 0;
 CPOnlyScrollerArrows        = 1;
 CPAllScrollerParts          = 2;
@@ -78,7 +80,6 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
 
 @implementation CPScroller : CPControl
 {
-    CPControlSize           _controlSize;
     CPUsableScrollerParts   _usableParts;
     CPArray                 _partRects;
 
@@ -108,7 +109,7 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
     return "scroller";
 }
 
-+ (id)themeAttributes
++ (CPDictionary)themeAttributes
 {
     return @{
             @"scroller-width": 7.0,
@@ -172,7 +173,6 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
 {
     if (self = [super initWithFrame:aFrame])
     {
-        _controlSize = CPRegularControlSize;
         _partRects = [];
 
         [self setFloatValue:0.0];
@@ -182,6 +182,7 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
         _allowFadingOut = YES;
         _isMouseOver = NO;
         _style = CPScrollerStyleOverlay;
+
         var paramAnimFadeOut = @{
                 CPViewAnimationTargetKey: self,
                 CPViewAnimationEffectKey: CPViewAnimationFadeOutEffect,
@@ -242,29 +243,6 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
     [super setObjectValue:MIN(1.0, MAX(0.0, +aValue))];
 }
 
-/*!
-    Returns the scroller's control size
-*/
-- (CPControlSize)controlSize
-{
-    return _controlSize;
-}
-
-/*!
-    Sets the scroller's size.
-    @param aControlSize the scroller's size
-*/
-- (void)setControlSize:(CPControlSize)aControlSize
-{
-    if (_controlSize == aControlSize)
-        return;
-
-    _controlSize = aControlSize;
-
-    [self setNeedsLayout];
-    [self setNeedsDisplay:YES];
-}
-
 /*!
     Return's the knob's proportion
 */
@@ -732,7 +710,7 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
     var themeState = _themeState;
 
     if (NAMES_FOR_PARTS[_hitPart] + "-color" !== anAttributeName)
-        themeState &= ~CPThemeStateHighlighted;
+        themeState = themeState.without(CPThemeStateHighlighted);
 
     return [self valueForThemeAttribute:anAttributeName inState:themeState];
 }
@@ -801,8 +779,7 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
 
 @end
 
-var CPScrollerControlSizeKey    = @"CPScrollerControlSize",
-    CPScrollerIsVerticalKey     = @"CPScrollerIsVerticalKey",
+var CPScrollerIsVerticalKey     = @"CPScrollerIsVerticalKey",
     CPScrollerKnobProportionKey = @"CPScrollerKnobProportion",
     CPScrollerStyleKey          = @"CPScrollerStyleKey";
 
@@ -812,10 +789,6 @@ var CPScrollerControlSizeKey    = @"CPScrollerControlSize",
 {
     if (self = [super initWithCoder:aCoder])
     {
-        _controlSize = CPRegularControlSize;
-        if ([aCoder containsValueForKey:CPScrollerControlSizeKey])
-            _controlSize = [aCoder decodeIntForKey:CPScrollerControlSizeKey];
-
         _knobProportion = 1.0;
 
         if ([aCoder containsValueForKey:CPScrollerKnobProportionKey])
@@ -850,7 +823,6 @@ var CPScrollerControlSizeKey    = @"CPScrollerControlSize",
 {
     [super encodeWithCoder:aCoder];
 
-    [aCoder encodeInt:_controlSize forKey:CPScrollerControlSizeKey];
     [aCoder encodeInt:_isVertical forKey:CPScrollerIsVerticalKey];
     [aCoder encodeFloat:_knobProportion forKey:CPScrollerKnobProportionKey];
     [aCoder encodeInt:_style forKey:CPScrollerStyleKey];

AppKit/CPSearchField.j

@@ -119,16 +119,28 @@ var RECENT_SEARCH_PREFIX = @"   ";
     _canResignFirstResponder = YES;
 }
 
-- (void)viewWillMoveToSuperview:(CPView)aView
+
+#pragma mark -
+#pragma mark Override observers
+
+- (void)_removeObservers
 {
-    [super viewWillMoveToSuperview:aView];
+    if (!_isObserving)
+        return;
+
+    [super _removeObservers];
 
-    // First we remove any observer that may have been in place to avoid memory leakage.
     [[CPNotificationCenter defaultCenter] removeObserver:self name:CPControlTextDidChangeNotification object:self];
+}
 
-    // Register the observe here if we need to.
-    if (aView)
-        [[CPNotificationCenter defaultCenter] addObserver:self selector:@selector(_searchFieldTextDidChange:) name:CPControlTextDidChangeNotification object:self];
+- (void)_addObservers
+{
+    if (_isObserving)
+        return;
+
+    [super _addObservers];
+
+    [[CPNotificationCenter defaultCenter] addObserver:self selector:@selector(_searchFieldTextDidChange:) name:CPControlTextDidChangeNotification object:self];
 }
 
 // Managing Buttons
@@ -458,7 +470,7 @@ var RECENT_SEARCH_PREFIX = @"   ";
     [self sendAction:[self action] to:[self target]];
 }
 
-- (void)sendAction:(SEL)anAction to:(id)anObject
+- (BOOL)sendAction:(SEL)anAction to:(id)anObject
 {
     [super sendAction:anAction to:anObject];
 

AppKit/CPSegmentedControl.j

@@ -25,9 +25,11 @@
 @import "CPControl.j"
 @import "CPWindow_Constants.j"
 @import "_CPImageAndTextView.j"
+@import "CPMenu.j"
 
 @global CPApp
 
+@typedef CPSegmentSwitchTracking
 CPSegmentSwitchTrackingSelectOne = 0;
 CPSegmentSwitchTrackingSelectAny = 1;
 CPSegmentSwitchTrackingMomentary = 2;
@@ -56,7 +58,7 @@ CPSegmentSwitchTrackingMomentary = 2;
     return "segmented-control";
 }
 
-+ (id)themeAttributes
++ (CPDictionary)themeAttributes
 {
     return @{
             @"alignment": CPCenterTextAlignment,
@@ -70,23 +72,9 @@ CPSegmentSwitchTrackingMomentary = 2;
             @"center-segment-bezel-color": [CPNull null],
             @"divider-bezel-color": [CPNull null],
             @"divider-thickness": 1.0,
-            @"default-height": 24.0,
         };
 }
 
-+ (Class)_binderClassForBinding:(CPString)aBinding
-{
-    if ([self _isSelectionBinding:aBinding])
-        return [_CPSegmentedControlBinder class];
-
-    return [super _binderClassForBinding:aBinding];
-}
-
-+ (BOOL)_isSelectionBinding:(CPString)aBinding
-{
-    return (aBinding === CPSelectedIndexBinding || aBinding === CPSelectedLabelBinding || aBinding === CPSelectedTagBinding);
-}
-
 - (id)initWithFrame:(CGRect)aRect
 {
     _segments = [];
@@ -104,17 +92,14 @@ CPSegmentSwitchTrackingMomentary = 2;
     return self;
 }
 
-- (void)bind:(CPString)aBinding toObject:(id)anObject withKeyPath:(CPString)aKeyPath options:(CPDictionary)options
+/*!
+    Sets the control's size.
+    @param aControlSize the control's size
+*/
+- (void)setControlSize:(CPControlSize)aControlSize
 {
-    if ([[self class] _isSelectionBinding:aBinding] && _trackingMode !== CPSegmentSwitchTrackingSelectOne)
-        CPLog.warn("Binding " + aBinding + " needs CPSegmentSwitchTrackingSelectOne tracking mode");
-    else
-        [super bind:aBinding toObject:anObject withKeyPath:aKeyPath options:options];
-}
-
-- (void)_reverseSetBinding
-{
-    [_CPSegmentedControlBinder reverseSetValueForObject:self];
+    [super setControlSize:aControlSize];
+    [self _sizeToControlSize];
 }
 
 /*!
@@ -285,7 +270,6 @@ CPSegmentSwitchTrackingMomentary = 2;
 - (void)setWidth:(float)aWidth forSegment:(unsigned)aSegment
 {
     [_segments[aSegment] setWidth:aWidth];
-
     [self tileWithChangedSegment:aSegment];
 }
 
@@ -432,9 +416,9 @@ CPSegmentSwitchTrackingMomentary = 2;
     [_segments[aSegment] setEnabled:shouldBeEnabled];
 
     if (shouldBeEnabled)
-        _themeStates[aSegment] &= ~CPThemeStateDisabled;
+        _themeStates[aSegment] = _themeStates[aSegment].without(CPThemeStateDisabled);
     else
-        _themeStates[aSegment] |= CPThemeStateDisabled;
+        _themeStates[aSegment] = _themeStates[aSegment].and(CPThemeStateDisabled);
 
     [self setNeedsLayout];
     [self setNeedsDisplay:YES];
@@ -477,10 +461,13 @@ CPSegmentSwitchTrackingMomentary = 2;
 */
 - (void)drawSegmentBezel:(int)aSegment highlight:(BOOL)shouldHighlight
 {
-    if (shouldHighlight)
-        _themeStates[aSegment] |= CPThemeStateHighlighted;
-    else
-        _themeStates[aSegment] &= ~CPThemeStateHighlighted;
+    if(aSegment < _themeStates.length)
+    {
+        if (shouldHighlight)
+            _themeStates[aSegment] = _themeStates[aSegment].and(CPThemeStateHighlighted);
+        else
+            _themeStates[aSegment] = _themeStates[aSegment].without(CPThemeStateHighlighted);
+    }
 
     [self setNeedsLayout];
     [self setNeedsDisplay:YES];
@@ -510,7 +497,7 @@ CPSegmentSwitchTrackingMomentary = 2;
 
 - (CGRect)rectForEphemeralSubviewNamed:(CPString)aName
 {
-    var height = [self currentValueForThemeAttribute:@"default-height"],
+    var height = [self currentValueForThemeAttribute:@"min-size"].height,
         contentInset = [self currentValueForThemeAttribute:@"content-inset"],
         bezelInset = [self currentValueForThemeAttribute:@"bezel-inset"],
         bounds = [self bounds];
@@ -574,9 +561,17 @@ CPSegmentSwitchTrackingMomentary = 2;
     if (_segments.length <= 0)
         return;
 
-    var themeState = _themeStates[0];
+    var themeState = _themeStates[0],
+        isDisabled = [self hasThemeState:CPThemeStateDisabled],
+        isControlSizeSmall = [self hasThemeState:CPThemeStateControlSizeSmall],
+        isControlSizeMini = [self hasThemeState:CPThemeStateControlSizeMini];
 
-    themeState |= _themeState & CPThemeStateDisabled;
+    themeState = isDisabled ? themeState.and(CPThemeStateDisabled) : themeState;
+
+    if (isControlSizeSmall)
+        themeState = themeState.and(CPThemeStateControlSizeSmall);
+    else if (isControlSizeMini)
+        themeState = themeState.and(CPThemeStateControlSizeMini);
 
     var leftCapColor = [self valueForThemeAttribute:@"left-segment-bezel-color"
                                             inState:themeState],
@@ -589,7 +584,12 @@ CPSegmentSwitchTrackingMomentary = 2;
 
     var themeState = _themeStates[_themeStates.length - 1];
 
-    themeState |= _themeState & CPThemeStateDisabled;
+    themeState = isDisabled ? themeState.and(CPThemeStateDisabled) : themeState;
+
+    if (isControlSizeSmall)
+        themeState = themeState.and(CPThemeStateControlSizeSmall);
+    else if (isControlSizeMini)
+        themeState = themeState.and(CPThemeStateControlSizeMini);
 
     var rightCapColor = [self valueForThemeAttribute:@"right-segment-bezel-color"
                                              inState:themeState],
@@ -604,7 +604,12 @@ CPSegmentSwitchTrackingMomentary = 2;
     {
         var themeState = _themeStates[i];
 
-        themeState |= _themeState & CPThemeStateDisabled;
+        themeState = isDisabled ? themeState.and(CPThemeStateDisabled) : themeState;
+
+        if (isControlSizeSmall)
+            themeState = themeState.and(CPThemeStateControlSizeSmall);
+        else if (isControlSizeMini)
+            themeState = themeState.and(CPThemeStateControlSizeMini);
 
         var bezelColor = [self valueForThemeAttribute:@"center-segment-bezel-color"
                                               inState:themeState],
@@ -615,7 +620,6 @@ CPSegmentSwitchTrackingMomentary = 2;
 
         [bezelView setBackgroundColor:bezelColor];
 
-
         // layout image/title views
         var segment = _segments[i],
             contentView = [self layoutEphemeralSubviewNamed:@"segment-content-" + i
@@ -642,11 +646,16 @@ CPSegmentSwitchTrackingMomentary = 2;
         if (i == count - 1)
             continue;
 
-        var borderState = _themeStates[i] | _themeStates[i + 1];
+        var borderState = _themeStates[i].and(_themeStates[i + 1]);
 
-        borderState = (borderState & CPThemeStateSelected & ~CPThemeStateHighlighted) ? CPThemeStateSelected : CPThemeStateNormal;
+        borderState = (borderState.hasThemeState(CPThemeStateSelected) && !borderState.hasThemeState(CPThemeStateHighlighted)) ? CPThemeStateSelected : CPThemeStateNormal;
 
-        borderState |= _themeState & CPThemeStateDisabled;
+        borderState = isDisabled ? borderState.and(CPThemeStateDisabled) : borderState;
+
+        if (isControlSizeSmall)
+            borderState = borderState.and(CPThemeStateControlSizeSmall);
+        else if (isControlSizeMini)
+            borderState = borderState.and(CPThemeStateControlSizeMini);
 
         var borderColor = [self valueForThemeAttribute:@"divider-bezel-color"
                                                inState:borderState],
@@ -676,7 +685,7 @@ CPSegmentSwitchTrackingMomentary = 2;
 
     var segment = _segments[aSegment],
         segmentWidth = [segment width],
-        themeState = _themeStates[aSegment] | (_themeState & CPThemeStateDisabled),
+        themeState = _themeState.hasThemeState(CPThemeStateDisabled) ? _themeStates[aSegment].and(CPThemeStateDisabled) : _themeStates[aSegment],
         contentInset = [self valueForThemeAttribute:@"content-inset" inState:themeState],
         font = [self font];
 
@@ -704,7 +713,6 @@ CPSegmentSwitchTrackingMomentary = 2;
 
     // Update control size
     var frame = [self frame];
-
     [self setFrameSize:CGSizeMake(CGRectGetWidth(frame) + delta, CGRectGetHeight(frame))];
 
     // Update segment width
@@ -740,7 +748,7 @@ CPSegmentSwitchTrackingMomentary = 2;
 
 - (CGRect)bezelFrameForSegment:(unsigned)aSegment
 {
-    var height = [self currentValueForThemeAttribute:@"default-height"],
+    var height = [self currentValueForThemeAttribute:@"min-size"].height,
         bezelInset = [self currentValueForThemeAttribute:@"bezel-inset"],
         width = [self widthForSegment:aSegment],
         left = [self _leftOffsetForSegment:aSegment];
@@ -750,7 +758,7 @@ CPSegmentSwitchTrackingMomentary = 2;
 
 - (CGRect)contentFrameForSegment:(unsigned)aSegment
 {
-    var height = [self currentValueForThemeAttribute:@"default-height"],
+    var height = [self currentValueForThemeAttribute:@"min-size"].height,
         contentInset = [self currentValueForThemeAttribute:@"content-inset"],
         width = [self widthForSegment:aSegment],
         left = [self _leftOffsetForSegment:aSegment];
@@ -912,20 +920,40 @@ var CPSegmentedControlSegmentsKey       = "CPSegmentedControlSegmentsKey",
         else
             _trackingMode = CPSegmentSwitchTrackingSelectOne;
 
-        // HACK
+        // Here we update the themeStates array for each segments to know if there are selected or not
+        for (var i = 0; i < _segments.length; i++)
+            _themeStates[i] = [_segments[i] selected] ? CPThemeStateSelected : CPThemeStateNormal;
+
+        // We do this in a second loop because it relies on all the themeStates being set first
+        for (var i = 0; i < _segments.length; i++)
+            [self tileWithChangedSegment:i];
+
+        var thickness = [self currentValueForThemeAttribute:@"divider-thickness"],
+            dividerExtraSpace = ([_segments count] - 1) * thickness,
+            difference = MAX(originalWidth - [self frame].size.width - dividerExtraSpace, 0.0),
+            remainingWidth = FLOOR(difference / _segments.length),
+            widthOfAllSegments = 0;
 
         for (var i = 0; i < _segments.length; i++)
         {
-            _themeStates[i] = [_segments[i] selected] ? CPThemeStateSelected : CPThemeStateNormal;
-            [self tileWithChangedSegment:i];
+            [self setWidth:[_segments[i] width] + remainingWidth forSegment:i];
+            widthOfAllSegments += [_segments[i] width];
         }
 
-        var difference = MAX(originalWidth - [self frame].size.width, 0.0),
-            remainingWidth = FLOOR(difference / _segments.length);
+        // Here we handle the leftovers pixel, and we will add one pixel to each segment cell till we have the same size as the originalSize.
+        // This is needed to have a perfect/same alignment between our application and xCode.
+        var leftOversPixel = originalWidth - (widthOfAllSegments + dividerExtraSpace);
 
-        for (var i = 0; i < _segments.length; i++)
-            [self setWidth:[_segments[i] width] + remainingWidth forSegment:i];
+        // Make sure we don't make an out of range
+        if (leftOversPixel < _segments.length - 1)
+        {
+            for (var i = 0; i < leftOversPixel; i++)
+            {
+                [self setWidth:[_segments[i] width] + 1 forSegment:i];
+            }
+        }
 
+        [self setFrameSize:CGSizeMake(originalWidth, [self frame].size.height)];
         [self tileWithChangedSegment:0];
     }
 
@@ -944,31 +972,48 @@ var CPSegmentedControlSegmentsKey       = "CPSegmentedControlSegmentsKey",
 
 @end
 
-var CPSegmentedControlBindersMap = {},
-    CPSegmentedControlNoSelectionPlaceholder = "CPSegmentedControlNoSelectionPlaceholder";
+@implementation CPSegmentedControl (BindingSupport)
+
++ (Class)_binderClassForBinding:(CPString)aBinding
+{
+    if ([self _isSelectionBinding:aBinding])
+        return [_CPSegmentedControlBinder class];
+
+    return [super _binderClassForBinding:aBinding];
+}
+
++ (BOOL)_isSelectionBinding:(CPString)aBinding
+{
+    return (aBinding === CPSelectedIndexBinding || aBinding === CPSelectedLabelBinding || aBinding === CPSelectedTagBinding);
+}
+
++ (BOOL)isBindingExclusive:(CPString)aBinding
+{
+    return [self _isSelectionBinding:aBinding];
+}
+
+- (void)bind:(CPString)aBinding toObject:(id)anObject withKeyPath:(CPString)aKeyPath options:(CPDictionary)options
+{
+    if ([[self class] _isSelectionBinding:aBinding] && _trackingMode !== CPSegmentSwitchTrackingSelectOne)
+    {
+        CPLog.warn("Binding " + aBinding + " needs CPSegmentSwitchTrackingSelectOne tracking mode");
+        return;
+    }
+
+    [super bind:aBinding toObject:anObject withKeyPath:aKeyPath options:options];
+}
+
+- (void)_reverseSetBinding
+{
+    [_CPSegmentedControlBinder _reverseSetValueFromExclusiveBinderForObject:self];
+}
+
+@end
+
+var CPSegmentedControlNoSelectionPlaceholder = "CPSegmentedControlNoSelectionPlaceholder";
 
 @implementation _CPSegmentedControlBinder : CPBinder
 {
-    CPString _selectionBinding @accessors(readonly, getter=selectionBinding);
-}
-
-+ (void)reverseSetValueForObject:(id)aSource
-{
-    var binder = CPSegmentedControlBindersMap[[aSource UID]];
-    [binder reverseSetValueFor:[binder selectionBinding]];
-}
-
-- (id)initWithBinding:(CPString)aBinding name:(CPString)aName to:(id)aDestination keyPath:(CPString)aKeyPath options:(CPDictionary)options from:(id)aSource
-{
-    self = [super initWithBinding:aBinding name:aName to:aDestination keyPath:aKeyPath options:options from:aSource];
-
-    if (self)
-    {
-        CPSegmentedControlBindersMap[[aSource UID]] = self;
-        _selectionBinding = aName;
-    }
-
-    return self;
 }
 
 - (void)_updatePlaceholdersWithOptions:(CPDictionary)options

AppKit/CPShadow.j

@@ -22,6 +22,9 @@
 
 @import <Foundation/CPObject.j>
 
+@import "CGGeometry.j"
+@import "CPColor.j"
+@import "CPGraphicsContext.j"
 
 /*!
     @deprecated
@@ -31,9 +34,9 @@
 */
 @implementation CPShadow : CPObject
 {
-    CGSize      _offset @accessors(property=shadowOffset);
+    CGSize      _offset     @accessors(property=shadowOffset);
     float       _blurRadius @accessors(property=shadowBlurRadius);
-    CPColor     _color @accessors(property=shadowColor);
+    CPColor     _color      @accessors(property=shadowColor);
 }
 
 /*!

AppKit/CPShadowView.j

@@ -26,7 +26,7 @@
 @import "CPImage.j"
 @import "CPView.j"
 
-
+@typedef CPShadowWeight
 CPLightShadow   = 0;
 CPHeavyShadow   = 1;
 
@@ -47,7 +47,7 @@ CPThemeStateShadowViewHeavy = CPThemeState("shadowview-style-heavy");
     return "shadow-view";
 }
 
-+ (id)themeAttributes
++ (CPDictionary)themeAttributes
 {
     return @{
             @"bezel-color": [CPNull null],

AppKit/CPSlider.j

@@ -49,7 +49,7 @@ CPCircularSlider    = 1;
     return "slider";
 }
 
-+ (id)themeAttributes
++ (CPDictionary)themeAttributes
 {
     return @{
             @"knob-color": [CPNull null],

AppKit/CPSliderColorPicker.j

@@ -55,7 +55,6 @@
     CPTextField _hexLabel;
     CPTextField _hexValue;
 
-    CPTextField _hexValue;
     CPTextField _redValue;
     CPTextField _greenValue;
     CPTextField _blueValue;

AppKit/CPSound.j

@@ -23,6 +23,18 @@
 @import <Foundation/CPObject.j>
 @import <Foundation/CPRunLoop.j>
 
+@typedef HTMLAudioElement
+
+@protocol CPSoundDelegate <CPObject>
+
+@optional
+- (void)sound:(CPSound)aSound didFinishPlaying:(BOOL)finishedLoading;
+
+@end
+
+
+var CPSoundDelegate_sound_didFinishPlaying_ = 1 << 1;
+
 CPSoundLoadStateEmpty       = 0;
 CPSoundLoadStateLoading     = 1;
 CPSoundLoadStateCanBePlayed = 2;
@@ -50,6 +62,7 @@ CPSoundPlayBackStatePause   = 2;
     HTMLAudioElement    _audioTag;
     int                 _loadStatus;
     int                 _playBackStatus;
+    unsigned            _implementedDelegateMethods;
 }
 
 #pragma mark -
@@ -133,6 +146,25 @@ CPSoundPlayBackStatePause   = 2;
 }
 
 
+#pragma mark -
+#pragma mark Delegate methods
+
+/*!
+    Sets the sound's delegate.
+    @param aDelegate the new delegate
+*/
+- (void)setDelegate:(id)aDelegate
+{
+    if (_delegate === aDelegate)
+        return;
+
+    _delegate = aDelegate;
+    _implementedDelegateMethods = 0;
+
+    if ([_delegate respondsToSelector:@selector(sound:didFinishPlaying:)])
+        _implementedDelegateMethods |= CPSoundDelegate_sound_didFinishPlaying_;
+}
+
 #pragma mark -
 #pragma mark Events listener
 
@@ -207,8 +239,7 @@ CPSoundPlayBackStatePause   = 2;
     _audioTag.currentTime = 0.0;
     _playBackStatus = CPSoundPlayBackStateStop;
 
-    if (_delegate && [_delegate respondsToSelector:@selector(sound:didFinishPlaying:)])
-        [_delegate sound:self didFinishPlaying:YES];
+    [self _sendDelegateSoundDidFinishPlaying:YES];
 
     return YES;
 }
@@ -316,3 +347,20 @@ CPSoundPlayBackStatePause   = 2;
 }
 
 @end
+
+
+@implementation CPSound (CPSoundDelegate)
+
+/*!
+    @ignore
+    Call delegate sound:didFinishPlaying:
+*/
+- (void)_sendDelegateSoundDidFinishPlaying:(BOOL)finishedPlaying
+{
+    if (!(_implementedDelegateMethods & CPSoundDelegate_sound_didFinishPlaying_))
+        return;
+
+    [_delegate sound:self didFinishPlaying:finishedPlaying];
+}
+
+@end

AppKit/CPSplitView.j

@@ -30,6 +30,33 @@
 @class CPUserDefaults
 @global CPApp
 
+@protocol CPSplitViewDelegate <CPObject>
+
+@optional
+- (BOOL)splitView:(CPSplitView)splitView canCollapseSubview:(CPView)subview;
+- (BOOL)splitView:(CPSplitView)splitView shouldAdjustSizeOfSubview:(CPView)subview;
+- (BOOL)splitView:(CPSplitView)splitView shouldCollapseSubview:(CPView)subview forDoubleClickOnDividerAtIndex:(CPInteger)dividerIndex;
+- (CGRect)splitView:(CPSplitView)splitView additionalEffectiveRectOfDividerAtIndex:(CPInteger)dividerIndex;
+- (CGRect)splitView:(CPSplitView)splitView effectiveRect:(CGRect)proposedEffectiveRect forDrawnRect:(CGRect)drawnRect ofDividerAtIndex:(CPInteger)dividerIndex;
+- (float)splitView:(CPSplitView)splitView constrainMaxCoordinate:(float)proposedMax ofSubviewAt:(CPInteger)dividerIndex;
+- (float)splitView:(CPSplitView)splitView constrainMinCoordinate:(float)proposedMin ofSubviewAt:(CPInteger)dividerIndex;
+- (float)splitView:(CPSplitView)splitView constrainSplitPosition:(float)proposedPosition ofSubviewAt:(CPInteger)dividerIndex;
+- (void)splitView:(CPSplitView)splitView resizeSubviewsWithOldSize:(CGSize)oldSize;
+- (void)splitViewDidResizeSubviews:(CPNotification)aNotification;
+- (void)splitViewWillResizeSubviews:(CPNotification)aNotification;
+
+@end
+
+var CPSplitViewDelegate_splitView_canCollapseSubview_                                   = 1 << 0,
+    CPSplitViewDelegate_splitView_shouldAdjustSizeOfSubview_                            = 1 << 1,
+    CPSplitViewDelegate_splitView_shouldCollapseSubview_forDoubleClickOnDividerAtIndex_ = 1 << 2,
+    CPSplitViewDelegate_splitView_additionalEffectiveRectOfDividerAtIndex_              = 1 << 3,
+    CPSplitViewDelegate_splitView_effectiveRect_forDrawnRect_ofDividerAtIndex_          = 1 << 4,
+    CPSplitViewDelegate_splitView_constrainMaxCoordinate_ofSubviewAt_                   = 1 << 5,
+    CPSplitViewDelegate_splitView_constrainMinCoordinate_ofSubviewAt_                   = 1 << 6,
+    CPSplitViewDelegate_splitView_constrainSplitPosition_ofSubviewAt_                   = 1 << 7,
+    CPSplitViewDelegate_splitView_resizeSubviewsWithOldSize_                            = 1 << 8;
+
 #define SPLIT_VIEW_MAYBE_POST_WILL_RESIZE() \
     if ((_suppressResizeNotificationsMask & DidPostWillResizeNotification) === 0) \
     { \
@@ -73,29 +100,31 @@ var ShouldSuppressResizeNotifications   = 1,
 
 @implementation CPSplitView : CPView
 {
-    id              _delegate;
-    BOOL            _isVertical;
-    BOOL            _isPaneSplitter;
+    id <CPSplitViewDelegate>    _delegate;
+    BOOL                        _isVertical;
+    BOOL                        _isPaneSplitter;
 
-    int             _currentDivider;
-    float           _initialOffset;
-    CPDictionary    _preCollapsePositions;
+    int                         _currentDivider;
+    float                       _initialOffset;
+    CPDictionary                _preCollapsePositions;
 
-    CPString        _originComponent;
-    CPString        _sizeComponent;
+    CPString                    _originComponent;
+    CPString                    _sizeComponent;
 
-    CPArray         _DOMDividerElements;
-    CPString        _dividerImagePath;
-    int             _drawingDivider;
+    CPArray                     _DOMDividerElements;
+    CPString                    _dividerImagePath;
+    int                         _drawingDivider;
 
-    CPString        _autosaveName;
-    BOOL            _shouldAutosave;
-    CGSize          _shouldRestoreFromAutosaveUnlessFrameSize;
+    CPString                    _autosaveName;
+    BOOL                        _shouldAutosave;
+    CGSize                      _shouldRestoreFromAutosaveUnlessFrameSize;
 
-    BOOL            _needsResizeSubviews;
-    int             _suppressResizeNotificationsMask;
+    BOOL                        _needsResizeSubviews;
+    int                         _suppressResizeNotificationsMask;
 
-    CPArray         _buttonBars;
+    CPArray                     _buttonBars;
+
+    unsigned                    _implementedDelegateMethods;
 }
 
 + (CPString)defaultThemeClass
@@ -103,7 +132,7 @@ var ShouldSuppressResizeNotifications   = 1,
     return @"splitview";
 }
 
-+ (id)themeAttributes
++ (CPDictionary)themeAttributes
 {
     return @{
             @"divider-thickness": 1.0,
@@ -406,11 +435,8 @@ var ShouldSuppressResizeNotifications   = 1,
         buttonBarRect.origin = [self convertPoint:buttonBarRect.origin fromView:buttonBar];
     }
 
-    if ([_delegate respondsToSelector:@selector(splitView:effectiveRect:forDrawnRect:ofDividerAtIndex:)])
-        effectiveRect = [_delegate splitView:self effectiveRect:effectiveRect forDrawnRect:effectiveRect ofDividerAtIndex:anIndex];
-
-    if ([_delegate respondsToSelector:@selector(splitView:additionalEffectiveRectOfDividerAtIndex:)])
-        additionalRect = [_delegate splitView:self additionalEffectiveRectOfDividerAtIndex:anIndex];
+    effectiveRect = [self _sendDelegateSplitViewEffectiveRect:effectiveRect forDrawnRect:effectiveRect ofDividerAtIndex:anIndex];
+    additionalRect = [self _sendDelegateSplitViewAdditionalEffectiveRectOfDividerAtIndex:anIndex];
 
     return CGRectContainsPoint(effectiveRect, aPoint) ||
            (additionalRect && CGRectContainsPoint(additionalRect, aPoint)) ||
@@ -472,21 +498,21 @@ var ShouldSuppressResizeNotifications   = 1,
             if ([self cursorAtPoint:point hitDividerAtIndex:i])
             {
                 if ([anEvent clickCount] == 2 &&
-                    [_delegate respondsToSelector:@selector(splitView:canCollapseSubview:)] &&
-                    [_delegate respondsToSelector:@selector(splitView:shouldCollapseSubview:forDoubleClickOnDividerAtIndex:)])
+                    [self _delegateRespondsToSplitViewCanCollapseSubview] &&
+                    [self _delegateRespondsToSplitViewshouldCollapseSubviewForDoubleClickOnDividerAtIndex])
                 {
                     var minPosition = [self minPossiblePositionOfDividerAtIndex:i],
                         maxPosition = [self maxPossiblePositionOfDividerAtIndex:i],
                         preCollapsePosition = [_preCollapsePositions objectForKey:"" + i] || 0;
 
-                    if ([_delegate splitView:self canCollapseSubview:_subviews[i]] && [_delegate splitView:self shouldCollapseSubview:_subviews[i] forDoubleClickOnDividerAtIndex:i])
+                    if ([self _sendDelegateSplitViewCanCollapseSubview:_subviews[i]] && [self _sendDelegateSplitViewShouldCollapseSubview:_subviews[i] forDoubleClickOnDividerAtIndex:i])
                     {
                         if ([self isSubviewCollapsed:_subviews[i]])
                             [self setPosition:preCollapsePosition ? preCollapsePosition : (minPosition + (maxPosition - minPosition) / 2) ofDividerAtIndex:i];
                         else
                             [self setPosition:minPosition ofDividerAtIndex:i];
                     }
-                    else if ([_delegate splitView:self canCollapseSubview:_subviews[i + 1]] && [_delegate splitView:self shouldCollapseSubview:_subviews[i + 1] forDoubleClickOnDividerAtIndex:i])
+                    else if ([self _sendDelegateSplitViewCanCollapseSubview:_subviews[i + 1]] && [self _sendDelegateSplitViewShouldCollapseSubview:_subviews[i + 1] forDoubleClickOnDividerAtIndex:i])
                     {
                         if ([self isSubviewCollapsed:_subviews[i + 1]])
                             [self setPosition:preCollapsePosition ? preCollapsePosition : (minPosition + (maxPosition - minPosition) / 2) ofDividerAtIndex:i];
@@ -580,12 +606,8 @@ var ShouldSuppressResizeNotifications   = 1,
 
             if (sizeA === 0)
                 canGrow = YES; // Subview is collapsed.
-            else if (!canShrink &&
-                     [_delegate respondsToSelector:@selector(splitView:canCollapseSubview:)] &&
-                     [_delegate splitView:self canCollapseSubview:_subviews[i]])
-            {
+            else if (!canShrink && [self _sendDelegateSplitViewCanCollapseSubview:_subviews[i]])
                 canShrink = YES; // Subview is collapsible.
-            }
 
             if (sizeB === 0)
             {
@@ -594,9 +616,7 @@ var ShouldSuppressResizeNotifications   = 1,
                 // It's safe to assume it can always be uncollapsed.
                 canShrink = YES;
             }
-            else if (!canGrow &&
-                     [_delegate respondsToSelector:@selector(splitView:canCollapseSubview:)] &&
-                     [_delegate splitView:self canCollapseSubview:_subviews[i + 1]])
+            else if (!canGrow && [self _sendDelegateSplitViewCanCollapseSubview:_subviews[i + 1]])
             {
                 canGrow = YES; // Right/lower subview is collapsible.
             }
@@ -657,53 +677,38 @@ var ShouldSuppressResizeNotifications   = 1,
 - (int)_realPositionForPosition:(float)position ofDividerAtIndex:(int)dividerIndex
 {
     // not sure where this should override other positions?
-    if ([_delegate respondsToSelector:@selector(splitView:constrainSplitPosition:ofSubviewAt:)])
-    {
-        var proposedPosition = [_delegate splitView:self constrainSplitPosition:position ofSubviewAt:dividerIndex];
+    var proposedPosition = [self _sendDelegateSplitViewConstrainSplitPosition:position ofSubviewAt:dividerIndex];
 
-        // Silently ignore bad positions which could result from odd delegate responses. We don't want these
-        // bad results to go into the system and cause havoc with frame sizes as the split view tries to resize
-        // its subviews.
-        if (_IS_NUMERIC(proposedPosition))
-            position = proposedPosition;
-    }
+    // Silently ignore bad positions which could result from odd delegate responses. We don't want these
+    // bad results to go into the system and cause havoc with frame sizes as the split view tries to resize
+    // its subviews.
+    if (_IS_NUMERIC(proposedPosition))
+        position = proposedPosition;
 
     var proposedMax = [self maxPossiblePositionOfDividerAtIndex:dividerIndex],
         proposedMin = [self minPossiblePositionOfDividerAtIndex:dividerIndex],
         actualMax = proposedMax,
-        actualMin = proposedMin;
+        actualMin = proposedMin,
+        proposedActualMin = [self _sendDelegateSplitViewConstrainMinCoordinate:proposedMin ofSubviewAt:dividerIndex],
+        proposedActualMax = [self _sendDelegateSplitViewConstrainMaxCoordinate:proposedMax ofSubviewAt:dividerIndex];
 
-    if ([_delegate respondsToSelector:@selector(splitView:constrainMinCoordinate:ofSubviewAt:)])
-    {
-        var proposedActualMin = [_delegate splitView:self constrainMinCoordinate:proposedMin ofSubviewAt:dividerIndex];
+    if (_IS_NUMERIC(proposedActualMin))
+        actualMin = proposedActualMin;
 
-        if (_IS_NUMERIC(proposedActualMin))
-            actualMin = proposedActualMin;
-    }
-
-    if ([_delegate respondsToSelector:@selector(splitView:constrainMaxCoordinate:ofSubviewAt:)])
-    {
-        var proposedActualMax = [_delegate splitView:self constrainMaxCoordinate:proposedMax ofSubviewAt:dividerIndex];
-
-        if (_IS_NUMERIC(proposedActualMax))
-            actualMax = proposedActualMax;
-    }
+    if (_IS_NUMERIC(proposedActualMax))
+        actualMax = proposedActualMax;
 
     var viewA = _subviews[dividerIndex],
         viewB = _subviews[dividerIndex + 1],
         realPosition = MAX(MIN(position, actualMax), actualMin);
 
     // Is this position past the halfway point to collapse?
-    if (position < proposedMin + (actualMin - proposedMin) / 2)
-        if ([_delegate respondsToSelector:@selector(splitView:canCollapseSubview:)])
-            if ([_delegate splitView:self canCollapseSubview:viewA])
-                realPosition = proposedMin;
+    if ((position < proposedMin + (actualMin - proposedMin) / 2) && [self _sendDelegateSplitViewCanCollapseSubview:viewA])
+        realPosition = proposedMin;
 
     // We can also collapse to the right.
-    if (position > proposedMax - (proposedMax - actualMax) / 2)
-        if ([_delegate respondsToSelector:@selector(splitView:canCollapseSubview:)])
-            if ([_delegate splitView:self canCollapseSubview:viewB])
-                realPosition = proposedMax;
+    if ((position > proposedMax - (proposedMax - actualMax) / 2) && [self _sendDelegateSplitViewCanCollapseSubview:viewB])
+        realPosition = proposedMax;
 
     return realPosition;
 }
@@ -787,9 +792,9 @@ var ShouldSuppressResizeNotifications   = 1,
 
 - (void)resizeSubviewsWithOldSize:(CGSize)oldSize
 {
-    if ([_delegate respondsToSelector:@selector(splitView:resizeSubviewsWithOldSize:)])
+    if ([self _delegateRespondsToSplitViewResizeSubviewsWithOldSize])
     {
-        [_delegate splitView:self resizeSubviewsWithOldSize:oldSize];
+        [self _sendDelegateSplitViewResizeSubviewsWithOldSize:oldSize];
         return;
     }
 
@@ -815,8 +820,7 @@ var ShouldSuppressResizeNotifications   = 1,
         oldFlexibleSpace = 0,
         totalSizablePanes = 0,
         isSizableMap = {},
-        viewSizes = [],
-        delegateRespondsToShouldAdjust = [_delegate respondsToSelector:@selector(splitView:shouldAdjustSizeOfSubview:)];
+        viewSizes = [];
 
     // What we want to do is to preserve non resizable sizes first, and then to preserve the ratio of size to available
     // non fixed space for every other subview. E.g. assume fixed space was 20 pixels initially, view 1 was 20 and
@@ -832,7 +836,7 @@ var ShouldSuppressResizeNotifications   = 1,
     for (index = 0; index < count; ++index)
     {
         var view = _subviews[index],
-            isSizable = !delegateRespondsToShouldAdjust || [_delegate splitView:self shouldAdjustSizeOfSubview:view],
+            isSizable = [self _sendDelegateSplitViewShouldAdjustSizeOfSubview:view],
             size = [view frame].size[_sizeComponent];
 
         isSizableMap[index] = isSizable;
@@ -958,25 +962,59 @@ The sum of the views and the sum of the dividers should be equal to the size of
 
     @param delegate - The delegate of the splitview.
 */
-- (void)setDelegate:(id)delegate
+- (void)setDelegate:(id <CPSplitViewDelegate>)aDelegate
 {
+    if (_delegate === aDelegate)
+        return;
+
     if ([_delegate respondsToSelector:@selector(splitViewDidResizeSubviews:)])
         [[CPNotificationCenter defaultCenter] removeObserver:_delegate name:CPSplitViewDidResizeSubviewsNotification object:self];
+
     if ([_delegate respondsToSelector:@selector(splitViewWillResizeSubviews:)])
         [[CPNotificationCenter defaultCenter] removeObserver:_delegate name:CPSplitViewWillResizeSubviewsNotification object:self];
 
-   _delegate = delegate;
+   _delegate = aDelegate;
+   _implementedDelegateMethods = 0;
 
    if ([_delegate respondsToSelector:@selector(splitViewDidResizeSubviews:)])
        [[CPNotificationCenter defaultCenter] addObserver:_delegate
                                                 selector:@selector(splitViewDidResizeSubviews:)
                                                     name:CPSplitViewDidResizeSubviewsNotification
                                                   object:self];
+
    if ([_delegate respondsToSelector:@selector(splitViewWillResizeSubviews:)])
        [[CPNotificationCenter defaultCenter] addObserver:_delegate
                                                 selector:@selector(splitViewWillResizeSubviews:)
                                                     name:CPSplitViewWillResizeSubviewsNotification
                                                   object:self];
+
+    if ([_delegate respondsToSelector:@selector(splitView:canCollapseSubview:)])
+        _implementedDelegateMethods |= CPSplitViewDelegate_splitView_canCollapseSubview_;
+
+    if ([_delegate respondsToSelector:@selector(splitView:shouldAdjustSizeOfSubview:)])
+        _implementedDelegateMethods |= CPSplitViewDelegate_splitView_shouldAdjustSizeOfSubview_;
+
+    if ([_delegate respondsToSelector:@selector(splitView:shouldCollapseSubview:forDoubleClickOnDividerAtIndex:)])
+        _implementedDelegateMethods |= CPSplitViewDelegate_splitView_shouldCollapseSubview_forDoubleClickOnDividerAtIndex_;
+
+    if ([_delegate respondsToSelector:@selector(splitView:additionalEffectiveRectOfDividerAtIndex:)])
+        _implementedDelegateMethods |= CPSplitViewDelegate_splitView_additionalEffectiveRectOfDividerAtIndex_;
+
+    if ([_delegate respondsToSelector:@selector(splitView:effectiveRect:forDrawnRect:ofDividerAtIndex:)])
+        _implementedDelegateMethods |= CPSplitViewDelegate_splitView_effectiveRect_forDrawnRect_ofDividerAtIndex_;
+
+    if ([_delegate respondsToSelector:@selector(splitView:constrainMaxCoordinate:ofSubviewAt:)])
+        _implementedDelegateMethods |= CPSplitViewDelegate_splitView_constrainMaxCoordinate_ofSubviewAt_;
+
+    if ([_delegate respondsToSelector:@selector(splitView:constrainMinCoordinate:ofSubviewAt:)])
+        _implementedDelegateMethods |= CPSplitViewDelegate_splitView_constrainMinCoordinate_ofSubviewAt_;
+
+    if ([_delegate respondsToSelector:@selector(splitView:constrainSplitPosition:ofSubviewAt:)])
+        _implementedDelegateMethods |= CPSplitViewDelegate_splitView_constrainSplitPosition_ofSubviewAt_;
+
+    if ([_delegate respondsToSelector:@selector(splitView:resizeSubviewsWithOldSize:)])
+        _implementedDelegateMethods |= CPSplitViewDelegate_splitView_resizeSubviewsWithOldSize_;
+
 }
 
 /*!
@@ -995,7 +1033,7 @@ The sum of the views and the sum of the dividers should be equal to the size of
     @param unsigned int - The divider index the button bar will be assigned to.
 */
 // FIXME Should be renamed to setButtonBar:ofDividerAtIndex:.
-- (void)setButtonBar:(CPButtonBar)aButtonBar forDividerAtIndex:(unsigned)dividerIndex
+- (void)setButtonBar:(CPButtonBar)aButtonBar forDividerAtIndex:(CPUInteger)dividerIndex
 {
     if (!aButtonBar)
     {
@@ -1192,6 +1230,148 @@ The sum of the views and the sum of the dividers should be equal to the size of
 
 @end
 
+
+@implementation CPSplitView (CPSplitViewDelegate)
+
+/*!
+    @ignore
+    Return YES if the delegate implements splitView:resizeSubviewsWithOldSize:
+*/
+- (BOOL)_delegateRespondsToSplitViewResizeSubviewsWithOldSize
+{
+    return _implementedDelegateMethods & CPSplitViewDelegate_splitView_resizeSubviewsWithOldSize_;
+}
+
+/*!
+    @ignore
+    Return YES if the delegate implements splitView:canCollapseSubview:
+*/
+- (BOOL)_delegateRespondsToSplitViewCanCollapseSubview
+{
+    return _implementedDelegateMethods & CPSplitViewDelegate_splitView_canCollapseSubview_;
+}
+
+/*!
+    @ignore
+    Return YES if the delegate implements splitView:shouldCollapseSubview:forDoubleClickOnDividerAtIndex
+*/
+- (BOOL)_delegateRespondsToSplitViewshouldCollapseSubviewForDoubleClickOnDividerAtIndex
+{
+    return _implementedDelegateMethods & CPSplitViewDelegate_splitView_shouldCollapseSubview_forDoubleClickOnDividerAtIndex_;
+}
+
+
+/*!
+    @ignore
+    Call the delegate splitView:canCollapseSubview:
+*/
+- (BOOL)_sendDelegateSplitViewCanCollapseSubview:(CPView)aView
+{
+    if (!(_implementedDelegateMethods & CPSplitViewDelegate_splitView_canCollapseSubview_))
+        return NO;
+
+    return [_delegate splitView:self canCollapseSubview:aView];
+}
+
+/*!
+    @ignore
+    Call the delegate splitView:shouldAdjustSizeOfSubview:
+*/
+- (BOOL)_sendDelegateSplitViewShouldAdjustSizeOfSubview:(CPView)aView
+{
+    if (!(_implementedDelegateMethods & CPSplitViewDelegate_splitView_shouldAdjustSizeOfSubview_))
+        return YES;
+
+    return [_delegate splitView:self shouldAdjustSizeOfSubview:aView];
+}
+
+/*!
+    @ignore
+    Call the delegate splitView:shouldCollapseSubview:forDoubleClickOnDividerAtIndex:
+*/
+- (BOOL)_sendDelegateSplitViewShouldCollapseSubview:(CPView)aView forDoubleClickOnDividerAtIndex:(int)anIndex
+{
+    if (!(_implementedDelegateMethods & CPSplitViewDelegate_splitView_shouldCollapseSubview_forDoubleClickOnDividerAtIndex_))
+        return NO;
+
+    return [_delegate splitView:self shouldCollapseSubview:aView forDoubleClickOnDividerAtIndex:anIndex];
+}
+
+/*!
+    @ignore
+    Call the delegate splitView:additionalEffectiveRectOfDividerAtIndex:
+*/
+- (CGRect)_sendDelegateSplitViewAdditionalEffectiveRectOfDividerAtIndex:(int)anIndex
+{
+    if (!(_implementedDelegateMethods & CPSplitViewDelegate_splitView_additionalEffectiveRectOfDividerAtIndex_))
+        return nil;
+
+    return [_delegate splitView:self additionalEffectiveRectOfDividerAtIndex:anIndex];
+}
+
+/*!
+    @ignore
+    Call the delegate splitView:effectiveRect:forDrawnRect:ofDividerAtIndex:
+*/
+- (CGRect)_sendDelegateSplitViewEffectiveRect:(CGRect)proposedEffectiveRect forDrawnRect:(CGRect)drawnRect ofDividerAtIndex:(CPInteger)dividerIndex
+{
+    if (!(_implementedDelegateMethods & CPSplitViewDelegate_splitView_effectiveRect_forDrawnRect_ofDividerAtIndex_))
+        return proposedEffectiveRect;
+
+    return [_delegate splitView:self effectiveRect:proposedEffectiveRect forDrawnRect:drawnRect ofDividerAtIndex:dividerIndex];
+}
+
+/*!
+    @ignore
+    Call the delegate splitView:constrainMaxCoordinate:ofSubviewAt:
+*/
+- (float)_sendDelegateSplitViewConstrainMaxCoordinate:(float)proposedMax ofSubviewAt:(CPInteger)dividerIndex
+{
+    if (!(_implementedDelegateMethods & CPSplitViewDelegate_splitView_constrainMaxCoordinate_ofSubviewAt_))
+        return nil;
+
+    return [_delegate splitView:self constrainMaxCoordinate:proposedMax ofSubviewAt:dividerIndex];
+}
+
+/*!
+    @ignore
+    Call the delegate splitView:constrainMinCoordinate:ofSubviewAt:
+*/
+- (float)_sendDelegateSplitViewConstrainMinCoordinate:(float)proposedMin ofSubviewAt:(CPInteger)dividerIndex
+{
+    if (!(_implementedDelegateMethods & CPSplitViewDelegate_splitView_constrainMinCoordinate_ofSubviewAt_))
+        return nil;
+
+    return [_delegate splitView:self constrainMinCoordinate:proposedMin ofSubviewAt:dividerIndex];
+}
+
+/*!
+    @ignore
+    Call the delegate splitView:constrainSplitPosition:ofSubviewAt:
+*/
+- (float)_sendDelegateSplitViewConstrainSplitPosition:(float)proposedMax ofSubviewAt:(CPInteger)dividerIndex
+{
+    if (!(_implementedDelegateMethods & CPSplitViewDelegate_splitView_constrainSplitPosition_ofSubviewAt_))
+        return nil;
+
+    return [_delegate splitView:self constrainSplitPosition:proposedMax ofSubviewAt:dividerIndex];
+}
+
+/*!
+    @ignore
+    Call the delegate splitView:resizeSubviewsWithOldSize:
+*/
+- (void)_sendDelegateSplitViewResizeSubviewsWithOldSize:(CGSize)oldSize
+{
+    if (!(_implementedDelegateMethods & CPSplitViewDelegate_splitView_resizeSubviewsWithOldSize_))
+        return;
+
+    [_delegate splitView:self resizeSubviewsWithOldSize:oldSize];
+}
+
+@end
+
+
 var CPSplitViewDelegateKey          = "CPSplitViewDelegateKey",
     CPSplitViewIsVerticalKey        = "CPSplitViewIsVerticalKey",
     CPSplitViewIsPaneSplitterKey    = "CPSplitViewIsPaneSplitterKey",

AppKit/CPStepper.j

@@ -25,7 +25,6 @@
 @import "CPTextField.j"
 
 
-
 /*!
     CPStepper is an implementation of Cocoa NSStepper.
 
@@ -53,9 +52,9 @@
     @param maxValue the maximal acceptable value of the stepper
     @return Initialized CPStepper
 */
-+ (CPStepper)stepperWithInitialValue:(float)aValue minValue:(float)aMinValue maxValue:(float)aMaxValue
++ (id)stepperWithInitialValue:(float)aValue minValue:(float)aMinValue maxValue:(float)aMaxValue
 {
-    var stepper = [[CPStepper alloc] initWithFrame:CGRectMakeZero()];
+    var stepper = [[self alloc] initWithFrame:CGRectMakeZero()];
 
     [stepper setDoubleValue:aValue];
     [stepper setMinValue:aMinValue];
@@ -75,14 +74,14 @@
 
     @return Initialized CPStepper
 */
-+ (CPStepper)stepper
++ (id)stepper
 {
     return [CPStepper stepperWithInitialValue:0.0 minValue:0.0 maxValue:59.0];
 }
 
 + (Class)_binderClassForBinding:(CPString)aBinding
 {
-    if (aBinding == CPValueBinding || aBinding == CPMinValueBinding || aBinding == CPMaxValueBinding)
+    if (aBinding === CPValueBinding || aBinding === CPMinValueBinding || aBinding === CPMaxValueBinding)
         return [_CPStepperValueBinder class];
 
     return [super _binderClassForBinding:aBinding];
@@ -90,7 +89,7 @@
 
 - (CPString)_replacementKeyPathForBinding:(CPString)aBinding
 {
-    if (aBinding == CPValueBinding)
+    if (aBinding === CPValueBinding)
         return @"doubleValue";
 
     return [super _replacementKeyPathForBinding:aBinding];
@@ -138,9 +137,16 @@
     [self setContinuous:_autorepeat];
     [self addSubview:_buttonDown];
 
+    [self _sizeToFit];
     [self setNeedsLayout];
 }
 
+- (void)setControlSize:(CPControlSize)aControlSize
+{
+    [super setControlSize:aControlSize];
+    [self _sizeToFit];
+}
+
 #pragma mark -
 #pragma mark Superclass overrides
 
@@ -159,8 +165,8 @@
 
 - (void)setFrame:(CGRect)aFrame
 {
-    var upSize = [self valueForThemeAttribute:@"up-button-size"],
-        downSize = [self valueForThemeAttribute:@"down-button-size"],
+    var upSize = [self currentValueForThemeAttribute:@"up-button-size"],
+        downSize = [self currentValueForThemeAttribute:@"down-button-size"],
         minSize = CGSizeMake(upSize.width, upSize.height + downSize.height),
         frame = CGRectMakeCopy(aFrame);
 
@@ -172,21 +178,22 @@
 /*! @ignore */
 - (void)layoutSubviews
 {
-    var aFrame = [self frame],
-        upSize = [self valueForThemeAttribute:@"up-button-size"],
-        downSize = [self valueForThemeAttribute:@"down-button-size"],
-        upFrame = CGRectMake(aFrame.size.width - upSize.width, 0, upSize.width, upSize.height),
-        downFrame = CGRectMake(aFrame.size.width - downSize.width, upSize.height, downSize.width, downSize.height);
+    var controlSizeThemeState = [self _controlSizeThemeState],
+        aFrame = [self frame],
+        upSize = [self valueForThemeAttribute:@"up-button-size" inState:controlSizeThemeState],
+        downSize = [self valueForThemeAttribute:@"down-button-size" inState:controlSizeThemeState],
+        upFrame = CGRectMake(0, 0, upSize.width, upSize.height),
+        downFrame = CGRectMake(0, upSize.height, downSize.width, downSize.height);
 
     [_buttonUp setFrame:upFrame];
     [_buttonDown setFrame:downFrame];
 
-    [_buttonUp setValue:[self valueForThemeAttribute:@"bezel-color-up-button" inState:CPThemeStateBordered] forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered];
-    [_buttonUp setValue:[self valueForThemeAttribute:@"bezel-color-up-button" inState:CPThemeStateBordered | CPThemeStateDisabled] forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered | CPThemeStateDisabled];
-    [_buttonUp setValue:[self valueForThemeAttribute:@"bezel-color-up-button" inState:CPThemeStateBordered | CPThemeStateHighlighted] forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered | CPThemeStateHighlighted];
-    [_buttonDown setValue:[self valueForThemeAttribute:@"bezel-color-down-button" inState:CPThemeStateBordered] forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered];
-    [_buttonDown setValue:[self valueForThemeAttribute:@"bezel-color-down-button" inState:CPThemeStateBordered | CPThemeStateDisabled] forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered | CPThemeStateDisabled];
-    [_buttonDown setValue:[self valueForThemeAttribute:@"bezel-color-down-button" inState:CPThemeStateBordered | CPThemeStateHighlighted] forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered | CPThemeStateHighlighted];
+    [_buttonUp setValue:[self valueForThemeAttribute:@"bezel-color-up-button" inState:[controlSizeThemeState, CPThemeStateBordered]] forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered];
+    [_buttonUp setValue:[self valueForThemeAttribute:@"bezel-color-up-button" inState:[controlSizeThemeState, CPThemeStateBordered, CPThemeStateDisabled]] forThemeAttribute:@"bezel-color" inState:[CPThemeStateBordered, CPThemeStateDisabled]];
+    [_buttonUp setValue:[self valueForThemeAttribute:@"bezel-color-up-button" inState:[controlSizeThemeState, CPThemeStateBordered, CPThemeStateHighlighted]] forThemeAttribute:@"bezel-color" inState:[CPThemeStateBordered, CPThemeStateHighlighted]];
+    [_buttonDown setValue:[self valueForThemeAttribute:@"bezel-color-down-button" inState:[controlSizeThemeState, CPThemeStateBordered]] forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered];
+    [_buttonDown setValue:[self valueForThemeAttribute:@"bezel-color-down-button" inState:[controlSizeThemeState, CPThemeStateBordered, CPThemeStateDisabled]] forThemeAttribute:@"bezel-color" inState:[CPThemeStateBordered, CPThemeStateDisabled]];
+    [_buttonDown setValue:[self valueForThemeAttribute:@"bezel-color-down-button" inState:[controlSizeThemeState, CPThemeStateBordered, CPThemeStateHighlighted]] forThemeAttribute:@"bezel-color" inState:[CPThemeStateBordered, CPThemeStateHighlighted]];
 }
 
 - (void)_sizeToFit
@@ -213,7 +220,7 @@
     Set the current value of the stepper.
     @param aValue a float containing the value
 */
-- (void)setDoubleValue:(float)aValue
+- (void)setDoubleValue:(double)aValue
 {
     if (aValue > _maxValue)
         [super setDoubleValue:_valueWraps ? _minValue : _maxValue];
@@ -232,7 +239,7 @@
     if (![self isEnabled])
         return;
 
-    if (aSender == _buttonUp)
+    if (aSender === _buttonUp)
         [self setDoubleValue:([self doubleValue] + _increment)];
     else
         [self setDoubleValue:([self doubleValue] - _increment)];
@@ -267,7 +274,7 @@
     return @"stepper";
 }
 
-+ (id)themeAttributes
++ (CPDictionary)themeAttributes
 {
     return @{
             @"bezel-color-up-button": [CPNull null],
@@ -285,7 +292,7 @@
 
 - (void)_updatePlaceholdersWithOptions:(CPDictionary)options forBinding:(CPString)aBinding
 {
-    var placeholder = (aBinding == CPMaxValueBinding) ? [_source maxValue] : [_source minValue];
+    var placeholder = (aBinding === CPMaxValueBinding) ? [_source maxValue] : [_source minValue];
 
     [super _updatePlaceholdersWithOptions:options];
 

AppKit/CPTabView.j

@@ -25,6 +25,7 @@
 @import "CPTabViewItem.j"
 @import "CPView.j"
 
+@typedef CPTabViewType
 CPTopTabsBezelBorder     = 0;
 //CPLeftTabsBezelBorder  = 1;
 CPBottomTabsBezelBorder  = 2;
@@ -33,10 +34,22 @@ CPNoTabsBezelBorder      = 4; //Displays no tabs and has a bezeled border.
 CPNoTabsLineBorder       = 5; //Has no tabs and displays a line border.
 CPNoTabsNoBorder         = 6; //Displays no tabs and no border.
 
-var CPTabViewDidSelectTabViewItemSelector           = 1,
-    CPTabViewShouldSelectTabViewItemSelector        = 2,
-    CPTabViewWillSelectTabViewItemSelector          = 4,
-    CPTabViewDidChangeNumberOfTabViewItemsSelector  = 8;
+var CPTabViewDidSelectTabViewItemSelector           = 1 << 1,
+    CPTabViewShouldSelectTabViewItemSelector        = 1 << 2,
+    CPTabViewWillSelectTabViewItemSelector          = 1 << 3,
+    CPTabViewDidChangeNumberOfTabViewItemsSelector  = 1 << 4;
+
+
+@protocol CPTabViewDelegate <CPObject>
+
+@optional
+- (BOOL)tabView:(CPTabView)tabView shouldSelectTabViewItem:(CPTabViewItem)tabViewItem;
+- (void)tabView:(CPTabView)tabView didSelectTabViewItem:(CPTabViewItem)tabViewItem;
+- (void)tabView:(CPTabView)tabView willSelectTabViewItem:(CPTabViewItem)tabViewItem;
+- (void)tabViewDidChangeNumberOfTabViewItems:(CPTabView)tabView;
+
+@end
+
 
 /*!
     @ingroup appkit
@@ -48,18 +61,18 @@ var CPTabViewDidSelectTabViewItemSelector           = 1,
 */
 @implementation CPTabView : CPView
 {
-    CPArray             _items;
+    CPArray                 _items;
 
-    CPSegmentedControl  _tabs;
-    CPBox               _box;
+    CPSegmentedControl      _tabs;
+    CPBox                   _box;
 
-    CPNumber            _selectedIndex;
+    CPNumber                _selectedIndex;
 
-    CPTabViewType       _type;
-    CPFont              _font;
+    CPTabViewType           _type;
+    CPFont                  _font;
 
-    id                  _delegate;
-    unsigned            _delegateSelectors;
+    id <CPTabViewDelegate>  _delegate;
+    unsigned                _delegateSelectors;
 }
 
 - (id)initWithFrame:(CGRect)aFrame
@@ -82,7 +95,7 @@ var CPTabViewDidSelectTabViewItemSelector           = 1,
     _tabs = [[CPSegmentedControl alloc] initWithFrame:CGRectMake(0, 0, 0, 0)];
     [_tabs setHitTests:NO];
 
-    var height = [_tabs valueForThemeAttribute:@"default-height"];
+    var height = [_tabs valueForThemeAttribute:@"min-size"].height;
     [_tabs setFrameSize:CGSizeMake(0, height)];
 
     _box = [[CPBox alloc] initWithFrame:[self  bounds]];
@@ -107,7 +120,7 @@ var CPTabViewDidSelectTabViewItemSelector           = 1,
     @param aTabViewItem the item to insert
     @param anIndex the index for the item
 */
-- (void)insertTabViewItem:(CPTabViewItem)aTabViewItem atIndex:(unsigned)anIndex
+- (void)insertTabViewItem:(CPTabViewItem)aTabViewItem atIndex:(CPUInteger)anIndex
 {
     [_items insertObject:aTabViewItem atIndex:anIndex];
 
@@ -183,7 +196,7 @@ var CPTabViewDidSelectTabViewItemSelector           = 1,
     Returns the CPTabViewItem at the specified index.
     @return a tab view item, or nil
 */
-- (CPTabViewItem)tabViewItemAtIndex:(unsigned)anIndex
+- (CPTabViewItem)tabViewItemAtIndex:(CPUInteger)anIndex
 {
     return [_items objectAtIndex:anIndex];
 }
@@ -270,7 +283,7 @@ var CPTabViewDidSelectTabViewItemSelector           = 1,
     Selects the item at the specified index.
     @param anIndex the index of the item to display.
 */
-- (BOOL)selectTabViewItemAtIndex:(unsigned)anIndex
+- (BOOL)selectTabViewItemAtIndex:(CPUInteger)anIndex
 {
     if (anIndex === _selectedIndex)
         return;
@@ -379,6 +392,7 @@ var CPTabViewDidSelectTabViewItemSelector           = 1,
         [_box setFrame:CGRectMake(0, origin, CGRectGetWidth(aFrame),
                                    CGRectGetHeight(aFrame) - segmentedHeight / 2)];
 
+        [self _updateItems];
         [self _repositionTabs];
     }
 }
@@ -405,7 +419,7 @@ var CPTabViewDidSelectTabViewItemSelector           = 1,
     Sets the delegate for this tab view.
     @param aDelegate the tab view's delegate
 */
-- (void)setDelegate:(id)aDelegate
+- (void)setDelegate:(id <CPTabViewDelegate>)aDelegate
 {
     if (_delegate == aDelegate)
         return;

AppKit/CPTabViewItem.j

@@ -23,7 +23,7 @@
 @import <Foundation/CPObject.j>
 
 @import "CPView.j"
-
+@class CPTabView
 
 /*
     The tab is currently selected.
@@ -90,6 +90,7 @@ CPPressedTab    = 2;
 - (void)setLabel:(CPString)aLabel
 {
     _label = aLabel;
+    [_tabView setNeedsLayout];
 }
 
 /*!

AppKit/CPTableColumn.j

@@ -28,9 +28,8 @@
 
 @import "CPTextField.j"
 
-@global CPTableViewColumnDidResizeNotification
-
 @class _CPTableColumnHeaderView
+@class CPTableView
 
 CPTableColumnNoResizing         = 0;
 CPTableColumnAutoresizingMask   = 1 << 0;
@@ -185,7 +184,7 @@ CPTableColumnUserResizingMask   = 1 << 1;
         [tableView tile];
 
         if (!_disableResizingPosting)
-            [self _postDidResizeNotificationWithOldWidth:oldWidth];
+            [[self tableView] _didResizeTableColumn:self oldWidth:oldWidth];
     }
 }
 
@@ -416,7 +415,7 @@ CPTableColumnUserResizingMask   = 1 << 1;
     to be invoked with row equal to -1 in cases where no actual row is involved but the table
     view needs to get some generic cell info.
 */
-- (id)dataViewForRow:(int)aRowIndex
+- (id)dataViewForRow:(CPInteger)aRowIndex
 {
     return [self dataView];
 }
@@ -538,19 +537,6 @@ CPTableColumnUserResizingMask   = 1 << 1;
     return _headerToolTip;
 }
 
-/*!
-    @ignore
-*/
-- (void)_postDidResizeNotificationWithOldWidth:(float)oldWidth
-{
-    [[self tableView] _didResizeTableColumn:self];
-
-    [[CPNotificationCenter defaultCenter]
-    postNotificationName:CPTableViewColumnDidResizeNotification
-                  object:[self tableView]
-                userInfo:@{ @"CPTableColumn": self, @"CPOldWidth": oldWidth }];
-}
-
 @end
 
 @implementation CPTableColumnValueBinder : CPBinder
@@ -595,7 +581,7 @@ CPTableColumnUserResizingMask   = 1 << 1;
 
 @implementation CPTableColumn (Bindings)
 
-+ (id)_binderClassForBinding:(CPString)aBinding
++ (Class)_binderClassForBinding:(CPString)aBinding
 {
     if (aBinding == CPValueBinding)
         return [CPTableColumnValueBinder class];
@@ -828,7 +814,7 @@ var CPTableColumnIdentifierKey   = @"CPTableColumnIdentifierKey",
 /*!
     @ignore
 */
-- (id)dataCellForRow:(int)row
+- (id)dataCellForRow:(CPInteger)row
 {
     [CPException raise:CPUnsupportedMethodException
                 reason:@"dataCellForRow: is not supported. Use -dataViewForRow:row instead."];

AppKit/CPTableHeaderView.j

@@ -43,7 +43,7 @@
     return @"columnHeader";
 }
 
-+ (id)themeAttributes
++ (CPDictionary)themeAttributes
 {
     return @{
             @"background-color": [CPNull null],
@@ -53,11 +53,11 @@
             @"text-color": [CPNull null],
             @"font": [CPNull null],
             @"text-shadow-color": [CPNull null],
-            @"text-shadow-offset": CGSizeMakeZero(),
+            @"text-shadow-offset": CGSizeMakeZero()
         };
 }
 
-- (void)initWithFrame:(CGRect)frame
+- (id)initWithFrame:(CGRect)frame
 {
     self = [super initWithFrame:frame];
 
@@ -246,11 +246,12 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
     return @"tableHeaderRow";
 }
 
-+ (id)themeAttributes
++ (CPDictionary)themeAttributes
 {
     return @{
             @"background-color": [CPNull null],
             @"divider-color": [CPColor grayColor],
+            @"divider-thickness": 1.0
         };
 }
 
@@ -286,7 +287,7 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
     return [_tableView columnAtPoint:CGPointMake(aPoint.x, aPoint.y)];
 }
 
-- (CGRect)headerRectOfColumn:(int)aColumnIndex
+- (CGRect)headerRectOfColumn:(CPInteger)aColumnIndex
 {
     var headerRect = CGRectMakeCopy([self bounds]),
         columnRect = [_tableView rectOfColumn:aColumnIndex];
@@ -307,7 +308,7 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
     return _drawsColumnLines;
 }
 
-- (CGRect)_cursorRectForColumn:(int)column
+- (CGRect)_cursorRectForColumn:(CPInteger)column
 {
     if (column == -1 || !([_tableView._tableColumns[column] resizingMask] & CPTableColumnUserResizingMask))
         return CGRectMakeZero();
@@ -333,7 +334,7 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
         var headerView = [_tableView._tableColumns[column] headerView];
         [headerView setThemeState:CPThemeStateHighlighted];
 
-        if (_tableView._editingColumn == column)
+        if (_tableView._editingCellIndex || _tableView._editingColumn == column)
             [[self window] makeFirstResponder:_tableView];
     }
 
@@ -382,7 +383,7 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
         _mouseDownLocation = currentLocation;
         _activeColumn = columnIndex;
 
-        [_tableView _sendDelegateDidMouseDownInHeader:columnIndex];
+        [_tableView _sendDelegateMouseDownInHeaderOfTableColumn:columnIndex];
 
         if (shouldResize)
             [self startResizingTableColumn:columnIndex at:currentLocation];
@@ -416,13 +417,13 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
     [CPApp setTarget:self selector:@selector(trackMouse:) forNextEventMatchingMask:CPLeftMouseDraggedMask | CPLeftMouseUpMask untilDate:nil inMode:nil dequeue:YES];
 }
 
-- (void)startTrackingTableColumn:(int)aColumnIndex at:(CGPoint)aPoint
+- (void)startTrackingTableColumn:(CPInteger)aColumnIndex at:(CGPoint)aPoint
 {
     _lastDragDestinationColumnIndex = -1;
     [self _setPressedColumn:aColumnIndex];
 }
 
-- (BOOL)continueTrackingTableColumn:(int)aColumnIndex at:(CGPoint)aPoint
+- (BOOL)continueTrackingTableColumn:(CPInteger)aColumnIndex at:(CGPoint)aPoint
 {
     if ([self _shouldDragTableColumn:aColumnIndex at:aPoint])
     {
@@ -443,21 +444,21 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
     return YES;
 }
 
-- (BOOL)_shouldStopTrackingTableColumn:(int)aColumnIndex at:(CGPoint)aPoint
+- (BOOL)_shouldStopTrackingTableColumn:(CPInteger)aColumnIndex at:(CGPoint)aPoint
 {
     return _isTrackingColumn && _activeColumn === aColumnIndex &&
         CGRectContainsPoint([self headerRectOfColumn:aColumnIndex], aPoint);
 }
 
-- (void)stopTrackingTableColumn:(int)aColumnIndex at:(CGPoint)aPoint
+- (void)stopTrackingTableColumn:(CPInteger)aColumnIndex at:(CGPoint)aPoint
 {
     [self _setPressedColumn:CPNotFound];
     [self _updateResizeCursor:[CPApp currentEvent]];
 }
 
-- (BOOL)_shouldDragTableColumn:(int)aColumnIndex at:(CGPoint)aPoint
+- (BOOL)_shouldDragTableColumn:(CPInteger)aColumnIndex at:(CGPoint)aPoint
 {
-    return ABS(aPoint.x - _mouseDownLocation.x) >= 10.0 && [_tableView _shouldReorderColumn:aColumnIndex toColumn:-1];
+    return ABS(aPoint.x - _mouseDownLocation.x) >= 10.0 && [_tableView _sendDelegateShouldReorderColumn:aColumnIndex toColumn:-1];
 }
 
 - (CGRect)_headerRectOfLastVisibleColumn
@@ -503,9 +504,9 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
     [dragWindow setFrame:frame];
 }
 
-- (void)_moveColumn:(int)aFromIndex toColumn:(int)aToIndex
+- (void)_moveColumn:(CPInteger)aFromIndex toColumn:(CPInteger)aToIndex
 {
-    if ([_tableView _shouldReorderColumn:aFromIndex toColumn:aToIndex])
+    if ([_tableView _sendDelegateShouldReorderColumn:aFromIndex toColumn:aToIndex])
     {
         [_tableView moveColumn:aFromIndex toColumn:aToIndex];
         _activeColumn = aToIndex;
@@ -580,7 +581,7 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
     [_tableView _enqueueDraggingViews];
 }
 
-- (BOOL)shouldResizeTableColumn:(int)aColumnIndex at:(CGPoint)aPoint
+- (BOOL)shouldResizeTableColumn:(CPInteger)aColumnIndex at:(CGPoint)aPoint
 {
     if (_isResizing)
         return YES;
@@ -591,7 +592,7 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
     return [_tableView allowsColumnResizing] && CGRectContainsPoint([self _cursorRectForColumn:aColumnIndex], aPoint);
 }
 
-- (void)startResizingTableColumn:(int)aColumnIndex at:(CGPoint)aPoint
+- (void)startResizingTableColumn:(CPInteger)aColumnIndex at:(CGPoint)aPoint
 {
     _isResizing = YES;
 
@@ -601,7 +602,7 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
     [_tableView setDisableAutomaticResizing:YES];
 }
 
-- (void)continueResizingTableColumn:(int)aColumnIndex at:(CGPoint)aPoint
+- (void)continueResizingTableColumn:(CPInteger)aColumnIndex at:(CGPoint)aPoint
 {
     var tableColumn = [[_tableView tableColumns] objectAtIndex:aColumnIndex],
         newWidth = [tableColumn width] + aPoint.x - _previousTrackingLocation.x;
@@ -621,10 +622,10 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
     }
 }
 
-- (void)stopResizingTableColumn:(int)aColumnIndex at:(CGPoint)aPoint
+- (void)stopResizingTableColumn:(CPInteger)aColumnIndex at:(CGPoint)aPoint
 {
     var tableColumn = [[_tableView tableColumns] objectAtIndex:aColumnIndex];
-    [tableColumn _postDidResizeNotificationWithOldWidth:_columnOldWidth];
+    [_tableView _didResizeTableColumn:tableColumn oldWidth:_columnOldWidth];
     [tableColumn setDisableResizingPosting:NO];
     [_tableView setDisableAutomaticResizing:NO];
 
@@ -679,7 +680,8 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
 - (void)layoutSubviews
 {
     var tableColumns = [_tableView tableColumns],
-        count = [tableColumns count];
+        count = [tableColumns count],
+        lineThickness = [self currentValueForThemeAttribute:@"divider-thickness"];
 
     for (var i = 0; i < count; i++)
     {
@@ -689,7 +691,7 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
 
         // Make space for the gridline on the right.
         frame.origin.x -= 0.5;
-        frame.size.width -= 1.0;
+        frame.size.width -= lineThickness;
         frame.size.height -= 0.5;
         // Note: we're not adding in intercell spacing here. This setting only affects the regular
         // table cell data views, not the header. Verified in Cocoa on March 29th, 2011.
@@ -714,9 +716,10 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
         tableColumns = [_tableView tableColumns],
         exposedTableColumns = _tableView._exposedColumns,
         firstIndex = [exposedTableColumns firstIndex],
-        exposedRange = CPMakeRange(firstIndex, [exposedTableColumns lastIndex] - firstIndex + 1);
+        exposedRange = CPMakeRange(firstIndex, [exposedTableColumns lastIndex] - firstIndex + 1),
+        lineThickness = [self currentValueForThemeAttribute:@"divider-thickness"];
 
-    CGContextSetLineWidth(context, 1);
+    CGContextSetLineWidth(context, lineThickness);
     CGContextSetStrokeColor(context, [self currentValueForThemeAttribute:@"divider-color"]);
 
     [exposedColumnIndexes getIndexes:columnsArray maxCount:-1 inIndexRange:exposedRange];
@@ -735,8 +738,8 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
 
         columnMaxX = CGRectGetMaxX(columnToStroke);
 
-        CGContextMoveToPoint(context, FLOOR(columnMaxX) - 0.5, ROUND(CGRectGetMinY(columnToStroke)));
-        CGContextAddLineToPoint(context, FLOOR(columnMaxX) - 0.5, ROUND(CGRectGetMaxY(columnToStroke)) - 1.0);
+        CGContextMoveToPoint(context, FLOOR(columnMaxX) - 0.5 * lineThickness, ROUND(CGRectGetMinY(columnToStroke)));
+        CGContextAddLineToPoint(context, FLOOR(columnMaxX) - 0.5 * lineThickness, ROUND(CGRectGetMaxY(columnToStroke)) - 1.0);
     }
 
     CGContextClosePath(context);

AppKit/CPText.j

@@ -28,3 +28,14 @@ CPFormFeedCharacter             = "\u000c";
 CPCarriageReturnCharacter       = "\u000d";
 CPBackTabCharacter              = "\u0019";
 CPDeleteCharacter               = "\u007f";
+
+CPIllegalTextMovement           = 0;
+CPOtherTextMovement             = 0;
+CPReturnTextMovement            = 16;
+CPTabTextMovement               = 17;
+CPBacktabTextMovement           = 18;
+CPLeftTextMovement              = 19;
+CPRightTextMovement             = 20;
+CPUpTextMovement                = 21;
+CPDownTextMovement              = 22;
+CPCancelTextMovement            = 23;

AppKit/CPTheme.j

@@ -26,6 +26,7 @@
 @import <Foundation/CPKeyedUnarchiver.j>
 
 @class CPView
+@class _CPThemeAttribute
 
 var CPThemesByName          = { },
     CPThemeDefaultTheme     = nil,
@@ -240,7 +241,7 @@ var CPThemesByName          = { },
     @param aClass The themed class in which to look for the attribute
     @return       A value or nil
 */
-- (id)valueForAttributeWithName:(CPString)aName inState:(CPThemeState)aState forClass:(id)aClass
+- (id)valueForAttributeWithName:(CPString)aName inState:(ThemeState)aState forClass:(id)aClass
 {
     var attribute = [self attributeWithName:aName forClass:aClass];
 
@@ -314,6 +315,164 @@ var CPThemeNameKey          = @"CPThemeNameKey",
 
 @end
 
+/*!
+ * ThemeStates are immutable objects representing a particular ThemeState.  Applications should never be creating
+ * ThemeStates directly but should instead use the CPThemeState function.
+ */
+function ThemeState(stateNames)
+{
+    var stateNameKeys = [];
+    this._stateNames = {};
+
+    for (key in stateNames)
+    {
+        if (!stateNames.hasOwnProperty(key))
+            continue;
+        if (key !== 'normal')
+        {
+            this._stateNames[key] = true;
+            stateNameKeys.push(key);
+        }
+    }
+
+    if (stateNameKeys.length === 0)
+    {
+        stateNameKeys.push('normal');
+        this._stateNames['normal'] = true;
+    }
+
+    stateNameKeys.sort();
+    this._stateNameString = stateNameKeys[0];
+
+    var stateNameLength = stateNameKeys.length;
+    for (var stateIndex = 1; stateIndex < stateNameLength; stateIndex++)
+        this._stateNameString = this._stateNameString + "+" + stateNameKeys[stateIndex];
+    this._stateNameCount = stateNameLength;
+}
+
+ThemeState.prototype.toString = function()
+{
+    return this._stateNameString;
+}
+
+ThemeState.prototype.hasThemeState = function(aState)
+{
+    if (!aState || !aState._stateNames)
+        return false;
+
+    // We can do this in O(n) because both states have their stateNames already sorted.
+    for (var stateName in aState._stateNames)
+    {
+        if (!aState._stateNames.hasOwnProperty(stateName))
+            continue;
+
+        if (!this._stateNames[stateName])
+            return false;
+    }
+    return true;
+}
+
+ThemeState.prototype.isSubsetOf = function(aState)
+{
+    if (aState._stateNameCount < this._stateNameCount)
+        return false;
+
+    for (var key in this._stateNames)
+    {
+        if (!this._stateNames.hasOwnProperty(key))
+            continue;
+
+        if (!aState._stateNames[key])
+            return false;
+    }
+    return true;
+}
+
+ThemeState.prototype.without = function(aState)
+{
+    if (!aState || aState === [CPNull null])
+        return this;
+
+    var newStates = {};
+    for (var stateName in this._stateNames)
+    {
+        if (!this._stateNames.hasOwnProperty(stateName))
+            continue;
+
+        if (!aState._stateNames[stateName])
+            newStates[stateName] = true;
+    }
+
+    return ThemeState._cacheThemeState(new ThemeState(newStates));
+}
+
+ThemeState.prototype.and  = function(aState)
+{
+    return CPThemeState(this, aState);
+}
+
+var CPThemeStates = {};
+
+ThemeState._cacheThemeState = function(aState)
+{
+    // We do this caching so themeState equality works.  Basically, doing CPThemeState('foo+bar') === CPThemeState('bar', 'foo') will return true.
+    var themeState = CPThemeStates[String(aState)];
+    if (themeState === undefined)
+    {
+        themeState = aState;
+        CPThemeStates[String(themeState)] = themeState;
+    }
+    return themeState;
+}
+
+/*!
+ * This method can be called in multiple ways:
+ *    CPThemeState('state1') - creates a new CPThemeState that corresponds to the string 'state1'
+ *    CPThemeState('state1', 'state2') - creates a new composite CPThemeState made up of both 'state1' or 'state2'
+ *    CPThemeState('state1+state2') - The same as CPThemeState('state1', 'state2')
+ *    CPThemeState(state1, state2) - creates a new composite CPThemeState made up of state1 and state2
+ *                                   where state1 and state2 are not strings but are themselves CPThemeStates.
+ */
+function CPThemeState()
+{
+    if (arguments.length < 1)
+        throw "CPThemeState() must be called with at least one string argument";
+
+    var themeState;
+    if (arguments.length === 1 && typeof arguments[0] === 'string')
+    {
+        themeState = CPThemeStates[arguments[0]];
+        if (themeState !== undefined)
+            return themeState;
+    }
+
+    var stateNames = {};
+    for (var argIndex = 0; argIndex < arguments.length; argIndex++)
+    {
+        if (arguments[argIndex] === [CPNull null] || !arguments[argIndex])
+            continue;
+
+        if (typeof arguments[argIndex] === 'object')
+        {
+            for (var stateName in arguments[argIndex]._stateNames)
+            {
+                if (!arguments[argIndex]._stateNames.hasOwnProperty(stateName))
+                    continue;
+                stateNames[stateName] = true;
+            }
+        }
+        else
+        {
+            var allNames = arguments[argIndex].split('+');
+            for (var nameIndex = 0; nameIndex < allNames.length; nameIndex++)
+                stateNames[allNames[nameIndex]] = true;
+        }
+    }
+
+    themeState = ThemeState._cacheThemeState(new ThemeState(stateNames));
+    return themeState;
+}
+
 @implementation _CPThemeKeyedUnarchiver : CPKeyedUnarchiver
 {
     CPBundle    _bundle;
@@ -341,88 +500,28 @@ var CPThemeNameKey          = @"CPThemeNameKey",
 
 @end
 
-var CPThemeStates       = {},
-    CPThemeStateNames   = {},
-    CPThemeStateCount   = 0;
-
-function CPThemeState(aStateName)
-{
-    var state = CPThemeStates[aStateName];
-
-    if (state === undefined)
-    {
-        if (aStateName.indexOf('+') === -1)
-            state = 1 << CPThemeStateCount++;
-        else
-        {
-            var state = 0,
-                states = aStateName.split('+'),
-                count = states.length;
-
-            while (count--)
-            {
-                var stateName = states[count],
-                    individualState = CPThemeStates[stateName];
-
-                if (individualState === undefined)
-                {
-                    individualState = 1 << CPThemeStateCount++;
-                    CPThemeStates[stateName] = individualState;
-                    CPThemeStateNames[individualState] = stateName;
-                }
-
-                state |= individualState;
-            }
-        }
-
-        CPThemeStates[aStateName] = state;
-        CPThemeStateNames[state] = aStateName;
-    }
-
-    return state;
-}
-
-function CPThemeStateName(aState)
-{
-    var name = CPThemeStateNames[aState];
-
-    if (name !== undefined)
-        return name;
-
-    if (!(aState & (aState - 1)))
-        return "";
-
-    var state = 1,
-        name = "";
-
-    for (; state < aState; state <<= 1)
-        if (aState & state)
-            name += (name.length === 0 ? '' : '+') + CPThemeStateNames[state];
-
-    CPThemeStateNames[aState] = name;
-
-    return name;
-}
-
-CPThemeStateNames[0]         = "normal";
-CPThemeStateNormal           = CPThemeStates["normal"] = 0;
-CPThemeStateDisabled         = CPThemeState("disabled");
-CPThemeStateHovered          = CPThemeState("hovered");
-CPThemeStateHighlighted      = CPThemeState("highlighted");
-CPThemeStateSelected         = CPThemeState("selected");
-CPThemeStateTableDataView    = CPThemeState("tableDataView");
-CPThemeStateSelectedDataView = CPThemeState("selectedTableDataView");
-CPThemeStateGroupRow         = CPThemeState("CPThemeStateGroupRow");
-CPThemeStateBezeled          = CPThemeState("bezeled");
-CPThemeStateBordered         = CPThemeState("bordered");
-CPThemeStateEditable         = CPThemeState("editable");
-CPThemeStateEditing          = CPThemeState("editing");
-CPThemeStateVertical         = CPThemeState("vertical");
-CPThemeStateDefault          = CPThemeState("default");
-CPThemeStateCircular         = CPThemeState("circular");
-CPThemeStateAutocompleting   = CPThemeState("autocompleting");
-CPThemeStateMainWindow       = CPThemeState("mainWindow");
-CPThemeStateKeyWindow        = CPThemeState("keyWindow");
+CPThemeStateNormal              = CPThemeState("normal");
+CPThemeStateDisabled            = CPThemeState("disabled");
+CPThemeStateHovered             = CPThemeState("hovered");
+CPThemeStateHighlighted         = CPThemeState("highlighted");
+CPThemeStateSelected            = CPThemeState("selected");
+CPThemeStateTableDataView       = CPThemeState("tableDataView");
+CPThemeStateSelectedDataView    = CPThemeState("selectedTableDataView");
+CPThemeStateGroupRow            = CPThemeState("CPThemeStateGroupRow");
+CPThemeStateBezeled             = CPThemeState("bezeled");
+CPThemeStateBordered            = CPThemeState("bordered");
+CPThemeStateEditable            = CPThemeState("editable");
+CPThemeStateEditing             = CPThemeState("editing");
+CPThemeStateVertical            = CPThemeState("vertical");
+CPThemeStateDefault             = CPThemeState("default");
+CPThemeStateCircular            = CPThemeState("circular");
+CPThemeStateAutocompleting      = CPThemeState("autocompleting");
+CPThemeStateFirstResponder      = CPThemeState("firstResponder");
+CPThemeStateMainWindow          = CPThemeState("mainWindow");
+CPThemeStateKeyWindow           = CPThemeState("keyWindow");
+CPThemeStateControlSizeRegular  = CPThemeState("controlSizeRegular");
+CPThemeStateControlSizeSmall    = CPThemeState("controlSizeSmall");
+CPThemeStateControlSizeMini     = CPThemeState("controlSizeMini");
 
 @implementation _CPThemeAttribute : CPObject
 {
@@ -464,11 +563,6 @@ CPThemeStateKeyWindow        = CPThemeState("keyWindow");
     return [_values count] > 0;
 }
 
-- (BOOL)isTrivial
-{
-    return ([_values count] === 1) && (Number([_values allKeys][0]) === CPThemeStateNormal);
-}
-
 - (void)setValue:(id)aValue
 {
     _cache = {};
@@ -479,7 +573,7 @@ CPThemeStateKeyWindow        = CPThemeState("keyWindow");
         _values = @{ String(CPThemeStateNormal): aValue };
 }
 
-- (void)setValue:(id)aValue forState:(CPThemeState)aState
+- (void)setValue:(id)aValue forState:(ThemeState)aState
 {
     _cache = { };
 
@@ -494,44 +588,34 @@ CPThemeStateKeyWindow        = CPThemeState("keyWindow");
     return [self valueForState:CPThemeStateNormal];
 }
 
-- (id)valueForState:(CPThemeState)aState
+- (id)valueForState:(ThemeState)aState
 {
-    var value = _cache[aState];
+    var stateName = String(aState),
+        value = _cache[stateName];
 
     // This can be nil.
     if (value !== undefined)
         return value;
 
-    value = [_values objectForKey:String(aState)];
+    value = [_values objectForKey:stateName];
 
-    // If we don't have a value, and we have a non-normal state...
-    if ((value === undefined || value === nil) && aState !== CPThemeStateNormal)
+    if (value === undefined || value === nil)
     {
-        // If this is a composite state (not a power of 2), find the closest partial subset match.
-        if (aState & (aState - 1))
+        // If this is a composite state, find the closest partial subset match.
+        if (aState._stateNameCount > 1)
         {
-            var highestOneCount = 0,
-                states = [_values allKeys],
-                count = states.length;
+            var states = [_values allKeys],
+                count = states.length,
+                largestThemeState = 0;
 
             while (count--)
             {
-                // states[count] is a string!
-                var state = Number(states[count]);
+                var stateObject = CPThemeState(states[count]);
 
-                // A & B = A iff A < B
-                if ((state & aState) === state)
+                if (stateObject.isSubsetOf(aState) && stateObject._stateNameCount > largestThemeState)
                 {
-                    var oneCount = cachedNumberOfOnes[state];
-
-                    if (oneCount === undefined)
-                        oneCount = numberOfOnes(state);
-
-                    if (oneCount > highestOneCount)
-                    {
-                        highestOneCount = oneCount;
-                        value = [_values objectForKey:String(state)];
-                    }
+                    value = [_values objectForKey:states[count]];
+                    largestThemeState = stateObject._stateNameCount;
                 }
             }
         }
@@ -554,7 +638,7 @@ CPThemeStateKeyWindow        = CPThemeState("keyWindow");
             value = nil;
     }
 
-    _cache[aState] = value;
+    _cache[stateName] = value;
 
     return value;
 }
@@ -596,10 +680,10 @@ CPThemeStateKeyWindow        = CPThemeState("keyWindow");
 
         if ([aCoder containsValueForKey:@"value"])
         {
-            var state = CPThemeStateNormal;
+            var state = String(CPThemeStateNormal);
 
             if ([aCoder containsValueForKey:@"state"])
-                state = CPThemeState([aCoder decodeObjectForKey:@"state"]);
+                state = [aCoder decodeObjectForKey:@"state"];
 
             [_values setObject:[aCoder decodeObjectForKey:"value"] forKey:state];
         }
@@ -613,7 +697,7 @@ CPThemeStateKeyWindow        = CPThemeState("keyWindow");
             {
                 var key = keys[count];
 
-                [_values setObject:[encodedValues objectForKey:key] forKey:CPThemeState(key)];
+                [_values setObject:[encodedValues objectForKey:key] forKey:key];
             }
         }
     }
@@ -633,8 +717,8 @@ CPThemeStateKeyWindow        = CPThemeState("keyWindow");
     {
         var onlyKey = keys[0];
 
-        if (Number(onlyKey) !== CPThemeStateNormal)
-            [aCoder encodeObject:CPThemeStateName(Number(onlyKey)) forKey:@"state"];
+        if (onlyKey !== String(CPThemeStateNormal))
+            [aCoder encodeObject:onlyKey forKey:@"state"];
 
         [aCoder encodeObject:[_values objectForKey:onlyKey] forKey:@"value"];
     }
@@ -646,7 +730,7 @@ CPThemeStateKeyWindow        = CPThemeState("keyWindow");
         {
             var key = keys[count];
 
-            [encodedValues setObject:[_values objectForKey:key] forKey:CPThemeStateName(Number(key))];
+            [encodedValues setObject:[_values objectForKey:key] forKey:key];
         }
 
         [aCoder encodeObject:encodedValues forKey:@"values"];
@@ -655,35 +739,6 @@ CPThemeStateKeyWindow        = CPThemeState("keyWindow");
 
 @end
 
-var cachedNumberOfOnes = [  0 /*000000*/, 1 /*000001*/, 1 /*000010*/, 2 /*000011*/, 1 /*000100*/, 2 /*000101*/, 2 /*000110*/,
-                            3 /*000111*/, 1 /*001000*/, 2 /*001001*/, 2 /*001010*/, 3 /*001011*/, 2 /*001100*/, 3 /*001101*/,
-                            3 /*001110*/, 4 /*001111*/, 1 /*010000*/, 2 /*010001*/, 2 /*010010*/, 3 /*010011*/, 2 /*010100*/,
-                            3 /*010101*/, 3 /*010110*/, 4 /*010111*/, 2 /*011000*/, 3 /*011001*/, 3 /*011010*/, 4 /*011011*/,
-                            3 /*011100*/, 4 /*011101*/, 4 /*011110*/, 5 /*011111*/, 1 /*100000*/, 2 /*100001*/, 2 /*100010*/,
-                            3 /*100011*/, 2 /*100100*/, 3 /*100101*/, 3 /*100110*/, 4 /*100111*/, 2 /*101000*/, 3 /*101001*/,
-                            3 /*101010*/, 4 /*101011*/, 3 /*101100*/, 4 /*101101*/, 4 /*101110*/, 5 /*101111*/, 2 /*110000*/,
-                            3 /*110001*/, 3 /*110010*/, 4 /*110011*/, 3 /*110100*/, 4 /*110101*/, 4 /*110110*/, 5 /*110111*/,
-                            3 /*111000*/, 4 /*111001*/, 4 /*111010*/, 5 /*111011*/, 4 /*111100*/, 5 /*111101*/, 5 /*111110*/,
-                            6 /*111111*/ ];
-
-var numberOfOnes = function(aNumber)
-{
-    var count = 0,
-        slot = aNumber;
-
-    while (aNumber)
-    {
-        ++count;
-        aNumber &= (aNumber - 1);
-    }
-
-    cachedNumberOfOnes[slot] = count;
-
-    return count;
-};
-
-numberOfOnes.displayName = "numberOfOnes";
-
 function CPThemeAttributeEncode(aCoder, aThemeAttribute)
 {
     var values = aThemeAttribute._values,
@@ -694,7 +749,7 @@ function CPThemeAttributeEncode(aCoder, aThemeAttribute)
     {
         var state = [values allKeys][0];
 
-        if (Number(state) === 0)
+        if (state === String(CPThemeStateNormal))
         {
             [aCoder encodeObject:[values objectForKey:state] forKey:key];
 
@@ -723,7 +778,7 @@ function CPThemeAttributeDecode(aCoder, anAttributeName, aDefaultValue, aTheme,
     {
         var attribute = [aCoder decodeObjectForKey:key];
 
-        if (!attribute.isa || ![attribute isKindOfClass:[_CPThemeAttribute class]])
+        if (!attribute || !attribute.isa || ![attribute isKindOfClass:[_CPThemeAttribute class]])
         {
             var themeAttribute = [[_CPThemeAttribute alloc] initWithName:anAttributeName defaultValue:aDefaultValue];
 

AppKit/CPTokenField.j

@@ -33,7 +33,34 @@
 @import "CPTextField.j"
 @import "CPWindow_Constants.j"
 
+@class _CPTokenFieldTokenCloseButton
+@class _CPTokenFieldTokenDisclosureButton
+
 @global CPApp
+@global CPTextFieldDidFocusNotification
+@global CPTextFieldDidBlurNotification
+
+
+// TODO: should be conform to protocol CPTextFieldDelegate
+@protocol CPTokenFieldDelegate <CPObject>
+
+@optional
+- (BOOL)tokenField:(CPTokenField)tokenField hasMenuForRepresentedObject:(id)representedObject;
+- (CPArray)tokenField:(CPTokenField)tokenField completionsForSubstring:(CPString)substring indexOfToken:(CPInteger)tokenIndex indexOfSelectedItem:(CPInteger)selectedIndex;
+- (CPArray)tokenField:(CPTokenField)tokenField shouldAddObjects:(CPArray)tokens atIndex:(CPUInteger)index;
+- (CPMenu)tokenField:(CPTokenField)tokenField menuForRepresentedObject:(id)representedObject;
+- (CPString )tokenField:(CPTokenField)tokenField displayStringForRepresentedObject:(id)representedObject;
+- (id)tokenField:(CPTokenField)tokenField representedObjectForEditingString:(CPString)editingString;
+
+@end
+
+var CPTokenFieldDelegate_tokenField_hasMenuForRepresentedObject_                                = 1 << 1,
+    CPTokenFieldDelegate_tokenField_completionsForSubstring_indexOfToken_indexOfSelectedItem_   = 1 << 2,
+    CPTokenFieldDelegate_tokenField_shouldAddObjects_atIndex_                                   = 1 << 3,
+    CPTokenFieldDelegate_tokenField_menuForRepresentedObject_                                   = 1 << 4,
+    CPTokenFieldDelegate_tokenField_displayStringForRepresentedObject_                          = 1 << 5,
+    CPTokenFieldDelegate_tokenField_representedObjectForEditingString_                          = 1 << 6;
+
 
 #if PLATFORM(DOM)
 
@@ -62,23 +89,26 @@ CPTokenFieldDeleteButtonType     = 1;
 
 @implementation CPTokenField : CPTextField
 {
-    CPScrollView        _tokenScrollView;
-    int                 _shouldScrollTo;
+    CPScrollView                _tokenScrollView;
+    int                         _shouldScrollTo;
 
-    CPRange             _selectedRange;
+    CPRange                     _selectedRange;
 
-    _CPAutocompleteMenu _autocompleteMenu;
-    CGRect              _inputFrame;
+    _CPAutocompleteMenu         _autocompleteMenu;
+    CGRect                      _inputFrame;
 
-    CPTimeInterval      _completionDelay;
+    CPTimeInterval              _completionDelay;
 
-    CPCharacterSet      _tokenizingCharacterSet @accessors(property=tokenizingCharacterSet);
+    CPCharacterSet              _tokenizingCharacterSet @accessors(property=tokenizingCharacterSet);
 
-    CPEvent             _mouseDownEvent;
+    CPEvent                     _mouseDownEvent;
 
-    BOOL                _shouldNotifyTarget;
+    BOOL                        _shouldNotifyTarget;
 
-    int                 _buttonType @accessors(property=buttonType);
+    int                         _buttonType @accessors(property=buttonType);
+
+    id <CPTokenFieldDelegate>   _tokenFieldDelegate;
+    unsigned                    _implementedTokenFieldDelegateMethods;
 }
 
 + (CPCharacterSet)defaultTokenizingCharacterSet
@@ -96,7 +126,7 @@ CPTokenFieldDeleteButtonType     = 1;
     return "tokenfield";
 }
 
-+ (id)themeAttributes
++ (CPDictionary)themeAttributes
 {
     return @{ @"editor-inset": CGInsetMakeZero() };
 }
@@ -138,6 +168,41 @@ CPTokenFieldDeleteButtonType     = 1;
     [self addSubview:_tokenScrollView];
 }
 
+#pragma mark -
+#pragma mark Delegate methods
+
+/*!
+    Set the delegate of the receiver
+*/
+- (void)setDelegate:(id <CPTokenFieldDelegate>)aDelegate
+{
+    if (_tokenFieldDelegate === aDelegate)
+        return;
+
+    _tokenFieldDelegate = aDelegate;
+    _implementedTokenFieldDelegateMethods = 0;
+
+    if ([_tokenFieldDelegate respondsToSelector:@selector(tokenField:hasMenuForRepresentedObject:)])
+        _implementedTokenFieldDelegateMethods |= CPTokenFieldDelegate_tokenField_hasMenuForRepresentedObject_;
+
+    if ([_tokenFieldDelegate respondsToSelector:@selector(tokenField:completionsForSubstring:indexOfToken:indexOfSelectedItem:)])
+        _implementedTokenFieldDelegateMethods |= CPTokenFieldDelegate_tokenField_completionsForSubstring_indexOfToken_indexOfSelectedItem_;
+
+    if ([_tokenFieldDelegate respondsToSelector:@selector(tokenField:shouldAddObjects:atIndex:)])
+        _implementedTokenFieldDelegateMethods |= CPTokenFieldDelegate_tokenField_shouldAddObjects_atIndex_;
+
+    if ([_tokenFieldDelegate respondsToSelector:@selector(tokenField:menuForRepresentedObject:)])
+        _implementedTokenFieldDelegateMethods |= CPTokenFieldDelegate_tokenField_menuForRepresentedObject_;
+
+    if ([_tokenFieldDelegate respondsToSelector:@selector(tokenField:displayStringForRepresentedObject:)])
+        _implementedTokenFieldDelegateMethods |= CPTokenFieldDelegate_tokenField_displayStringForRepresentedObject_;
+
+    if ([_tokenFieldDelegate respondsToSelector:@selector(tokenField:representedObjectForEditingString:)])
+        _implementedTokenFieldDelegateMethods |= CPTokenFieldDelegate_tokenField_representedObjectForEditingString_;
+
+    [super setDelegate:_tokenFieldDelegate];
+}
+
 - (_CPAutocompleteMenu)_autocompleteMenu
 {
     if (!_autocompleteMenu)
@@ -319,6 +384,9 @@ CPTokenFieldDeleteButtonType     = 1;
 
 - (BOOL)becomeFirstResponder
 {
+    if (![super becomeFirstResponder])
+        return NO;
+
 #if PLATFORM(DOM)
     if (CPTokenFieldInputOwner && [CPTokenFieldInputOwner window] !== [self window])
         [[CPTokenFieldInputOwner window] makeFirstResponder:nil];
@@ -392,6 +460,8 @@ CPTokenFieldDeleteButtonType     = 1;
             element.focus();
             CPTokenFieldInputOwner = self;
         }, 0.0);
+
+        [self textDidFocus:[CPNotification notificationWithName:CPTextFieldDidFocusNotification object:self userInfo:nil]];
     }, 0.0);
 
     [[[self window] platformWindow] _propagateCurrentDOMEvent:YES];
@@ -424,12 +494,14 @@ CPTokenFieldDeleteButtonType     = 1;
     if (_shouldNotifyTarget)
     {
         _shouldNotifyTarget = NO;
-        [self textDidEndEditing:[CPNotification notificationWithName:CPControlTextDidEndEditingNotification object:self userInfo:nil]];
+        [self textDidEndEditing:[CPNotification notificationWithName:CPControlTextDidEndEditingNotification object:self userInfo:@{"CPTextMovement": [self _currentTextMovement]}]];
 
         if ([self sendsActionOnEndEditing])
             [self sendAction:[self action] to:[self target]];
     }
 
+    [self textDidBlur:[CPNotification notificationWithName:CPTextFieldDidBlurNotification object:self userInfo:nil]];
+
     return YES;
 }
 
@@ -639,7 +711,7 @@ CPTokenFieldDeleteButtonType     = 1;
     [[self _tokens] makeObjectsPerformSelector:@selector(setEditable:) withObject:shouldBeEditable];
 }
 
-- (void)sendAction:(SEL)anAction to:(id)anObject
+- (BOOL)sendAction:(SEL)anAction to:(id)anObject
 {
     _shouldNotifyTarget = NO;
     [super sendAction:anAction to:anObject];
@@ -647,7 +719,7 @@ CPTokenFieldDeleteButtonType     = 1;
 
 // Incredible hack to disable supers implementation
 // so it cannot change our object value and break the tokenfield
-- (void)_setStringValue:(id)aValue
+- (BOOL)_setStringValue:(CPString)aValue
 {
 }
 
@@ -1179,12 +1251,10 @@ CPTokenFieldDeleteButtonType     = 1;
 */
 - (CPArray)_completionsForSubstring:(CPString)substring indexOfToken:(int)tokenIndex indexOfSelectedItem:(int)selectedIndex
 {
-    if ([[self delegate] respondsToSelector:@selector(tokenField:completionsForSubstring:indexOfToken:indexOfSelectedItem:)])
-    {
-        return [[self delegate] tokenField:self completionsForSubstring:substring indexOfToken:tokenIndex indexOfSelectedItem:selectedIndex];
-    }
+    if (!(_implementedTokenFieldDelegateMethods & CPTokenFieldDelegate_tokenField_completionsForSubstring_indexOfToken_indexOfSelectedItem_))
+        return [];
 
-    return [];
+    return [_tokenFieldDelegate tokenField:self completionsForSubstring:substring indexOfToken:tokenIndex indexOfSelectedItem:selectedIndex];
 }
 
 /*!
@@ -1193,6 +1263,7 @@ CPTokenFieldDeleteButtonType     = 1;
 - (CGPoint)_completionOrigin:(_CPAutocompleteMenu)anAutocompleteMenu
 {
     var relativeFrame = _inputFrame ? [[_tokenScrollView documentView] convertRect:_inputFrame toView:self ] : [self bounds];
+
     return CGPointMake(CGRectGetMinX(relativeFrame), CGRectGetMaxY(relativeFrame));
 }
 
@@ -1206,13 +1277,12 @@ CPTokenFieldDeleteButtonType     = 1;
 */
 - (CPString)_displayStringForRepresentedObject:(id)representedObject
 {
-    if ([[self delegate] respondsToSelector:@selector(tokenField:displayStringForRepresentedObject:)])
+    if (_implementedTokenFieldDelegateMethods & CPTokenFieldDelegate_tokenField_displayStringForRepresentedObject_)
     {
-        var stringForRepresentedObject = [[self delegate] tokenField:self displayStringForRepresentedObject:representedObject];
+        var stringForRepresentedObject = [_tokenFieldDelegate tokenField:self displayStringForRepresentedObject:representedObject];
+
         if (stringForRepresentedObject !== nil)
-        {
             return stringForRepresentedObject;
-        }
     }
 
     return representedObject;
@@ -1229,10 +1299,10 @@ CPTokenFieldDeleteButtonType     = 1;
 */
 - (CPArray)_shouldAddObjects:(CPArray)tokens atIndex:(int)index
 {
-    var  delegate = [self delegate];
-    if ([delegate respondsToSelector:@selector(tokenField:shouldAddObjects:atIndex:)])
+    if (_implementedTokenFieldDelegateMethods & CPTokenFieldDelegate_tokenField_shouldAddObjects_atIndex_)
     {
-        var approvedObjects = [delegate tokenField:self shouldAddObjects:tokens atIndex:index];
+        var approvedObjects = [_tokenFieldDelegate tokenField:self shouldAddObjects:tokens atIndex:index];
+
         if (approvedObjects !== nil)
             return approvedObjects;
     }
@@ -1251,10 +1321,10 @@ CPTokenFieldDeleteButtonType     = 1;
 */
 - (id)_representedObjectForEditingString:(CPString)aString
 {
-    var delegate = [self delegate];
-    if ([delegate respondsToSelector:@selector(tokenField:representedObjectForEditingString:)])
+    if (_implementedTokenFieldDelegateMethods & CPTokenFieldDelegate_tokenField_representedObjectForEditingString_)
     {
-        var token = [delegate tokenField:self representedObjectForEditingString:aString];
+        var token = [_tokenFieldDelegate tokenField:self representedObjectForEditingString:aString];
+
         if (token !== nil && token !== undefined)
             return token;
         // If nil was returned, assume the string is the represented object. The alternative would have been
@@ -1266,23 +1336,22 @@ CPTokenFieldDeleteButtonType     = 1;
 
 - (BOOL)_hasMenuForRepresentedObject:(id)aRepresentedObject
 {
-    var delegate = [self delegate];
-    if ([delegate respondsToSelector:@selector(tokenField:hasMenuForRepresentedObject:)] &&
-        [delegate respondsToSelector:@selector(tokenField:menuForRepresentedObject:)])
-        return [delegate tokenField:self hasMenuForRepresentedObject:aRepresentedObject];
+    if ((_implementedTokenFieldDelegateMethods & CPTokenFieldDelegate_tokenField_hasMenuForRepresentedObject_) &&
+        (_implementedTokenFieldDelegateMethods & CPTokenFieldDelegate_tokenField_menuForRepresentedObject_))
+        return [_tokenFieldDelegate tokenField:self hasMenuForRepresentedObject:aRepresentedObject];
 
     return NO;
 }
 
 - (CPMenu)_menuForRepresentedObject:(id)aRepresentedObject
 {
-    var delegate = [self delegate];
-    if ([delegate respondsToSelector:@selector(tokenField:hasMenuForRepresentedObject:)] &&
-        [delegate respondsToSelector:@selector(tokenField:menuForRepresentedObject:)])
+    if ((_implementedTokenFieldDelegateMethods & CPTokenFieldDelegate_tokenField_hasMenuForRepresentedObject_) &&
+        (_implementedTokenFieldDelegateMethods & CPTokenFieldDelegate_tokenField_menuForRepresentedObject_))
     {
-        var hasMenu = [delegate tokenField:self hasMenuForRepresentedObject:aRepresentedObject];
+        var hasMenu = [_tokenFieldDelegate tokenField:self hasMenuForRepresentedObject:aRepresentedObject];
+
         if (hasMenu)
-            return [delegate tokenField:self menuForRepresentedObject:aRepresentedObject] || nil;
+            return [_tokenFieldDelegate tokenField:self menuForRepresentedObject:aRepresentedObject] || nil;
     }
 
     return nil;
@@ -1383,12 +1452,15 @@ CPTokenFieldDeleteButtonType     = 1;
     [self setNeedsLayout];
 }
 
-- (BOOL)setThemeState:(CPThemeState)aState
+- (BOOL)setThemeState:(ThemeState)aState
 {
+   if (aState.isa && [aState isKindOfClass:CPArray])
+        aState = CPThemeState.apply(null, aState);
+
     var r = [super setThemeState:aState];
 
     // Share hover state with the disclosure and delete buttons.
-    if (aState & CPThemeStateHovered)
+    if (aState.hasThemeState(CPThemeStateHovered))
     {
         [_disclosureButton setThemeState:CPThemeStateHovered];
         [_deleteButton setThemeState:CPThemeStateHovered];
@@ -1397,12 +1469,15 @@ CPTokenFieldDeleteButtonType     = 1;
     return r;
 }
 
-- (BOOL)unsetThemeState:(CPThemeState)aState
+- (BOOL)unsetThemeState:(ThemeState)aState
 {
+   if (aState.isa && [aState isKindOfClass:CPArray])
+        aState = CPThemeState.apply(null, aState);
+
     var r = [super unsetThemeState:aState];
 
     // Share hover state with the disclosure and delete button.
-    if (aState & CPThemeStateHovered)
+    if (aState.hasThemeState(CPThemeStateHovered))
     {
         [_disclosureButton unsetThemeState:CPThemeStateHovered];
         [_deleteButton unsetThemeState:CPThemeStateHovered];
@@ -1535,7 +1610,7 @@ CPTokenFieldDeleteButtonType     = 1;
 {
 }
 
-+ (id)themeAttributes
++ (CPDictionary)themeAttributes
 {
     var attributes = [CPButton themeAttributes];
 
@@ -1565,7 +1640,7 @@ CPTokenFieldDeleteButtonType     = 1;
 {
 }
 
-+ (id)themeAttributes
++ (CPDictionary)themeAttributes
 {
     var attributes = [CPButton themeAttributes];
 

AppKit/CPToolbar.j

@@ -30,6 +30,15 @@
 
 @global CPApp
 
+var CPToolbarDelegate_toolbar_itemForItemIdentifier_willBeInsertedIntoToolbar_  = 1 << 0,
+    CPToolbarDelegate_toolbarAllowedItemIdentifiers_                            = 1 << 1,
+    CPToolbarDelegate_toolbarDefaultItemIdentifiers_                            = 1 << 2,
+    CPToolbarDelegate_toolbarDidRemoveItem_                                     = 1 << 3,
+    CPToolbarDelegate_toolbarSelectableItemIdentifiers_                         = 1 << 4,
+    CPToolbarDelegate_toolbarWillAddItem_                                       = 1 << 5;
+
+
+@typedef CPToolbarDisplayMode
 /*
     @global
     @group CPToolbarDisplayMode
@@ -51,7 +60,7 @@ CPToolbarDisplayModeIconOnly            = 2;
 */
 CPToolbarDisplayModeLabelOnly           = 3;
 
-
+@typedef CPToolbarSizeMode
 CPToolbarSizeModeDefault                = 0;
 CPToolbarSizeModeRegular                = 1;
 CPToolbarSizeModeSmall                  = 2;
@@ -59,6 +68,20 @@ CPToolbarSizeModeSmall                  = 2;
 var CPToolbarsByIdentifier              = nil,
     CPToolbarConfigurationsByIdentifier = nil;
 
+
+@protocol CPToolbarDelegate <CPObject>
+
+@optional
+- (CPToolbarItem)toolbar:(CPToolbar)toolbar itemForItemIdentifier:(CPString)itemIdentifier willBeInsertedIntoToolbar:(BOOL)flag;
+- (CPArray)toolbarAllowedItemIdentifiers:(CPToolbar)toolbar;
+- (CPArray)toolbarDefaultItemIdentifiers:(CPToolbar)toolbar;
+- (void)toolbarDidRemoveItem:(CPNotification)notification;
+- (CPArray)toolbarSelectableItemIdentifiers:(CPToolbar)toolbar;
+- (void)toolbarWillAddItem:(CPNotification)notification;
+
+@end
+
+
 /*!
     @ingroup appkit
     @class CPToolbar
@@ -89,14 +112,15 @@ var CPToolbarsByIdentifier              = nil,
 @implementation CPToolbar : CPObject
 {
     CPString                _identifier;
-    CPToolbarDisplayMode    _displayMode @accessors(property=displayMode);
+    CPToolbarDisplayMode    _displayMode                @accessors(property=displayMode);
     BOOL                    _showsBaselineSeparator;
     BOOL                    _allowsUserCustomization;
     BOOL                    _isVisible;
-    int                     _sizeMode @accessors(property=sizeMode);
+    CPToolbarSizeMode       _sizeMode                   @accessors(property=sizeMode);
     int                     _desiredHeight;
 
-    id                      _delegate;
+    id <CPToolbarDelegate>  _delegate;
+    unsigned                _implementedDelegateMethods;
 
     CPArray                 _itemIdentifiers;
 
@@ -165,15 +189,6 @@ var CPToolbarsByIdentifier              = nil,
     return self;
 }
 
-
-/*!
-    Sets the toolbar's display mode. NOT YET IMPLEMENTED.
-*/
-- (void)setDisplayMode:(CPToolbarDisplayMode)aDisplayMode
-{
-
-}
-
 /*!
     Returns the toolbar's identifier
 */
@@ -248,6 +263,25 @@ var CPToolbarsByIdentifier              = nil,
         return;
 
     _delegate = aDelegate;
+    _implementedDelegateMethods = 0;
+
+    if ([_delegate respondsToSelector:@selector(toolbar:itemForItemIdentifier:willBeInsertedIntoToolbar:)])
+        _implementedDelegateMethods |= CPToolbarDelegate_toolbar_itemForItemIdentifier_willBeInsertedIntoToolbar_;
+
+    if ([_delegate respondsToSelector:@selector(toolbarAllowedItemIdentifiers:)])
+        _implementedDelegateMethods |= CPToolbarDelegate_toolbarAllowedItemIdentifiers_;
+
+    if ([_delegate respondsToSelector:@selector(toolbarDefaultItemIdentifiers:)])
+        _implementedDelegateMethods |= CPToolbarDelegate_toolbarDefaultItemIdentifiers_;
+
+    if ([_delegate respondsToSelector:@selector(toolbarDidRemoveItem:)])
+        _implementedDelegateMethods |= CPToolbarDelegate_toolbarDidRemoveItem_;
+
+    if ([_delegate respondsToSelector:@selector(toolbarSelectableItemIdentifiers:)])
+        _implementedDelegateMethods |= CPToolbarDelegate_toolbarSelectableItemIdentifiers_;
+
+    if ([_delegate respondsToSelector:@selector(toolbarWillAddItem:)])
+        _implementedDelegateMethods |= CPToolbarDelegate_toolbarWillAddItem_;
 
     [self _reloadToolbarItems];
 }
@@ -298,9 +332,9 @@ var CPToolbarsByIdentifier              = nil,
     // _defaultItems may have been loaded from Cib
     _itemIdentifiers = [_defaultItems valueForKey:@"itemIdentifier"] || [];
 
-    if ([_delegate respondsToSelector:@selector(toolbarDefaultItemIdentifiers:)])
+    if ([self _delegateRespondsToToolbarDefaultItemIdentifiers])
     {
-        var itemIdentifiersFromDelegate = [_delegate toolbarDefaultItemIdentifiers:self];
+        var itemIdentifiersFromDelegate = [self _sendDelegateToolbarDefaultItemIdentifiers];
 
         // If we get items both from the Cib and from the delegate method, put the delegate items before the
         // Cib ones.
@@ -325,7 +359,7 @@ var CPToolbarsByIdentifier              = nil,
             item = [_identifiedItems objectForKey:identifier];
 
         if (!item && _delegate)
-            item = [_delegate toolbar:self itemForItemIdentifier:identifier willBeInsertedIntoToolbar:YES];
+            item = [self _sendDelegateItemForItemIdentifier:identifier willBeInsertedIntoToolbar:YES];
 
         item = [item copy];
 
@@ -403,12 +437,14 @@ var CPToolbarsByIdentifier              = nil,
 - (id)_itemForItemIdentifier:(CPString)identifier willBeInsertedIntoToolbar:(BOOL)toolbar
 {
     var item = [_identifiedItems objectForKey:identifier];
+
     if (!item)
     {
         item = [CPToolbarItem _standardItemWithItemIdentifier:identifier];
+
         if (_delegate && !item)
         {
-            item = [[_delegate toolbar:self itemForItemIdentifier:identifier willBeInsertedIntoToolbar:toolbar] copy];
+            item = [[self _sendDelegateItemForItemIdentifier:identifier willBeInsertedIntoToolbar:toolbar] copy];
             if (!item)
                 [CPException raise:CPInvalidArgumentException
                             reason:@"Toolbar delegate " + _delegate + " returned nil toolbar item for identifier " + identifier];
@@ -433,11 +469,11 @@ var CPToolbarsByIdentifier              = nil,
 /* @ignore */
 - (id)_defaultToolbarItems
 {
-    if (!_defaultItems && [_delegate respondsToSelector:@selector(toolbarDefaultItemIdentifiers:)])
+    if (!_defaultItems && [self _delegateRespondsToToolbarDefaultItemIdentifiers])
     {
         _defaultItems = [];
 
-        var identifiers = [_delegate toolbarDefaultItemIdentifiers:self],
+        var identifiers = [self _sendDelegateToolbarDefaultItemIdentifiers],
             index = 0,
             count = [identifiers count];
 
@@ -603,7 +639,7 @@ var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)
     return @"toolbar-view";
 }
 
-+ (id)themeAttributes
++ (CPDictionary)themeAttributes
 {
     return @{
             @"item-margin": 10.0,
@@ -809,7 +845,6 @@ var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)
     var index = 0,
         count = _visibleItems.length,
         x = contentInset.left,
-        contentInset = [self valueForThemeAttribute:@"content-inset"],
         y = contentInset.top;
 
     for (; index < count; ++index)
@@ -1225,7 +1260,7 @@ var LABEL_MARGIN    = 2.0;
     [_labelField setTextShadowColor:[self FIXME_labelShadowColor]];
 }
 
-- (void)sendAction:(SEL)anAction to:(id)aSender
+- (BOOL)sendAction:(SEL)anAction to:(id)aSender
 {
     [CPApp sendAction:anAction to:aSender from:_toolbarItem];
 }
@@ -1249,3 +1284,89 @@ var LABEL_MARGIN    = 2.0;
 }
 
 @end
+
+
+@implementation CPToolbar (CPToolbarDelegate)
+
+/*
+    @ignore
+    Return YES if the delegate implements toolbarDefaultItemIdentifiers:
+*/
+- (BOOL)_delegateRespondsToToolbarDefaultItemIdentifiers
+{
+    return _implementedDelegateMethods & CPToolbarDelegate_toolbarDefaultItemIdentifiers_;
+}
+
+/*!
+    @ignore
+    Call the delegate toolbar:itemForItemIdentifier:willBeInsertedIntoToolbar:
+*/
+- (CPToolbarItem)_sendDelegateItemForItemIdentifier:(CPString)itemIdentifier willBeInsertedIntoToolbar:(BOOL)flag
+{
+    if (!(_implementedDelegateMethods & CPToolbarDelegate_toolbar_itemForItemIdentifier_willBeInsertedIntoToolbar_))
+        return nil;
+
+    return [_delegate toolbar:self itemForItemIdentifier:itemIdentifier willBeInsertedIntoToolbar:flag];
+}
+
+/*!
+    @ignore
+    Call the delegate toolbarAllowedItemIdentifiers:
+*/
+- (CPArray)_sendDelegateToolbarAllowedItemIdentifiers
+{
+    if (!(_implementedDelegateMethods & CPToolbarDelegate_toolbarAllowedItemIdentifiers_))
+        return [];
+
+    return [_delegate toolbarAllowedItemIdentifiers:self];
+}
+
+/*!
+    @ignore
+    Call the delegate toolbarDefaultItemIdentifiers:
+*/
+- (CPArray)_sendDelegateToolbarDefaultItemIdentifiers
+{
+    if (!(_implementedDelegateMethods & CPToolbarDelegate_toolbarDefaultItemIdentifiers_))
+        return [];
+
+    return [_delegate toolbarDefaultItemIdentifiers:self];
+}
+
+/*!
+    @ignore
+    Call the delegate toolbarDidRemoveItem:
+*/
+- (void)_sendDelegateToolbarDidRemoveItem:(CPNotification)notification
+{
+    if (!(_delegate & CPToolbarDelegate_toolbarDidRemoveItem_))
+        return;
+
+    [_delegate toolbarDidRemoveItem:notification];
+}
+
+/*!
+    @ignore
+    Call the delegate toolbarSelectableItemIdentifiers:
+*/
+- (CPArray)_sendDelegateToolbarSelectableItemIdentifiers
+{
+    if (!(_implementedDelegateMethods & CPToolbarDelegate_toolbarSelectableItemIdentifiers_))
+        return [];
+
+    return [_delegate toolbarSelectableItemIdentifiers:self];
+}
+
+/*!
+    @ignore
+    Call the delegate toolbarWillAddItem:
+*/
+- (void)_sendDelegateToolbarWillAddItem:(CPNotification)notification
+{
+    if (!(_delegate & CPToolbarDelegate_toolbarWillAddItem_))
+        return;
+
+    [_delegate toolbarWillAddItem:notification];
+}
+
+@end

AppKit/CPViewAnimation.j

@@ -105,7 +105,7 @@ CPViewAnimationFadeOutEffect = @"CPViewAnimationFadeOutEffect";
     [super startAnimation];
 }
 
-- (void)setCurrentProgress:(CPAnimationProgress)progress
+- (void)setCurrentProgress:(float)progress
 {
     [super setCurrentProgress:progress];
 

AppKit/CPViewController.j

@@ -210,6 +210,7 @@ var CPViewControllerCachedCibs;
             [cibOwner viewControllerDidLoadCib:self];
 
         _isLoading = NO;
+        _isLazy = NO;
         [self _viewDidLoad];
     }
     else if (_isLazy)

AppKit/CPWebView.j

@@ -23,6 +23,9 @@
 @import "CPView.j"
 @import "CPScrollView.j"
 
+@class CPWebScriptObject
+
+@typedef Window
 
 // FIXME: implement these where possible:
 /*
@@ -93,7 +96,7 @@ CPWebViewAppKitScrollMaxPollCount                  = 3;
     CPScrollView        _scrollView;
     CPView              _frameView;
 
-    IFrame              _iframe;
+    DOMElement          _iframe;
     CPString            _mainFrameURL;
     CPArray             _backwardStack;
     CPArray             _forwardStack;

AppKit/CPWindow/CPWindow.j

@@ -50,9 +50,36 @@
 
 @class CPMenu
 @class CPProgressIndicator
+@class CPToolbar
+@class CPWindowController
+@class _CPWindowFrameAnimation
 
 @global CPApp
 
+@typedef _CPWindowFullPlatformWindowSession
+
+
+@protocol CPWindowDelegate <CPObject>
+
+@optional
+- (BOOL)windowShouldClose:(CPWindow)aWindow;
+- (CPUndoManager)windowWillReturnUndoManager:(CPWindow)window;
+- (void)windowDidBecomeKey:(CPNotification)aNotification;
+- (void)windowDidBecomeMain:(CPNotification)aNotification;
+- (void)windowDidEndSheet:(CPNotification)aNotification;
+- (void)windowDidMove:(CPNotification)aNotification;
+- (void)windowDidResignKey:(CPNotification)aNotification;
+- (void)windowDidResignMain:(CPNotification)aNotification;
+- (void)windowDidResize:(CPNotification)aNotification;
+- (void)windowWillBeginSheet:(CPNotification)aNotification;
+- (void)windowWillClose:(CPWindow)aWindow;
+
+@end
+
+var CPWindowDelegate_windowShouldClose_             = 1 << 1
+    CPWindowDelegate_windowWillReturnUndoManager_   = 1 << 2,
+    CPWindowDelegate_windowWillClose_               = 1 << 3;
+
 var CPWindowSaveImage       = nil,
 
     CPWindowResizeTime      = 0.2,
@@ -171,7 +198,8 @@ var CPWindowActionMessageKeys = [
     CPResponder                         _firstResponder;
     CPResponder                         _initialFirstResponder;
     BOOL                                _hasBecomeKeyWindow;
-    id                                  _delegate;
+    id <CPWindowDelegate>               _delegate;
+    unsigned                            _implementedDelegateMethods;
 
     CPString                            _title;
 
@@ -205,8 +233,6 @@ var CPWindowActionMessageKeys = [
 
     unsigned                            _autoresizingMask;
 
-    BOOL                                _delegateRespondsToWindowWillReturnUndoManagerSelector;
-
     BOOL                                _isFullPlatformWindow;
     _CPWindowFullPlatformWindowSession  _fullPlatformWindowSession;
 
@@ -248,7 +274,7 @@ CPTexturedBackgroundWindowMask
     @param aStyleMask a style mask
     @return the initialized window
 */
-- (id)initWithContentRect:(CGRect)aContentRect styleMask:(unsigned int)aStyleMask
+- (id)initWithContentRect:(CGRect)aContentRect styleMask:(unsigned)aStyleMask
 {
     self = [super init];
 
@@ -735,6 +761,10 @@ CPTexturedBackgroundWindowMask
     }
 }
 
+/*
+    Constrain a frame so that the window remains at least partially visible on screen,
+    moving or resizing the frame as necessary.
+*/
 - (CGRect)_constrainFrame:(CGRect)aFrame toUsableScreenWidth:(BOOL)constrainWidth andHeight:(BOOL)constrainHeight
 {
     var frame = CGRectMakeCopy(aFrame);
@@ -759,7 +789,7 @@ CPTexturedBackgroundWindowMask
         if (CGRectGetWidth(frame) > usableWidth)
         {
             frame.origin.x = CGRectGetMinX(usableRect);
-            frame.size.width = usableWidth;
+            frame.size.width = MAX(usableWidth, _minSize.width);
         }
     }
 
@@ -778,13 +808,20 @@ CPTexturedBackgroundWindowMask
         if (CGRectGetHeight(frame) > usableHeight)
         {
             frame.origin.y = CGRectGetMinY(usableRect);
-            frame.size.height = usableHeight;
+            frame.size.height = MAX(usableHeight, _minSize.height);
         }
     }
 
     return frame;
 }
 
+/*
+    Constrain the origin of a frame such that:
+
+    - The window view's minimum resize width is kept onscreen at the left/right of the window.
+    - The top of the window is kept below the top of the usable content.
+    - The top of the contentView + CPWindowMinVisibleVerticalMargin is kept above the bottom of the usable content.
+*/
 - (CGRect)_constrainOriginOfFrame:(CGRect)aFrame
 {
     var frame = CGRectMakeCopy(aFrame);
@@ -792,19 +829,20 @@ CPTexturedBackgroundWindowMask
     if (!_constrainsToUsableScreen || !_isVisible)
         return frame;
 
-    /*
-        - CPWindowMinVisibleHorizontalMargin is kept onscreen at the left/right of the window.
-        - The top of the window is kept below the top of the usable content.
-        - The top of the contentView + CPWindowMinVisibleVerticalMargin is kept above the bottom of the usable content.
-    */
     var usableRect = [_platformWindow usableContentFrame],
-        maxUsableY = CGRectGetMaxY(usableRect) - CGRectGetMinY([_contentView frame]) - CPWindowMinVisibleVerticalMargin;
+        minimumSize = [_windowView _minimumResizeSize];
 
-    frame.origin.x = MAX(frame.origin.x, CGRectGetMinX(usableRect) + CPWindowMinVisibleHorizontalMargin - CGRectGetWidth(frame));
-    frame.origin.x = MIN(frame.origin.x, CGRectGetMaxX(usableRect) - CPWindowMinVisibleHorizontalMargin);
+    // First constrain x so that at least CPWindowMinVisibleHorizontalMargin is visible on the right
+    frame.origin.x = MAX(frame.origin.x, CGRectGetMinX(usableRect) + minimumSize.width - CGRectGetWidth(frame));
 
+    // Now constrain x so that at least CPWindowMinVisibleHorizontalMargin is visible on the left
+    frame.origin.x = MIN(frame.origin.x, CGRectGetMaxX(usableRect) - minimumSize.width);
+
+    // Now constrain y so that it is below the top of the usable content
     frame.origin.y = MAX(frame.origin.y, CGRectGetMinY(usableRect));
-    frame.origin.y = MIN(frame.origin.y, maxUsableY);
+
+    // Finally constrain y so that at least CPWindowMinVisibleHorizontalMargin is visible at the bottom
+    frame.origin.y = MIN(frame.origin.y, CGRectGetMaxY(usableRect) - CGRectGetMinY([_contentView frame]) - CPWindowMinVisibleVerticalMargin);
 
     return frame;
 }
@@ -869,16 +907,21 @@ CPTexturedBackgroundWindowMask
 
 - (void)_orderFront
 {
+
 #if PLATFORM(DOM)
     // -dw- if a sheet is clicked, the parent window should come up too
     if (_isSheet)
         [_parentView orderFront:self];
 
-    if (!_isVisible)
-        [self _setFrame:_frame display:YES animate:NO constrainWidth:YES constrainHeight:YES];
+    // Save the boolean since it will be updated in the method order:window:relativeTo:
+    var wasVisible = _isVisible;
 
     [_platformWindow orderFront:self];
     [_platformWindow order:CPWindowAbove window:self relativeTo:nil];
+
+    // setFrame is set after ordering the window as this method can send some notifications
+    if (!wasVisible)
+        [self _setFrame:_frame display:YES animate:NO constrainWidth:YES constrainHeight:YES];
 #endif
 
     if (!CPApp._keyWindow)
@@ -899,6 +942,23 @@ CPTexturedBackgroundWindowMask
 {
 }
 
+/*
+    Called when the window is displayed in the DOM
+*/
+- (void)_windowWillBeAddedToTheDOM
+{
+    [[self contentView] _addObservers];
+}
+
+/*
+    Called when the window is removed in the DOM
+*/
+- (void)_windowWillBeRemovedFromTheDOM
+{
+    [[self contentView] _removeObservers];
+}
+
+
 /*
     Makes the receiver the last window in the screen ordering.
     @param aSender the object that requested this
@@ -945,6 +1005,7 @@ CPTexturedBackgroundWindowMask
     [_platformWindow order:CPWindowOut window:self relativeTo:nil];
 #endif
 
+    [self makeFirstResponder:nil];
     [self _updateMainAndKeyWindows];
 }
 
@@ -1021,6 +1082,23 @@ CPTexturedBackgroundWindowMask
     [[CPNotificationCenter defaultCenter] postNotificationName:CPWindowResizeStyleGlobalChangeNotification object:nil];
 }
 
+/*!
+    If set to NO, platform window (virtual screen) resizes will not attempt to move/resize user windows.
+    to the usable area.
+*/
++ (void)setConstrainWindowsToUsableScreen:(BOOL)shouldConstrain
+{
+    CPWindowConstrainToScreen = shouldConstrain;
+}
+
+/*!
+    Return whether platform window (virtual screen) resizes constrain user windows to the usable area.
+*/
++ (BOOL)constrainWindowsToUsableScreen
+{
+    return CPWindowConstrainToScreen;
+}
+
 - (void)_didReceiveResizeStyleChange:(CPNotification)aNotification
 {
     [_windowView setShowsResizeIndicator:_styleMask & CPResizableWindowMask];
@@ -1081,7 +1159,7 @@ CPTexturedBackgroundWindowMask
 */
 - (void)setContentView:(CPView)aView
 {
-    if (_contentView)
+    if (_contentView && _contentView !== aView)
         [_contentView removeFromSuperview];
 
     var bounds = CGRectMake(0.0, 0.0, CGRectGetWidth(_frame), CGRectGetHeight(_frame));
@@ -1314,8 +1392,11 @@ CPTexturedBackgroundWindowMask
     Sets the delegate for the window. Passing \c nil will just remove the window's current delegate.
     @param aDelegate an object to respond to the various delegate methods of CPWindow
 */
-- (void)setDelegate:(id)aDelegate
+- (void)setDelegate:(id <CPWindowDelegate>)aDelegate
 {
+    if (_delegate === aDelegate)
+        return;
+
     var defaultCenter = [CPNotificationCenter defaultCenter];
 
     [defaultCenter removeObserver:_delegate name:CPWindowDidResignKeyNotification object:self];
@@ -1328,7 +1409,16 @@ CPTexturedBackgroundWindowMask
     [defaultCenter removeObserver:_delegate name:CPWindowDidEndSheetNotification object:self];
 
     _delegate = aDelegate;
-    _delegateRespondsToWindowWillReturnUndoManagerSelector = [_delegate respondsToSelector:@selector(windowWillReturnUndoManager:)];
+    _implementedDelegateMethods = 0;
+
+    if ([_delegate respondsToSelector:@selector(windowShouldClose:)])
+        _implementedDelegateMethods |= CPWindowDelegate_windowShouldClose_;
+
+    if ([_delegate respondsToSelector:@selector(windowWillReturnUndoManager:)])
+        _implementedDelegateMethods |= CPWindowDelegate_windowWillReturnUndoManager_;
+
+    if ([_delegate respondsToSelector:@selector(windowWillClose:)])
+        _implementedDelegateMethods |= CPWindowDelegate_windowWillClose_;
 
     if ([_delegate respondsToSelector:@selector(windowDidResignKey:)])
         [defaultCenter
@@ -1670,11 +1760,17 @@ CPTexturedBackgroundWindowMask
         switch (type)
         {
             case CPLeftMouseDown:
+
+                // This is needed when a doubleClick occurs when the sheet is closing or opening
+                if (!_parentWindow)
+                    return;
+
                 [_windowView mouseDown:anEvent];
 
                 // -dw- if the window is clicked, the sheet should come to front, and become key,
                 // and the window should be immediately behind
                 [sheet makeKeyAndOrderFront:self];
+
                 return;
 
             case CPMouseMoved:
@@ -1724,10 +1820,14 @@ CPTexturedBackgroundWindowMask
                     // even that we just moved it to a new first responder.
                     [[[anEvent window] platformWindow] _propagateCurrentDOMEvent:NO]
 #endif
-                }
 
+                }
                 return didTabBack;
             }
+            else if ([anEvent charactersIgnoringModifiers] == CPEscapeFunctionKey && [self _processKeyboardUIKey:anEvent])
+            {
+                return;
+            }
 
             [[self firstResponder] keyDown:anEvent];
 
@@ -1770,6 +1870,12 @@ CPTexturedBackgroundWindowMask
             if (_leftMouseDownView !== _firstResponder && [_leftMouseDownView acceptsFirstResponder])
                 [self makeFirstResponder:_leftMouseDownView];
 
+            var keyWindow = [CPApp keyWindow];
+
+            // This is only when we move from a platform to another one
+            if ([keyWindow platformWindow] != [self platformWindow])
+                [self makeKeyAndOrderFront:self];
+
             [CPApp activateIgnoringOtherApps:YES];
 
             var theWindow = [anEvent window],
@@ -1897,6 +2003,7 @@ CPTexturedBackgroundWindowMask
     _hasBecomeKeyWindow = YES;
 
     [_windowView noteKeyWindowStateChanged];
+    [_contentView _notifyWindowDidBecomeKey];
 
     [[CPNotificationCenter defaultCenter]
         postNotificationName:CPWindowDidBecomeKeyNotification
@@ -1965,6 +2072,7 @@ CPTexturedBackgroundWindowMask
         CPApp._keyWindow = nil;
 
     [_windowView noteKeyWindowStateChanged];
+    [_contentView _notifyWindowDidResignKey];
 
     [[CPNotificationCenter defaultCenter]
         postNotificationName:CPWindowDidResignKeyNotification
@@ -2208,9 +2316,9 @@ CPTexturedBackgroundWindowMask
 
     // The Cocoa docs say that if both the delegate and the window implement
     // windowShouldClose:, only the delegate receives the message.
-    if ([_delegate respondsToSelector:@selector(windowShouldClose:)])
+    if ([self _delegateRespondsToWindowShouldClose])
     {
-        if (![_delegate windowShouldClose:self])
+        if (![self _sendDelegateWindowShouldClose])
             return;
     }
     else if ([self respondsToSelector:@selector(windowShouldClose:)])
@@ -2266,8 +2374,7 @@ CPTexturedBackgroundWindowMask
 */
 - (void)close
 {
-    if ([_delegate respondsToSelector:@selector(windowWillClose:)])
-        [_delegate windowWillClose:self];
+    [self _sendDelegateWindowWillClose];
 
     [[CPNotificationCenter defaultCenter] postNotificationName:CPWindowWillCloseNotification object:self];
 
@@ -2400,7 +2507,7 @@ CPTexturedBackgroundWindowMask
                 if (currentWindow === self || currentWindow === menuWindow)
                     continue;
 
-                if ([currentWindow isVisible] && [currentWindow canBecomeKeyWindow])
+                if ([currentWindow isVisible] && [currentWindow canBecomeKeyWindow] && [currentWindow platformWindow] == [keyWindow platformWindow])
                 {
                     [currentWindow makeKeyWindow];
                     break;
@@ -2466,7 +2573,7 @@ CPTexturedBackgroundWindowMask
     // If this has an owner, dump it!
     [[aToolbar _window] setToolbar:nil];
 
-    // This is no longer out toolbar.
+    // This is no longer our toolbar.
     [_toolbar _setWindow:nil];
 
     _toolbar = aToolbar;
@@ -2602,6 +2709,23 @@ CPTexturedBackgroundWindowMask
     [attachedSheet setFrame:sheetFrame display:YES animate:NO];
 }
 
+- (void)_previousSheetIsClosedNotification:(CPNotification)aNotification
+{
+    [[CPNotificationCenter defaultCenter] removeObserver:self name:CPWindowDidEndSheetNotification object:self];
+
+    var sheet = _sheetContext[@"nextSheet"],
+        modalDelegate =_sheetContext[@"nextModalDelegate"],
+        endSelector = _sheetContext[@"nextEndSelector"],
+        contextInfo = _sheetContext[@"nextContextInfo"];
+
+    // Needed, because when the notification CPWindowDidEndSheetNotification is sent, the sheetContext is not up to date...
+    setTimeout(function()
+    {
+        [sheet._windowView _enableSheet:YES inWindow:self];
+        [self _attachSheet:sheet modalDelegate:modalDelegate didEndSelector:endSelector contextInfo:contextInfo];
+    }, 0)
+}
+
 /*
     Starting point for sheet session, called from CPApplication beginSheet:
 */
@@ -2610,9 +2734,24 @@ CPTexturedBackgroundWindowMask
 {
     if (_sheetContext)
     {
-        [CPException raise:CPInternalInconsistencyException
-            reason:@"The target window of beginSheet: already has a sheet, did you forget orderOut: ?"];
-        return;
+        // Here we wait till the current sheet is closed
+        if (_sheetContext[@"isClosing"])
+        {
+            // Here we save the next sheet to open
+            _sheetContext[@"nextSheet"] = aSheet;
+            _sheetContext[@"nextModalDelegate"] = aModalDelegate;
+            _sheetContext[@"nextEndSelector"] = didEndSelector;
+            _sheetContext[@"nextContextInfo"] = contextInfo;
+
+            [[CPNotificationCenter defaultCenter] addObserver:self selector:@selector(_previousSheetIsClosedNotification:) name:CPWindowDidEndSheetNotification object:self];
+            return;
+        }
+        else
+        {
+            [CPException raise:CPInternalInconsistencyException
+                reason:@"The target window of beginSheet: already has a sheet, did you forget orderOut: ?"];
+            return;
+        }
     }
 
     _sheetContext = {
@@ -2664,7 +2803,12 @@ CPTexturedBackgroundWindowMask
 */
 - (void)_detachSheetWindow
 {
+    if (_sheetContext["isClosing"])
+        return;
+
     _sheetContext["isAttached"] = NO;
+    _sheetContext["isClosing"] = YES;
+    _sheetContext["opened"] = NO;
 
     // A timer seems to be necessary for the animation to work correctly.
     // It would be ideal to block here and spin the event loop, until attach is complete.
@@ -2797,12 +2941,6 @@ CPTexturedBackgroundWindowMask
         return;
     }
 
-    if (_sheetContext["isClosing"])
-        return;
-
-    _sheetContext["opened"] = NO;
-    _sheetContext["isClosing"] = YES;
-
     // The parent window can be orderedOut to disable the sheet animate out, as in Cocoa
     if ([self isVisible])
     {
@@ -2949,20 +3087,9 @@ CPTexturedBackgroundWindowMask
     if ([selectors count] <= 0)
         return NO;
 
-    if (character !== CPEscapeFunctionKey)
-    {
-        var selector = [selectors objectAtIndex:0];
-        return [[self firstResponder] tryToPerform:selector with:self];
-    }
-    else
-    {
-        /*
-            Cocoa sends complete: for the escape key (instead of the default cancelOperation:). This is also the only action that is not sent directly to the first responder, but through doCommandBySelector. The difference is that doCommandBySelector: will also send the action to the window and application delegates.
-        */
-        [[self firstResponder] doCommandBySelector:@selector(complete:)];
-    }
+    var selector = [selectors objectAtIndex:0];
 
-    return NO;
+    return [[self firstResponder] tryToPerform:selector with:self];
 }
 
 - (void)_dirtyKeyViewLoop
@@ -3259,6 +3386,66 @@ var keyViewComparator = function(lhs, rhs, context)
     return CPOrderedDescending;
 };
 
+
+@implementation CPWindow (CPWindowDelegate)
+
+/*!
+    @ignore
+    Check if the delegate implements windowWillReturnUndoManager:
+*/
+- (BOOL)_delegateRespondsToWindowWillUndoManager
+{
+    return _implementedDelegateMethods & CPWindowDelegate_windowWillReturnUndoManager_;
+}
+
+/*!
+    @ignore
+    Check if the delegate implements windowShouldClose
+*/
+- (BOOL)_delegateRespondsToWindowShouldClose
+{
+    return _implementedDelegateMethods & CPWindowDelegate_windowShouldClose_
+}
+
+/*!
+    @ignore
+    Call delegate windowShouldClose:
+*/
+- (BOOL)_sendDelegateWindowShouldClose
+{
+    if (!(_implementedDelegateMethods & CPWindowDelegate_windowShouldClose_))
+        return YES;
+
+    return [_delegate windowShouldClose:self];
+}
+
+/*!
+    @ignore
+    Call delegate windowWillReturnUndoManager:
+*/
+- (BOOL)_sendDelegateWindowWillReturnUndoManager
+{
+    if (!(_implementedDelegateMethods & CPWindowDelegate_windowWillReturnUndoManager_))
+        return nil;
+
+    return [_delegate windowWillReturnUndoManager:self];
+}
+
+/*!
+    @ignore
+    Call delegate windowWillClose:
+*/
+- (void)_sendDelegateWindowWillClose
+{
+    if (!(_implementedDelegateMethods & CPWindowDelegate_windowWillClose_))
+        return;
+
+    [_delegate windowWillClose:self];
+}
+
+@end
+
+
 @implementation CPWindow (BridgeSupport)
 
 /*
@@ -3269,7 +3456,8 @@ var keyViewComparator = function(lhs, rhs, context)
     if ([self isFullPlatformWindow])
         return [self setFrame:[_platformWindow visibleFrame]];
 
-    if (_autoresizingMask === CPWindowNotSizable)
+    // If this window is constrainable and we are globally ignoring constraining, ignore the platform resize
+    if ((_constrainsToUsableScreen && !CPWindowConstrainToScreen) || _autoresizingMask === CPWindowNotSizable)
         return;
 
     var frame = [_platformWindow contentBounds],
@@ -3291,7 +3479,7 @@ var keyViewComparator = function(lhs, rhs, context)
     if (_autoresizingMask & CPWindowHeightSizable)
         newFrame.size.height += dY;
 
-    [self setFrame:newFrame];
+    [self _setFrame:newFrame display:YES animate:NO constrainWidth:YES constrainHeight:YES];
 }
 
 /*
@@ -3395,8 +3583,8 @@ var keyViewComparator = function(lhs, rhs, context)
         return documentUndoManager;
 
     // If not, check to see if the delegate has one.
-    if (_delegateRespondsToWindowWillReturnUndoManagerSelector)
-        return [_delegate windowWillReturnUndoManager:self];
+    if ([self _delegateRespondsToWindowWillUndoManager])
+        return [self _sendDelegateWindowWillReturnUndoManager];
 
     // If not, create one.
     if (!_undoManager)

AppKit/CPWindow/CPWindow_Constants.j

@@ -81,6 +81,7 @@ CPWindowMinYMargin              = 8;
 CPWindowHeightSizable           = 16;
 CPWindowMaxYMargin              = 32;
 
+@typedef CPWindowLevel
 CPBackgroundWindowLevel         = -1;
 /*
     Default level for windows
@@ -143,6 +144,7 @@ CPDraggingWindowLevel           = 500;
 */
 CPScreenSaverWindowLevel        = 1000;
 
+@typedef CPWindowOrderingMode
 /*
     The receiver is placed directly in front of the window specified.
     @global
@@ -194,3 +196,5 @@ CPStandardWindowShadowStyle = 0;
 CPMenuWindowShadowStyle     = 1;
 CPPanelWindowShadowStyle    = 2;
 CPCustomWindowShadowStyle   = 3;
+
+CPWindowConstrainToScreen = YES;

AppKit/CPWindow/_CPBorderlessBridgeWindowView.j

@@ -32,7 +32,7 @@
     return @"bordeless-bridge-window-view";
 }
 
-+ (id)themeAttributes
++ (CPDictionary)themeAttributes
 {
     return @{
             @"toolbar-background-color": [CPColor grayColor],

AppKit/CPWindow/_CPDocModalWindowView.j

@@ -33,7 +33,7 @@
     return @"doc-modal-window-view";
 }
 
-+ (id)themeAttributes
++ (CPDictionary)themeAttributes
 {
     return @{
             @"body-color": [CPColor whiteColor],

AppKit/CPWindow/_CPPopoverWindowView.j

@@ -28,11 +28,7 @@
 
 @global CPPopoverAppearanceMinimal
 
-var _CPPopoverWindowViewDefaultCursorSize = CGSizeMake(16, 10),
-    _CPPopoverWindowViewRadius = 5.0,
-    _CPPopoverWindowViewStrokeWidth = 1.0,
-    _CPPopoverWindowViewShadowSize = CGSizeMake(0, 6),
-    _CPPopoverWindowViewShadowBlur = 15.0;
+var _CPPopoverWindowViewDefaultCursorSize = CGSizeMake(16, 10);
 
 /*!
     @ignore
@@ -54,13 +50,17 @@ var _CPPopoverWindowViewDefaultCursorSize = CGSizeMake(16, 10),
     return @"popover-window-view";
 }
 
-+ (id)themeAttributes
++ (CPDictionary)themeAttributes
 {
     return @{
             @"background-gradient": [CPNull null],
             @"background-gradient-hud": [CPNull null],
             @"stroke-color": [CPNull null],
             @"stroke-color-hud": [CPNull null],
+            @"border-radius": 5.0,
+            @"stroke-width": 1.0,
+            @"shadow-size": CGSizeMake(0, 6),
+            @"shadow-blur": 15.0
         };
 }
 
@@ -156,15 +156,15 @@ var _CPPopoverWindowViewDefaultCursorSize = CGSizeMake(16, 10),
     [super drawRect:aRect];
 
     var context = [[CPGraphicsContext currentContext] graphicsPort],
-        radius = _CPPopoverWindowViewRadius,
+        radius = [self valueForThemeAttribute:@"border-radius"],
         arrowWidth = _cursorSize.width,
         arrowHeight = _cursorSize.height,
-        strokeWidth = _CPPopoverWindowViewStrokeWidth,
+        strokeWidth = [self valueForThemeAttribute:@"stroke-width"],
         halfStrokeWidth = strokeWidth / 2.0,
         strokeColor,
         shadowColor = [[CPColor blackColor] colorWithAlphaComponent:.2],
-        shadowSize = _CPPopoverWindowViewShadowSize,
-        shadowBlur = _CPPopoverWindowViewShadowBlur,
+        shadowSize = [self valueForThemeAttribute:@"shadow-size"],
+        shadowBlur = [self valueForThemeAttribute:@"shadow-blur"],
         gradient,
         frame = [self bounds];
 

AppKit/CPWindow/_CPShadowWindowView.j

@@ -41,7 +41,7 @@
     return @"shadow-window-view";
 }
 
-+ (id)themeAttributes
++ (CPDictionary)themeAttributes
 {
     return @{};
 }

AppKit/CPWindow/_CPStandardWindowView.j

@@ -41,7 +41,7 @@ var _CPStandardWindowViewDividerViewHeight = 1.0;
     return @"textured-window-head-view";
 }
 
-+ (id)themeAttributes
++ (CPDictionary)themeAttributes
 {
     return @{};
 }
@@ -108,7 +108,7 @@ var _CPStandardWindowViewDividerViewHeight = 1.0;
     return @"standard-window-view";
 }
 
-+ (id)themeAttributes
++ (CPDictionary)themeAttributes
 {
     return @{
             @"gradient-height": [CPNull null],

AppKit/CPWindow/_CPToolTipWindowView.j

@@ -38,7 +38,7 @@
     return @"tooltip";
 }
 
-+ (id)themeAttributes
++ (CPDictionary)themeAttributes
 {
     return @{
             @"stroke-color": [CPColor colorWithHexString:@"E3E3E3"],

AppKit/CPWindow/_CPWindowView.j

@@ -81,7 +81,7 @@ _CPWindowViewResizeSlop = 3;
     return "window";
 }
 
-+ (id)themeAttributes
++ (CPDictionary)themeAttributes
 {
     return @{
             @"title-bar-height": 25,
@@ -631,7 +631,38 @@ _CPWindowViewResizeSlop = 3;
                 newHeight = startHeight;
         }
 
-        [theWindow _setFrame:CGRectMake(newX, newY, newWidth, newHeight) display:YES animate:NO constrainWidth:NO constrainHeight:NO];
+        // When resizing, we always constrain to the usable screen.
+        frame = CGRectMake(newX, newY, newWidth, newHeight);
+
+        var constrainedFrame = [theWindow _constrainOriginOfFrame:frame],
+            dx = constrainedFrame.origin.x - frame.origin.x,
+            dy = constrainedFrame.origin.y - frame.origin.y;
+
+        // When resizing from the left or top, we adjust the origin and size.
+        switch (_resizeRegion)
+        {
+            case _CPWindowViewResizeRegionBottomLeft:
+            case _CPWindowViewResizeRegionLeft:
+            case _CPWindowViewResizeRegionTopLeft:
+            case _CPWindowViewResizeRegionTop:
+            case _CPWindowViewResizeRegionTopRight:
+                frame.origin = constrainedFrame.origin;
+                frame.size.width -= dx;
+                frame.size.height -= dy;
+        }
+
+        // When resizing from the right or bottom, we only adjust the size.
+        switch (_resizeRegion)
+        {
+            case _CPWindowViewResizeRegionTopRight:
+            case _CPWindowViewResizeRegionRight:
+            case _CPWindowViewResizeRegionBottomRight:
+            case _CPWindowViewResizeRegionBottom:
+                frame.size.width += dx;
+                frame.size.height += dy;
+        }
+
+        [theWindow _setFrame:frame display:YES animate:NO constrainWidth:NO constrainHeight:NO];
         [self setCursorForLocation:location resizing:YES];
     }
 
@@ -683,7 +714,7 @@ _CPWindowViewResizeSlop = 3;
         [theWindow _setAttachedSheetFrameOrigin];
         [sheet._windowView _adjustShadowViewSize];
     }
-    else if (theWindow._isSheet)
+    else if (theWindow && theWindow._isSheet)
         [self _adjustShadowViewSize];
 }
 
@@ -928,7 +959,8 @@ _CPWindowViewResizeSlop = 3;
 
 - (CGSize)_minimumResizeSize
 {
-    return CGSizeMake(0, _CPWindowViewMinContentHeight);
+    // Leave at least 4px so there is something visible.
+    return CGSizeMake(4, _CPWindowViewMinContentHeight);
 }
 
 - (int)bodyOffset

AppKit/CPWindowController.j

@@ -25,6 +25,7 @@
 
 @import "CPCib.j"
 @import "CPResponder.j"
+@import "CPViewController.j"
 @import "CPWindow.j"
 
 @class CPDocument

AppKit/Cib/CPCibControlConnector.j

@@ -51,7 +51,7 @@
 
     // Not being able to set the action is a fatal error.
     if ([_source respondsToSelector:@selector(setAction:)])
-        objj_msgSend(_source, @selector(setAction:), selector);
+        [_source setAction:selector];
 
     else
         [CPException
@@ -60,7 +60,7 @@
 
     // Not being able to set the target is a fatal error.
     if ([_source respondsToSelector:@selector(setTarget:)])
-        objj_msgSend(_source, @selector(setTarget:), _destination);
+        [_source setTarget:_destination];
 
     else
         [CPException

AppKit/Cib/CPCibLoading.j

@@ -63,8 +63,8 @@ var CPCibOwner = @"CPCibOwner";
 + (CPCib)loadCibFile:(CPString)anAbsolutePath externalNameTable:(CPDictionary)aNameTable loadDelegate:aDelegate
 {
     return ([[CPCib alloc]
-    initWithContentsOfURL:anAbsolutePath
-             loadDelegate:[[_CPCibLoadDelegate alloc]
+               initWithContentsOfURL:anAbsolutePath
+                        loadDelegate:[[_CPCibLoadDelegate alloc]
                 initWithLoadDelegate:aDelegate
                    externalNameTable:aNameTable]]);
 }
@@ -84,9 +84,9 @@ var CPCibOwner = @"CPCibOwner";
 - (CPCib)loadCibFile:(CPString)aFileName externalNameTable:(CPDictionary)aNameTable loadDelegate:(id)aDelegate
 {
     return ([[CPCib alloc]
-        initWithCibNamed:aFileName
-                  bundle:self
-            loadDelegate:[[_CPCibLoadDelegate alloc]
+                    initWithCibNamed:aFileName
+                              bundle:self
+                        loadDelegate:[[_CPCibLoadDelegate alloc]
                 initWithLoadDelegate:aDelegate
                    externalNameTable:aNameTable]]);
 }

AppKit/Cib/_CPCibCustomResource.j

@@ -35,7 +35,10 @@
 
 var _CPCibCustomResourceClassNameKey    = @"_CPCibCustomResourceClassNameKey",
     _CPCibCustomResourceResourceNameKey = @"_CPCibCustomResourceResourceNameKey",
-    _CPCibCustomResourcePropertiesKey   = @"_CPCibCustomResourcePropertiesKey";
+    _CPCibCustomResourcePropertiesKey   = @"_CPCibCustomResourcePropertiesKey",
+
+    _CPCibCustomResourceTemplateImageMap = nil;
+
 
 @implementation _CPCibCustomResource : CPObject
 {
@@ -45,6 +48,16 @@ var _CPCibCustomResourceClassNameKey    = @"_CPCibCustomResourceClassNameKey",
     CPBundle        _bundle;
 }
 
++ (void)initialize
+{
+    if (self !== [_CPCibCustomResource class])
+        return;
+
+    _CPCibCustomResourceTemplateImageMap = @{
+        "CPAddTemplate": "button-image-plus",
+        "CPRemoveTemplate": "button-image-minus"
+    };
+}
 + (id)imageResourceWithName:(CPString)aResourceName size:(CGSize)aSize
 {
     return [[self alloc] initWithClassName:@"CPImage" resourceName:aResourceName properties:@{ @"size": aSize }];
@@ -98,12 +111,12 @@ var _CPCibCustomResourceClassNameKey    = @"_CPCibCustomResourceClassNameKey",
         (![aCoder respondsToSelector:@selector(awakenCustomResources)] || [aCoder awakenCustomResources]))
         if (_className === @"CPImage")
         {
-            if (_resourceName == "CPAddTemplate")
-                return [[CPTheme defaultTheme] valueForAttributeWithName:@"button-image-plus" forClass:[CPButtonBar class]];
-            else if (_resourceName == "CPRemoveTemplate")
-                return [[CPTheme defaultTheme] valueForAttributeWithName:@"button-image-minus" forClass:[CPButtonBar class]];
+            var templateImage = [_CPCibCustomResourceTemplateImageMap objectForKey:_resourceName];
 
-            return [self imageFromCoder:aCoder];
+            if (templateImage)
+                return [[CPTheme defaultTheme] valueForAttributeWithName:templateImage forClass:[CPButtonBar class]];
+            else
+                return [self imageFromCoder:aCoder];
         }
 
     return self;
@@ -176,6 +189,11 @@ var _CPCibCustomResourceClassNameKey    = @"_CPCibCustomResourceClassNameKey",
     return [_properties objectForKey:@"size"];
 }
 
+- (BOOL)isSingleImage
+{
+    return YES;
+}
+
 - (BOOL)isThreePartImage
 {
     return NO;