Merge remote-tracking branch 'Slevenbits/master' into slevenbits-master

.gitignore

@@ -10,6 +10,3 @@ WebSite
 xcuserdata/
 !*.xcodeproj/project.pbxproj
 *.xCodeSupport/
-*.XcodeSupport/
-*.sublime-project
-*.sublime-workspace

.travis.yml

@@ -1,6 +1,8 @@
 language: node_js
 node_js:
     - 0.8
+before_install:
+    - jdk_switcher use openjdk6
 install: ./bootstrap.sh --quiet --noprompt --directory ./narwhal
 script: jake test
-env: PATH="$TRAVIS_BUILD_DIR/narwhal/bin:$PATH" CAPP_BUILD="$TRAVIS_BUILD_DIR/Build" NARWHAL_ENGINE=rhino
+env: PATH=/home/travis/builds/cappuccino/cappuccino/narwhal/bin:$PATH CAPP_BUILD=/home/travis/builds/cappuccino/cappuccino/Build NARWHAL_ENGINE=rhino

AppKit/CPAccordionView.j

@@ -227,7 +227,7 @@ var secondItem = [[CPAccordionViewItem alloc] initWithIdentifier:@"secondSection
 {
     var indexSet = [CPIndexSet indexSetWithIndexesInRange:CPMakeRange(0, _items.length)];
 
-    [indexSet removeIndexes:_expandedItemIndexes];
+    [indexSet removeIndexes:_expandedIndexes];
 
     return indexSet;
 }

AppKit/CPAlert.j

@@ -28,19 +28,15 @@
 @import <Foundation/CPObject.j>
 @import <Foundation/CPString.j>
 
+@import "CPApplication.j"
 @import "CPButton.j"
 @import "CPColor.j"
 @import "CPFont.j"
 @import "CPImage.j"
 @import "CPImageView.j"
 @import "CPPanel.j"
-@import "CPText.j"
 @import "CPTextField.j"
 
-@class CPCheckBox
-
-@global CPApp
-
 /*
     @global
     @group CPAlertStyle
@@ -57,8 +53,6 @@ CPInformationalAlertStyle   = 1;
 */
 CPCriticalAlertStyle        = 2;
 
-var bottomHeight = 71;
-
 /*!
     @ingroup appkit
 
@@ -91,15 +85,15 @@ var bottomHeight = 71;
     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;
 
     _CPAlertThemeView   _themeView              @accessors(property=themeView, readonly);
-    CPWindow            _window                 @accessors(property=window, readonly);
+    CPWindow            _window                 @accessors(property=window,readonly);
     int                 _defaultWindowStyle;
 
     CPImageView         _alertImageView;
@@ -170,7 +164,7 @@ var bottomHeight = 71;
         _alertStyle         = CPWarningAlertStyle;
         _showHelp           = NO;
         _needsLayout        = YES;
-        _defaultWindowStyle = _CPModalWindowMask;
+        _defaultWindowStyle = CPTitledWindowMask;
         _themeView          = [_CPAlertThemeView new];
 
         _messageLabel       = [CPTextField labelWithTitle:@"Alert"];
@@ -456,9 +450,6 @@ var bottomHeight = 71;
         defaultElementsMargin = [_themeView currentValueForThemeAttribute:@"default-elements-margin"],
         panelSize = [[_window contentView] frame].size,
         buttonsOriginY,
-        buttonMarginY,
-        buttonMarginX,
-        theme = [self theme],
         offsetX;
 
     [aRepresentativeButton setTheme:[self theme]];
@@ -471,19 +462,6 @@ var bottomHeight = 71;
     buttonsOriginY = panelSize.height - [aRepresentativeButton frameSize].height + buttonOffset;
     offsetX = panelSize.width - inset.right;
 
-    switch ([_window styleMask])
-    {
-        case _CPModalWindowMask:
-            buttonMarginY = [_themeView currentValueForThemeAttribute:@"modal-window-button-margin-y"];
-            buttonMarginX = [_themeView currentValueForThemeAttribute:@"modal-window-button-margin-x"];
-            break;
-
-        default:
-            buttonMarginY = [_themeView currentValueForThemeAttribute:@"standard-window-button-margin-y"];
-            buttonMarginX = [_themeView currentValueForThemeAttribute:@"standard-window-button-margin-x"];
-            break;
-    }
-
     for (var i = [_buttons count] - 1; i >= 0 ; i--)
     {
         var button = _buttons[i];
@@ -495,7 +473,7 @@ var bottomHeight = 71;
             height = CGRectGetHeight(buttonFrame);
 
         offsetX -= width;
-        [button setFrame:CGRectMake(offsetX + buttonMarginX, buttonsOriginY + buttonMarginY, width, height)];
+        [button setFrame:CGRectMake(offsetX, buttonsOriginY, width, height)];
         offsetX -= 10;
     }
 
@@ -559,7 +537,7 @@ var bottomHeight = 71;
     if (_showSuppressionButton)
         lastView = _suppressionButton;
     else if (_accessoryView)
-        lastView = _accessoryView;
+        lastView = _accessoryView
 
     finalSize = [self _layoutButtonsFromView:lastView];
     if ([_window styleMask] & CPDocModalWindowMask)
@@ -568,12 +546,6 @@ var bottomHeight = 71;
     [_window setFrameSize:finalSize];
     [_window center];
 
-    if ([_window styleMask] & _CPModalWindowMask || [_window styleMask] & CPHUDBackgroundWindowMask)
-    {
-        [_window setMovable:YES];
-        [_window setMovableByWindowBackground:YES];
-    }
-
     _needsLayout = NO;
 }
 
@@ -640,7 +612,7 @@ var bottomHeight = 71;
     var frame = CGRectMakeZero();
     frame.size = [_themeView currentValueForThemeAttribute:@"size"];
 
-    _window = [[CPPanel alloc] initWithContentRect:frame styleMask:forceStyle || _defaultWindowStyle];
+    _window = [[CPWindow alloc] initWithContentRect:frame styleMask:forceStyle || _defaultWindowStyle];
     [_window setLevel:CPStatusWindowLevel];
 
     if (_title)
@@ -717,40 +689,42 @@ var bottomHeight = 71;
 
 + (id)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,
-        };
+    return [CPDictionary dictionaryWithObjects:[CGSizeMake(400.0, 110.0), CGInsetMake(15, 15, 15, 50), 6, 10,
+                                                CPJustifiedTextAlignment, [CPColor blackColor], [CPFont boldSystemFontOfSize:13.0], [CPNull null], CGSizeMakeZero(),
+                                                CPJustifiedTextAlignment, [CPColor blackColor], [CPFont systemFontOfSize:12.0], [CPNull null], CGSizeMakeZero(),
+                                                CGPointMake(15, 12),
+                                                [CPNull null],
+                                                [CPNull null],
+                                                [CPNull null],
+                                                [CPNull null],
+                                                [CPNull null],
+                                                [CPNull null],
+                                                0.0,
+                                                0.0,
+                                                3.0,
+                                                [CPColor blackColor],
+                                                [CPFont systemFontOfSize:12.0],
+                                                [CPNull null],
+                                                0.0
+                                                ]
+                                       forKeys:[@"size", @"content-inset", @"informative-offset", @"button-offset",
+                                                @"message-text-alignment", @"message-text-color", @"message-text-font", @"message-text-shadow-color", @"message-text-shadow-offset",
+                                                @"informative-text-alignment", @"informative-text-color", @"informative-text-font", @"informative-text-shadow-color", @"informative-text-shadow-offset",
+                                                @"image-offset",
+                                                @"information-image",
+                                                @"warning-image",
+                                                @"error-image",
+                                                @"help-image",
+                                                @"help-image-left-offset",
+                                                @"help-image-pressed",
+                                                @"suppression-button-y-offset",
+                                                @"suppression-button-x-offset",
+                                                @"default-elements-margin",
+                                                @"suppression-button-text-color",
+                                                @"suppression-button-text-font",
+                                                @"suppression-button-text-shadow-color",
+                                                @"suppression-button-text-shadow-offset"
+                                                ]];
 }
 
 @end

AppKit/CPAnimation.j

@@ -123,29 +123,23 @@ ACTUAL_FRAME_RATE = 0;
 - (void)setAnimationCurve:(CPAnimationCurve)anAnimationCurve
 {
     var timingFunctionName;
-
     switch (anAnimationCurve)
     {
-        case CPAnimationEaseInOut:
-            timingFunctionName = kCAMediaTimingFunctionEaseInEaseOut;
-            break;
+        case CPAnimationEaseInOut:  timingFunctionName = kCAMediaTimingFunctionEaseInEaseOut;
+                                    break;
 
-        case CPAnimationEaseIn:
-            timingFunctionName = kCAMediaTimingFunctionEaseIn;
-            break;
+        case CPAnimationEaseIn:     timingFunctionName = kCAMediaTimingFunctionEaseIn;
+                                    break;
 
-        case CPAnimationEaseOut:
-            timingFunctionName = kCAMediaTimingFunctionEaseOut;
-            break;
+        case CPAnimationEaseOut:    timingFunctionName = kCAMediaTimingFunctionEaseOut;
+                                    break;
 
-        case CPAnimationLinear:
-            timingFunctionName = kCAMediaTimingFunctionLinear;
-            break;
+        case CPAnimationLinear:     timingFunctionName = kCAMediaTimingFunctionLinear;
+                                    break;
 
-        default:
-            [CPException raise:CPInvalidArgumentException
-                        reason:@"Invalid value provided for animation curve"];
-            break;
+        default:                    [CPException raise:CPInvalidArgumentException
+                                                reason:"Invalid value provided for animation curve"];
+                                    break;
     }
 
     _animationCurve = anAnimationCurve;
@@ -331,7 +325,7 @@ ACTUAL_FRAME_RATE = 0;
 // currently used function to determine time
 // 1:1 conversion to js from webkit source files
 // UnitBezier.h, WebCore_animation_AnimationBase.cpp
-var CubicBezierAtTime = function(t, p1x, p1y, p2x, p2y, duration)
+var CubicBezierAtTime = function CubicBezierAtTime(t, p1x, p1y, p2x, p2y, duration)
 {
     var ax = 0,
         bx = 0,

AppKit/CPApplication.j

@@ -25,17 +25,14 @@
 @import <Foundation/CPBundle.j>
 
 @import "CPCompatibility.j"
-@import "CPColorPanel.j"
-@import "CPCursor.j"
-@import "CPDocumentController.j"
 @import "CPEvent.j"
 @import "CPMenu.j"
 @import "CPResponder.j"
+@import "CPDocumentController.j"
 @import "CPThemeBlend.j"
 @import "CPCibLoading.j"
-@import "CPPanel.j"
 @import "CPPlatform.j"
-@import "CPWindowController.j"
+
 
 var CPMainCibFile               = @"CPMainCibFile",
     CPMainCibFileHumanFriendly  = @"Main cib file base name",
@@ -87,10 +84,8 @@ CPRunContinuesResponse  = -1002;
 @implementation CPApplication : CPResponder
 {
     CPArray                 _eventListeners;
-    int                     _eventListenerInsertionIndex;
 
     CPEvent                 _currentEvent;
-    CPWindow                _lastMouseMoveWindow;
 
     CPArray                 _windows;
     CPWindow                _keyWindow;
@@ -145,7 +140,6 @@ CPRunContinuesResponse  = -1002;
     if (self)
     {
         _eventListeners = [];
-        _eventListenerInsertionIndex = 0;
 
         _windows = [[CPNull null]];
     }
@@ -412,7 +406,7 @@ CPRunContinuesResponse  = -1002;
 }
 
 
-- (void)_documentController:(CPDocumentController)docController didCloseAll:(BOOL)didCloseAll context:(Object)info
+- (void)_documentController:(NSDocumentController *)docController didCloseAll:(BOOL)didCloseAll context:(Object)info
 {
     // callback method for terminate:
     if (didCloseAll)
@@ -511,8 +505,6 @@ CPRunContinuesResponse  = -1002;
         if (_eventListeners[count]._callback === _CPRunModalLoop)
         {
             _eventListeners.splice(count, 1);
-            if (count <= _eventListenerInsertionIndex)
-                _eventListenerInsertionIndex--;
 
             return;
         }
@@ -560,7 +552,7 @@ CPRunContinuesResponse  = -1002;
 
 //    [theWindow._bridge _obscureWindowsBelowModalWindow];
 
-    [CPApp setCallback:_CPRunModalLoop forNextEventMatchingMask:CPAnyEventMask untilDate:nil inMode:0 dequeue:YES];
+    [CPApp setCallback:_CPRunModalLoop forNextEventMatchingMask:CPAnyEventMask untilDate:nil inMode:0 dequeue:NO];
 }
 
 /*!
@@ -621,43 +613,18 @@ CPRunContinuesResponse  = -1002;
     [[theWindow platformWindow] _propagateCurrentDOMEvent:willPropagate];
 #endif
 
-    if ([anEvent type] == CPMouseMoved)
+    if (_eventListeners.length)
     {
-        if (theWindow !== _lastMouseMoveWindow)
-            [_lastMouseMoveWindow _mouseExitedResizeRect];
+        if (_eventListeners[_eventListeners.length - 1]._mask & (1 << [anEvent type]))
+            _eventListeners.pop()._callback(anEvent);
 
-        _lastMouseMoveWindow = theWindow;
+        return;
     }
 
-    /*
-    Event listeners are processed from back to front so that newer event listeners normally take
-    precedence. If during the execution of a callback a new event listener is added, it should
-    be inserted after the current callback but before any higher priority callbacks. This makes
-    repeating event listeners (those that reinsert themselves) stable relative to each other.
-    */
-    for (var i = _eventListeners.length - 1; i >= 0; i--)
-    {
-        var listener = _eventListeners[i];
-
-        if (listener._mask & (1 << [anEvent type]))
-        {
-            _eventListeners.splice(i, 1);
-            // In case the callback wants to add more listeners.
-            _eventListenerInsertionIndex = i;
-            listener._callback(anEvent);
-
-            if (listener._dequeue)
-            {
-                // Don't process the event normally and don't send it to any other listener.
-                _eventListenerInsertionIndex = _eventListeners.length;
-                return;
-            }
-        }
-    }
-    _eventListenerInsertionIndex = _eventListeners.length;
-
     if (theWindow)
         [theWindow sendEvent:anEvent];
+    else if ([anEvent type] == CPMouseMoved)
+        [[CPCursor arrowCursor] set];
 }
 
 /*!
@@ -934,44 +901,31 @@ CPRunContinuesResponse  = -1002;
 
 /*!
     Fires a callback function when an event matching a given mask occurs.
-
-    If multiple callbacks are set which match the same event, later callbacks
-    take priority over earlier callbacks, unless a new callback is set while
-    an existing callback is being processed in which case it's given the same
-    priority as the currently processing callback.
-
-    @param aCallback A js function to be fired.
-    @prarm aMask An event mask for the next event.
-    @param anExpiration The date for which this callback expires (not implemented).
+    @param aCallback - A js function to be fired.
+    @prarm aMask - An event mask for the next event.
+    @param anExpiration - The date for which this callback expires (not implemented).
     @param inMode (not implemented).
-    @param shouldDequeue YES to remove the event from the queue after calling the callback,
-    NO to deliver it normally.
+    @param shouldDequeue (not implemented).
 */
 - (void)setCallback:(Function)aCallback forNextEventMatchingMask:(unsigned int)aMask untilDate:(CPDate)anExpiration inMode:(CPString)aMode dequeue:(BOOL)shouldDequeue
 {
-    _eventListeners.splice(_eventListenerInsertionIndex++, 0, _CPEventListenerMake(aMask, aCallback, shouldDequeue));
+    _eventListeners.push(_CPEventListenerMake(aMask, aCallback));
 }
 
 /*!
     Assigns a target and action for the next event matching a given event mask.
     The callback method called will be passed the CPEvent when it fires.
 
-    If multiple callbacks are set which match the same event, later callbacks
-    take priority over earlier callbacks, unless a new callback is set while
-    an existing callback is being processed in which case it's given the same
-    priority as the currently processing callback.
-
-    @param aTarget The target object for the callback.
-    @param aSelector The selector which should be called on the target object.
-    @param aMask The mask for a given event which should trigger the callback.
-    @param anExpiration The date for which the callback expires (not implemented).
+    @param aTarget - The target object for the callback.
+    @param aSelector - The selector which should be called on the target object.
+    @param aMask - The mask for a given event which should trigger the callback.
+    @param anExpiration - The date for which the callback expires (not implemented).
     @param aMode (not implemented).
-    @param shouldDequeue YES to remove the event from the queue after calling the callback,
-    NO to deliver it normally.
+    @param shouldDequeue (not implemented).
 */
 - (void)setTarget:(id)aTarget selector:(SEL)aSelector forNextEventMatchingMask:(unsigned int)aMask untilDate:(CPDate)anExpiration inMode:(CPString)aMode dequeue:(BOOL)shouldDequeue
 {
-    _eventListeners.splice(_eventListenerInsertionIndex++, 0, _CPEventListenerMake(aMask, function (anEvent) { objj_msgSend(aTarget, aSelector, anEvent); }, shouldDequeue));
+    _eventListeners.push(_CPEventListenerMake(aMask, function (anEvent) { objj_msgSend(aTarget, aSelector, anEvent); }));
 }
 
 /*!
@@ -1009,7 +963,6 @@ CPRunContinuesResponse  = -1002;
         [aWindow orderFront:self];
         [aSheet setPlatformWindow:[aWindow platformWindow]];
     }
-
     [aWindow _attachSheet:aSheet modalDelegate:aModalDelegate didEndSelector:aDidEndSelector contextInfo:aContextInfo];
 }
 
@@ -1238,7 +1191,7 @@ CPRunContinuesResponse  = -1002;
 
 + (CPString)defaultThemeName
 {
-    return ([[CPBundle mainBundle] objectForInfoDictionaryKey:"CPDefaultTheme"] || @"Aristo2");
+    return ([[CPBundle mainBundle] objectForInfoDictionaryKey:"CPDefaultTheme"] || @"Aristo");
 }
 
 @end
@@ -1248,29 +1201,28 @@ var _CPModalSessionMake = function(aWindow, aStopCode)
     return { _window:aWindow, _state:CPRunContinuesResponse , _previous:nil };
 };
 
-var _CPEventListenerMake = function(anEventMask, aCallback, shouldDequeue)
+var _CPEventListenerMake = function(anEventMask, aCallback)
 {
-    return { _mask:anEventMask, _callback:aCallback, _dequeue:shouldDequeue };
+    return { _mask:anEventMask, _callback:aCallback };
 };
 
 // Make this a global for use in CPPlatformWindow+DOM.j.
 _CPRunModalLoop = function(anEvent)
 {
-    [CPApp setCallback:_CPRunModalLoop forNextEventMatchingMask:CPAnyEventMask untilDate:nil inMode:0 dequeue:YES];
+    [CPApp setCallback:_CPRunModalLoop forNextEventMatchingMask:CPAnyEventMask untilDate:nil inMode:0 dequeue:NO];
 
     var theWindow = [anEvent window],
         modalSession = CPApp._currentSession;
 
-    /*
-        The special case for popovers here is not clear. In Cocoa the popover window does not respond YES to worksWhenModal, yet it works when there is a modal window. Maybe it starts its own modal session, but interaction with the original modal window seems to continue working as well. Regardless of correctness, this solution beats popovers not working at all from sheets.
-    */
+    // The special case for popovers here is not clear. In Cocoa the popover window does not respond YES to worksWhenModal,
+    // yet it works when there is a modal window. Maybe it starts its own modal session, but interaction with the original
+    // modal window seems to continue working as well. Regardless of correctness, this solution beats popovers not working
+    // at all from sheets.
     if (theWindow == modalSession._window ||
         [theWindow worksWhenModal] ||
         [theWindow attachedSheet] == modalSession._window || // -dw- allow modal parent of sheet to be repositioned
-        ([theWindow isKindOfClass:_CPPopoverWindow] && [[theWindow targetView] window] === modalSession._window))
-    {
+        ([theWindow isKindOfClass:_CPAttachedWindow] && [[theWindow targetView] window] === modalSession._window))
         [theWindow sendEvent:anEvent];
-    }
 };
 
 /*!
@@ -1353,7 +1305,7 @@ var _CPAppBootstrapperActions = nil;
     var defaultThemeName = [CPApplication defaultThemeName],
         themeURL = nil;
 
-    if (defaultThemeName === @"Aristo" || defaultThemeName === @"Aristo2")
+    if (defaultThemeName === @"Aristo")
         themeURL = [[CPBundle bundleForClass:[CPApplication class]] pathForResource:defaultThemeName + @".blend"];
     else
         themeURL = [[CPBundle mainBundle] pathForResource:defaultThemeName + @".blend"];
@@ -1380,7 +1332,7 @@ var _CPAppBootstrapperActions = nil;
     if (mainCibFile)
     {
         [mainBundle loadCibFile:mainCibFile
-            externalNameTable:@{ CPCibOwner: CPApp }
+            externalNameTable:[CPDictionary dictionaryWithObject:CPApp forKey:CPCibOwner]
                  loadDelegate:self];
 
         return YES;
@@ -1398,25 +1350,26 @@ var _CPAppBootstrapperActions = nil;
     // FIXME: We should implement autoenabling.
     [mainMenu setAutoenablesItems:NO];
 
-    var newMenuItem = [[CPMenuItem alloc] initWithTitle:@"New" action:@selector(newDocument:) keyEquivalent:@"n"];
+    var bundle = [CPBundle bundleForClass:[CPApplication class]],
+        newMenuItem = [[CPMenuItem alloc] initWithTitle:@"New" action:@selector(newDocument:) keyEquivalent:@"n"];
 
-    [newMenuItem setImage:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-general-icon-new" forClass:_CPMenuView]];
-    [newMenuItem setAlternateImage:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-general-icon-new" inState:CPThemeStateHighlighted forClass:_CPMenuView]];
+    [newMenuItem setImage:[[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPApplication/New.png"] size:CGSizeMake(16.0, 16.0)]];
+    [newMenuItem setAlternateImage:[[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPApplication/NewHighlighted.png"] size:CGSizeMake(16.0, 16.0)]];
 
     [mainMenu addItem:newMenuItem];
 
     var openMenuItem = [[CPMenuItem alloc] initWithTitle:@"Open" action:@selector(openDocument:) keyEquivalent:@"o"];
 
-    [openMenuItem setImage:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-general-icon-open" forClass:_CPMenuView]];
-    [openMenuItem setAlternateImage:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-general-icon-open" inState:CPThemeStateHighlighted forClass:_CPMenuView]];
+    [openMenuItem setImage:[[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPApplication/Open.png"] size:CGSizeMake(16.0, 16.0)]];
+    [openMenuItem setAlternateImage:[[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPApplication/OpenHighlighted.png"] size:CGSizeMake(16.0, 16.0)]];
 
     [mainMenu addItem:openMenuItem];
 
     var saveMenu = [[CPMenu alloc] initWithTitle:@"Save"],
         saveMenuItem = [[CPMenuItem alloc] initWithTitle:@"Save" action:@selector(saveDocument:) keyEquivalent:nil];
 
-    [saveMenuItem setImage:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-general-icon-save" forClass:_CPMenuView]];
-    [saveMenuItem setAlternateImage:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-general-icon-save" inState:CPThemeStateHighlighted forClass:_CPMenuView]];
+    [saveMenuItem setImage:[[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPApplication/Save.png"] size:CGSizeMake(16.0, 16.0)]];
+    [saveMenuItem setAlternateImage:[[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPApplication/SaveHighlighted.png"] size:CGSizeMake(16.0, 16.0)]];
 
     [saveMenu addItem:[[CPMenuItem alloc] initWithTitle:@"Save" action:@selector(saveDocument:) keyEquivalent:@"s"]];
     [saveMenu addItem:[[CPMenuItem alloc] initWithTitle:@"Save As" action:@selector(saveDocumentAs:) keyEquivalent:nil]];

AppKit/CPArrayController.j

@@ -897,9 +897,7 @@
     if (![self canAdd])
         return;
 
-    var newObject = [self automaticallyPreparesContent] ? [self newObject] : [self _defaultNewObject];
-
-    [self addObject:newObject];
+    [self insert:sender];
 }
 
 /*!
@@ -911,14 +909,9 @@
     if (![self canInsert])
         return;
 
-    var newObject = [self automaticallyPreparesContent] ? [self newObject] : [self _defaultNewObject],
-        lastSelectedIndex = [_selectionIndexes lastIndex];
-
-    if (lastSelectedIndex)
-        [self insertObject:newObject atArrangedObjectIndex:lastSelectedIndex];
-    else
-        [self addObject:newObject];
+    var newObject = [self automaticallyPreparesContent] ? [self newObject] : [self _defaultNewObject];
 
+    [self addObject:newObject];
 }
 
 /*!
@@ -971,7 +964,7 @@
                 // be the 'wrong' one - as in not the one the user selected - but the wrong
                 // one is still just another pointer to the same object, so the user will not
                 // be able to see any difference.
-                var contentIndex = [_contentObject indexOfObjectIdenticalTo:object];
+                contentIndex = [_contentObject indexOfObjectIdenticalTo:object];
                 [_contentObject removeObjectAtIndex:contentIndex];
             }
             [arrangedObjects removeObjectAtIndex:anIndex];
@@ -1080,12 +1073,12 @@
 
 @implementation CPArrayController (CPBinder)
 
-+ (Class)_binderClassForBinding:(CPString)aBinding
++ (Class)_binderClassForBinding:(CPString)theBinding
 {
-    if (aBinding == @"contentArray")
+    if (theBinding == @"contentArray")
         return [_CPArrayControllerContentBinder class];
 
-    return [super _binderClassForBinding:aBinding];
+    return [super _binderClassForBinding:theBinding];
 }
 
 @end
@@ -1100,8 +1093,7 @@
         isCompound = [self handlesContentAsCompoundValue],
         dotIndex = keyPath.lastIndexOf("."),
         firstPart = dotIndex !== CPNotFound ? keyPath.substring(0, dotIndex) : nil,
-        isSelectionProxy = firstPart && [[destination valueForKeyPath:firstPart] isKindOfClass:CPControllerSelectionProxy],
-        newValue;
+        isSelectionProxy = firstPart && [[destination valueForKeyPath:firstPart] isKindOfClass:CPControllerSelectionProxy];
 
     if (!isCompound && !isSelectionProxy)
     {
@@ -1121,7 +1113,6 @@
     }
 
     var isPlaceholder = CPIsControllerMarker(newValue);
-
     if (isPlaceholder)
     {
         if (newValue === CPNotApplicableMarker && [options objectForKey:CPRaisesForNotApplicableKeysBindingOption])

AppKit/CPBezierPath.j

@@ -61,11 +61,11 @@ var DefaultLineWidth = 1.0;
 /*!
     Create a new CPBezierPath object initialized with an oval path drawn within a rectangular path.
 */
-+ (CPBezierPath)bezierPathWithOvalInRect:(CGRect)aRect
++ (CPBezierPath)bezierPathWithOvalInRect:(CGRect)rect
 {
     var path = [self bezierPath];
 
-    [path appendBezierPathWithOvalInRect:aRect];
+    [path appendBezierPathWithOvalInRect:rect];
 
     return path;
 }
@@ -73,20 +73,11 @@ var DefaultLineWidth = 1.0;
 /*!
     Create a new CPBezierPath object initialized with a rectangular path.
 */
-+ (CPBezierPath)bezierPathWithRect:(CGRect)aRect
++ (CPBezierPath)bezierPathWithRect:(CGRect)rect
 {
     var path = [self bezierPath];
 
-    [path appendBezierPathWithRect:aRect];
-
-    return path;
-}
-
-+ (CPBezierPath)bezierPathWithRoundedRect:(CGRect)aRect xRadius:(float)xRadius yRadius:(float)yRadius
-{
-    var path = [self bezierPath];
-
-    [path appendBezierPathWithRoundedRect:aRect xRadius:xRadius yRadius:yRadius];
+    [path appendBezierPathWithRect:rect];
 
     return path;
 }
@@ -177,7 +168,7 @@ var DefaultLineWidth = 1.0;
 - (CGRect)bounds
 {
     // TODO: this should return this. The controlPointBounds is not a tight fit.
-    // return CGPathGetBoundingBox(_path);
+    // return CGPathGetPathBoundingBox(_path);
 
     return [self controlPointBounds];
 }

AppKit/CPBox.j

@@ -20,7 +20,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-@import "CPTextField.j"
 @import "CPView.j"
 
 // CPBoxType
@@ -56,6 +55,14 @@ CPBelowBottom = 6;
 {
     CPBoxType       _boxType;
     CPBorderType    _borderType;
+
+    CPColor         _borderColor;
+    CPColor         _fillColor;
+
+    float           _cornerRadius;
+    float           _borderWidth;
+
+    CPSize          _contentMargin;
     CPView          _contentView;
 
     CPString        _title @accessors(getter=title);
@@ -63,33 +70,6 @@ CPBelowBottom = 6;
     CPTextField     _titleView;
 }
 
-+ (Class)_binderClassForBinding:(CPString)aBinding
-{
-    if ([aBinding hasPrefix:CPDisplayPatternTitleBinding])
-        return [CPTitleWithPatternBinding class];
-
-    return [super _binderClassForBinding:aBinding];
-}
-
-+ (CPString)defaultThemeClass
-{
-    return @"box";
-}
-
-+ (id)themeAttributes
-{
-    return @{
-            @"background-color": [CPNull null],
-            @"border-color": [CPNull null],
-            @"border-width": 1.0,
-            @"corner-radius": 3.0,
-            @"inner-shadow-offset": CGSizeMakeZero(),
-            @"inner-shadow-size": 6.0,
-            @"inner-shadow-color": [CPNull null],
-            @"content-margin": CGSizeMakeZero(),
-        };
-}
-
 + (id)boxEnclosingView:(CPView)aView
 {
     var box = [[self alloc] initWithFrame:CGRectMakeZero()],
@@ -105,13 +85,18 @@ CPBelowBottom = 6;
     return box;
 }
 
-- (id)initWithFrame:(CGRect)frameRect
+- (id)initWithFrame:(CPRect)frameRect
 {
     self = [super initWithFrame:frameRect];
 
     if (self)
     {
         _borderType = CPBezelBorder;
+        _fillColor = [CPColor clearColor];
+        _borderColor = [CPColor blackColor];
+
+        _borderWidth = 1.0;
+        _contentMargin = CGSizeMake(0.0, 0.0);
 
         _titlePosition = CPNoTitle;
         _titleView = [CPTextField labelWithTitle:@""];
@@ -133,7 +118,7 @@ CPBelowBottom = 6;
 
     @return the border rectangle of the box
 */
-- (CGRect)borderRect
+- (CPRect)borderRect
 {
     return [self bounds];
 }
@@ -223,54 +208,58 @@ CPBelowBottom = 6;
 
 - (CPColor)borderColor
 {
-    return [self valueForThemeAttribute:@"border-color"];
+    return _borderColor;
 }
 
 - (void)setBorderColor:(CPColor)color
 {
-    if ([color isEqual:[self borderColor]])
+    if ([color isEqual:_borderColor])
         return;
 
-    [self setValue:color forThemeAttribute:@"border-color"];
+    _borderColor = color;
+    [self setNeedsDisplay:YES];
 }
 
 - (float)borderWidth
 {
-    return [self valueForThemeAttribute:@"border-width"];
+    return _borderWidth;
 }
 
 - (void)setBorderWidth:(float)width
 {
-    if (width === [self borderWidth])
+    if (width === _borderWidth)
         return;
 
-    [self setValue:width forThemeAttribute:@"border-width"];
+    _borderWidth = width;
+    [self setNeedsDisplay:YES];
 }
 
 - (float)cornerRadius
 {
-    return [self valueForThemeAttribute:@"corner-radius"];
+    return _cornerRadius;
 }
 
 - (void)setCornerRadius:(float)radius
 {
-    if (radius === [self cornerRadius])
+    if (radius === _cornerRadius)
         return;
 
-    [self setValue:radius forThemeAttribute:@"corner-radius"];
+    _cornerRadius = radius;
+    [self setNeedsDisplay:YES];
 }
 
 - (CPColor)fillColor
 {
-    return [self valueForThemeAttribute:@"background-color"];
+    return _fillColor;
 }
 
 - (void)setFillColor:(CPColor)color
 {
-    if ([color isEqual:[self fillColor]])
+    if ([color isEqual:_fillColor])
         return;
 
-    [self setValue:color forThemeAttribute:@"background-color"];
+    _fillColor = color;
+    [self setNeedsDisplay:YES];
 }
 
 - (CPView)contentView
@@ -283,43 +272,34 @@ CPBelowBottom = 6;
     if (aView === _contentView)
         return;
 
-    var borderWidth = [self borderWidth],
-        contentMargin = [self valueForThemeAttribute:@"content-margin"];
-
-    [aView setFrame:CGRectInset([self bounds], contentMargin.width + borderWidth, contentMargin.height + borderWidth)];
+    [aView setFrame:CGRectInset([self bounds], _contentMargin.width + _borderWidth, _contentMargin.height + _borderWidth)];
     [aView setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
-
-    //  A nil contentView is allowed (tested in Cocoa 2013-02-22).
-    if (!aView)
-        [_contentView removeFromSuperview];
-    else if (_contentView)
-        [self replaceSubview:_contentView with:aView];
-    else
-        [self addSubview:aView];
+    [self replaceSubview:_contentView with:aView];
 
     _contentView = aView;
 }
 
-- (CGSize)contentViewMargins
+- (CPSize)contentViewMargins
 {
-    return [self valueForThemeAttribute:@"content-margin"];
+    return _contentMargin;
 }
 
-- (void)setContentViewMargins:(CGSize)size
+- (void)setContentViewMargins:(CPSize)size
 {
      if (size.width < 0 || size.height < 0)
          [CPException raise:CPGenericException reason:@"Margins must be positive"];
 
-    [self setValue:CGSizeMakeCopy(size) forThemeAttribute:@"content-margin"];
+    _contentMargin = CGSizeMakeCopy(size);
+    [self setNeedsDisplay:YES];
 }
 
-- (void)setFrameFromContentFrame:(CGRect)aRect
+- (void)setFrameFromContentFrame:(CPRect)aRect
 {
-    var offset = [self _titleHeightOffset],
-        borderWidth = [self borderWidth],
-        contentMargin = [self valueForThemeAttribute:@"content-margin"];
+    var offset = [self _titleHeightOffset];
 
-    [self setFrame:CGRectInset(aRect, -(contentMargin.width + borderWidth), -(contentMargin.height + offset[0] + borderWidth))];
+    [self setFrame:CGRectInset(aRect, -(_contentMargin.width + _borderWidth), -(_contentMargin.height + offset[0] + _borderWidth))];
+
+    [self setNeedsDisplay:YES];
 }
 
 - (void)setTitle:(CPString)aTitle
@@ -380,7 +360,7 @@ CPBelowBottom = 6;
         case CPAtTop:
         case CPAboveTop:
         case CPBelowTop:
-            [_titleView setFrameOrigin:CGPointMake(5.0, 0.0)];
+            [_titleView setFrameOrigin:CPPointMake(5.0, 0.0)];
             [_titleView setAutoresizingMask:CPViewNotSizable];
             break;
 
@@ -388,7 +368,7 @@ CPBelowBottom = 6;
         case CPAtBottom:
         case CPBelowBottom:
             var h = [_titleView frameSize].height;
-            [_titleView setFrameOrigin:CGPointMake(5.0, [self frameSize].height - h)];
+            [_titleView setFrameOrigin:CPPointMake(5.0, [self frameSize].height - h)];
             [_titleView setAutoresizingMask:CPViewMinYMargin];
             break;
     }
@@ -400,13 +380,17 @@ CPBelowBottom = 6;
 - (void)sizeToFit
 {
     var contentFrame = [_contentView frame],
-        offset = [self _titleHeightOffset],
-        contentMargin = [self valueForThemeAttribute:@"content-margin"];
+        offset = [self _titleHeightOffset];
 
     if (!contentFrame)
         return;
 
-    [_contentView setFrameOrigin:CGPointMake(contentMargin.width, contentMargin.height + offset[1])];
+    [_contentView setAutoresizingMask:CPViewNotSizable];
+    [self setFrameSize:CGSizeMake(contentFrame.size.width + _contentMargin.width * 2,
+                                  contentFrame.size.height + _contentMargin.height * 2 + offset[0])];
+    [_contentView setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
+
+    [_contentView setFrameOrigin:CGPointMake(_contentMargin.width, _contentMargin.height + offset[1])];
 }
 
 - (float)_titleHeightOffset
@@ -427,27 +411,22 @@ CPBelowBottom = 6;
     }
 }
 
-- (void)setValue:(id)aValue forKey:(CPString)aKey
+- (void)drawRect:(CPRect)rect
 {
-    if (aKey === CPDisplayPatternTitleBinding)
-        [self setTitle:aValue || @""];
-    else
-        [super setValue:aValue forKey:aKey];
-}
+    if (_borderType === CPNoBorder)
+        return;
 
-- (void)drawRect:(CGRect)rect
-{
-    var bounds = [self bounds];
+    var bounds = CGRectMakeCopy([self bounds]);
 
     switch (_boxType)
     {
         case CPBoxSeparator:
             // NSBox does not include a horizontal flag for the separator type. We have to determine
             // the type of separator to draw by the width and height of the frame.
-            if (_CGRectGetWidth(bounds) === 5.0)
-                return [self _drawVerticalSeparatorInRect:bounds];
-            else if (_CGRectGetHeight(bounds) === 5.0)
-                return [self _drawHorizontalSeparatorInRect:bounds];
+            if (CGRectGetWidth(bounds) === 5.0)
+                return [self _drawVerticalSeperatorInRect:bounds];
+            else if (CGRectGetHeight(bounds) === 5.0)
+                return [self _drawHorizontalSeperatorInRect:bounds];
 
             break;
     }
@@ -462,137 +441,81 @@ CPBelowBottom = 6;
         bounds.size.height -= [_titleView frameSize].height;
     }
 
-    // Primary or secondary type boxes always draw the same way, unless they are CPNoBorder.
-    if ((_boxType === CPBoxPrimary || _boxType === CPBoxSecondary) && _borderType !== CPNoBorder)
-    {
-        [self _drawPrimaryBorderInRect:bounds];
-        return;
-    }
-
     switch (_borderType)
     {
         case CPBezelBorder:
             [self _drawBezelBorderInRect:bounds];
             break;
 
-        case CPGrooveBorder:
+        default:
         case CPLineBorder:
             [self _drawLineBorderInRect:bounds];
             break;
-
-        case CPNoBorder:
-            [self _drawNoBorderInRect:bounds];
-            break;
     }
 }
 
-- (void)_drawHorizontalSeparatorInRect:(CGRect)aRect
+- (void)_drawHorizontalSeperatorInRect:(CGRect)aRect
 {
     var context = [[CPGraphicsContext currentContext] graphicsPort];
 
     CGContextSetStrokeColor(context, [self borderColor]);
     CGContextSetLineWidth(context, 1.0);
 
-    CGContextMoveToPoint(context, _CGRectGetMinX(aRect), _CGRectGetMidY(aRect));
-    CGContextAddLineToPoint(context, _CGRectGetWidth(aRect), _CGRectGetMidY(aRect));
+    CGContextMoveToPoint(context, CGRectGetMinX(aRect), CGRectGetMinY(aRect) + 0.5);
+    CGContextAddLineToPoint(context, CGRectGetWidth(aRect), CGRectGetMinY(aRect) + 0.5);
     CGContextStrokePath(context);
 }
 
-- (void)_drawVerticalSeparatorInRect:(CGRect)aRect
+- (void)_drawVerticalSeperatorInRect:(CGRect)aRect
 {
     var context = [[CPGraphicsContext currentContext] graphicsPort];
 
     CGContextSetStrokeColor(context, [self borderColor]);
     CGContextSetLineWidth(context, 1.0);
 
-    CGContextMoveToPoint(context, _CGRectGetMidX(aRect), _CGRectGetMinY(aRect));
-    CGContextAddLineToPoint(context, _CGRectGetMidX(aRect), _CGRectGetHeight(aRect));
+    CGContextMoveToPoint(context, CGRectGetMinX(aRect) + 0.5, CGRectGetMinY(aRect));
+    CGContextAddLineToPoint(context, CGRectGetMinX(aRect) + 0.5, CGRectGetHeight(aRect));
     CGContextStrokePath(context);
 }
 
-- (void)_drawLineBorderInRect:(CGRect)aRect
-{
-    var context = [[CPGraphicsContext currentContext] graphicsPort],
-        cornerRadius = [self cornerRadius],
-        borderWidth = [self borderWidth];
-
-    aRect = CGRectInset(aRect, borderWidth / 2.0, borderWidth / 2.0);
-
-    CGContextSetFillColor(context, [self fillColor]);
-    CGContextSetStrokeColor(context, [self borderColor]);
-
-    CGContextSetLineWidth(context, borderWidth);
-    CGContextFillRoundedRectangleInRect(context, aRect, cornerRadius, YES, YES, YES, YES);
-    CGContextStrokeRoundedRectangleInRect(context, aRect, cornerRadius, YES, YES, YES, YES);
-}
-
 - (void)_drawBezelBorderInRect:(CGRect)aRect
 {
     var context = [[CPGraphicsContext currentContext] graphicsPort],
-        cornerRadius = [self cornerRadius],
-        borderWidth = [self borderWidth],
-        shadowOffset = [self valueForThemeAttribute:@"inner-shadow-offset"],
-        shadowSize = [self valueForThemeAttribute:@"inner-shadow-size"],
-        shadowColor = [self valueForThemeAttribute:@"inner-shadow-color"];
+        sides = [CPMinYEdge, CPMaxXEdge, CPMaxYEdge, CPMinXEdge],
+        sideGray = 190.0 / 255.0,
+        grays = [142.0 / 255.0, sideGray, sideGray, sideGray],
+        borderWidth = _borderWidth;
 
-    var baseRect = aRect;
-    aRect = CGRectInset(aRect, borderWidth / 2.0, borderWidth / 2.0);
-
-    CGContextSaveGState(context);
-
-    CGContextSetStrokeColor(context, [self borderColor]);
-    CGContextSetLineWidth(context, borderWidth);
-    CGContextSetFillColor(context, [self fillColor]);
-    CGContextFillRoundedRectangleInRect(context, aRect, cornerRadius, YES, YES, YES, YES);
-    CGContextStrokeRoundedRectangleInRect(context, aRect, cornerRadius, YES, YES, YES, YES);
-
-    CGContextRestoreGState(context);
-}
-
-- (void)_drawPrimaryBorderInRect:(CGRect)aRect
-{
-    // Draw the "primary" style CPBox.
-
-    var context = [[CPGraphicsContext currentContext] graphicsPort],
-        cornerRadius = [self cornerRadius],
-        borderWidth = [self borderWidth],
-        shadowOffset = [self valueForThemeAttribute:@"inner-shadow-offset"],
-        shadowSize = [self valueForThemeAttribute:@"inner-shadow-size"],
-        shadowColor = [self valueForThemeAttribute:@"inner-shadow-color"],
-        baseRect = aRect;
-
-    aRect = CGRectInset(aRect, borderWidth / 2.0, borderWidth / 2.0);
-
-    CGContextSaveGState(context);
-
-    CGContextSetStrokeColor(context, [self borderColor]);
-    CGContextSetLineWidth(context, borderWidth);
-    CGContextSetFillColor(context, [self fillColor]);
-    CGContextFillRoundedRectangleInRect(context, aRect, cornerRadius, YES, YES, YES, YES);
-
-    CGContextBeginPath(context);
-    // Note we can't use the 0.5 inset rectangle when setting up clipping. The clipping has to be
-    // on integer coordinates for this to look right in Chrome.
-    CGContextAddPath(context, CGPathWithRoundedRectangleInRect(baseRect, cornerRadius, cornerRadius, YES, YES, YES, YES));
-    CGContextClip(context);
-    CGContextSetShadowWithColor(context, shadowOffset, shadowSize, shadowColor);
-    CGContextStrokeRoundedRectangleInRect(context, aRect, cornerRadius, YES, YES, YES, YES);
-
-    CGContextRestoreGState(context);
-}
-
-- (void)_drawNoBorderInRect:(CGRect)aRect
-{
-    var context = [[CPGraphicsContext currentContext] graphicsPort];
+    while (borderWidth--)
+        aRect = CPDrawTiledRects(aRect, aRect, sides, grays);
 
     CGContextSetFillColor(context, [self fillColor]);
     CGContextFillRect(context, aRect);
 }
 
+- (void)_drawLineBorderInRect:(CGRect)aRect
+{
+    var context = [[CPGraphicsContext currentContext] graphicsPort];
+
+    aRect = CGRectInset(aRect, _borderWidth / 2.0, _borderWidth / 2.0);
+
+    CGContextSetFillColor(context, [self fillColor]);
+    CGContextSetStrokeColor(context, [self borderColor]);
+
+    CGContextSetLineWidth(context, _borderWidth);
+    CGContextFillRoundedRectangleInRect(context, aRect, _cornerRadius, YES, YES, YES, YES);
+    CGContextStrokeRoundedRectangleInRect(context, aRect, _cornerRadius, YES, YES, YES, YES);
+}
+
 @end
 
 var CPBoxTypeKey          = @"CPBoxTypeKey",
     CPBoxBorderTypeKey    = @"CPBoxBorderTypeKey",
+    CPBoxBorderColorKey   = @"CPBoxBorderColorKey",
+    CPBoxFillColorKey     = @"CPBoxFillColorKey",
+    CPBoxCornerRadiusKey  = @"CPBoxCornerRadiusKey",
+    CPBoxBorderWidthKey   = @"CPBoxBorderWidthKey",
+    CPBoxContentMarginKey = @"CPBoxContentMarginKey",
     CPBoxTitle            = @"CPBoxTitle",
     CPBoxTitlePosition    = @"CPBoxTitlePosition",
     CPBoxTitleView        = @"CPBoxTitleView";
@@ -608,6 +531,14 @@ var CPBoxTypeKey          = @"CPBoxTypeKey",
         _boxType       = [aCoder decodeIntForKey:CPBoxTypeKey];
         _borderType    = [aCoder decodeIntForKey:CPBoxBorderTypeKey];
 
+        _borderColor   = [aCoder decodeObjectForKey:CPBoxBorderColorKey];
+        _fillColor     = [aCoder decodeObjectForKey:CPBoxFillColorKey];
+
+        _cornerRadius  = [aCoder decodeFloatForKey:CPBoxCornerRadiusKey];
+        _borderWidth   = [aCoder decodeFloatForKey:CPBoxBorderWidthKey];
+
+        _contentMargin = [aCoder decodeSizeForKey:CPBoxContentMarginKey];
+
         _title         = [aCoder decodeObjectForKey:CPBoxTitle];
         _titlePosition = [aCoder decodeIntForKey:CPBoxTitlePosition];
         _titleView     = [aCoder decodeObjectForKey:CPBoxTitleView] || [CPTextField labelWithTitle:_title];
@@ -629,9 +560,18 @@ var CPBoxTypeKey          = @"CPBoxTypeKey",
 
     [aCoder encodeInt:_boxType forKey:CPBoxTypeKey];
     [aCoder encodeInt:_borderType forKey:CPBoxBorderTypeKey];
+
+    [aCoder encodeObject:_borderColor forKey:CPBoxBorderColorKey];
+    [aCoder encodeObject:_fillColor forKey:CPBoxFillColorKey];
+
+    [aCoder encodeFloat:_cornerRadius forKey:CPBoxCornerRadiusKey];
+    [aCoder encodeFloat:_borderWidth forKey:CPBoxBorderWidthKey];
+
     [aCoder encodeObject:_title forKey:CPBoxTitle];
     [aCoder encodeInt:_titlePosition forKey:CPBoxTitlePosition];
     [aCoder encodeObject:_titleView forKey:CPBoxTitleView];
+
+    [aCoder encodeSize:_contentMargin forKey:CPBoxContentMarginKey];
 }
 
 @end

AppKit/CPBrowser.j

@@ -24,16 +24,15 @@
 
 @import "CPControl.j"
 @import "CPImage.j"
-@import "CPScrollView.j"
 @import "CPTableView.j"
 @import "CPTextField.j"
-
-@global CPApp
+@import "CPScrollView.j"
 
 /*!
     @ingroup appkit
     @class CPBrowser
 */
+
 @implementation CPBrowser : CPControl
 {
     id              _delegate;
@@ -66,18 +65,18 @@
     CPArray         _columnWidths;
 }
 
-+ (CPString)defaultThemeClass
++ (CPImage)branchImage
 {
-    return "browser";
+    return [[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:[CPBrowser class]]
+                                                    pathForResource:"browser-leaf.png"]
+                                              size:CGSizeMake(9,9)];
 }
 
-+ (id)themeAttributes
++ (CPImage)highlightedBranchImage
 {
-    return @{
-        @"image-control-resize": [CPNull null],
-        @"image-control-leaf": [CPNull null],
-        @"image-control-leaf-pressed": [CPNull null]
-    };
+    return [[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:[CPBrowser class]]
+                                                    pathForResource:"browser-leaf-highlighted.png"]
+                                              size:CGSizeMake(9,9)];
 }
 
 - (id)initWithFrame:(CGRect)aFrame
@@ -277,8 +276,8 @@
     var column = [[CPTableColumn alloc] initWithIdentifier:@"Leaf"],
         view = [[_CPBrowserLeafView alloc] initWithFrame:CGRectMakeZero()];
 
-    [view setBranchImage:[self valueForThemeAttribute:@"image-control-leaf"]];
-    [view setHighlightedBranchImage:[self valueForThemeAttribute:@"image-control-leaf-pressed"]];
+    [view setBranchImage:[[self class] branchImage]];
+    [view setHighlightedBranchImage:[[self class] highlightedBranchImage]];
 
     [column setDataView:view];
     [column setResizingMask:CPTableColumnNoResizing];
@@ -426,26 +425,11 @@
 
 - (void)keyDown:(CPEvent)anEvent
 {
-    var key = [anEvent charactersIgnoringModifiers],
-        column = [self selectedColumn];
-
-    if (column === CPNotFound)
+    var column = [self selectedColumn];
+    if (column === -1)
         return;
 
-    if (key === CPLeftArrowFunctionKey || key === CPRightArrowFunctionKey)
-    {
-        if (key === CPLeftArrowFunctionKey)
-        {
-            var previousColumn = column - 1,
-                selectedRow = [self selectedRowInColumn:previousColumn];
-
-            [self selectRow:selectedRow inColumn:previousColumn];
-        }
-        else
-            [self selectRow:0 inColumn:column + 1];
-    }
-    else
-        [_tableViews[column] keyDown:anEvent];
+    [_tableViews[column] keyDown:anEvent];
 }
 
 // SIZING
@@ -720,6 +704,8 @@
 @end
 
 
+var _CPBrowserResizeControlBackgroundImage = nil;
+
 @implementation _CPBrowserResizeControl : CPView
 {
     CGPoint     _mouseDownX;
@@ -728,14 +714,22 @@
     unsigned    _width;
 }
 
++ (CPImage)backgroundImage
+{
+    if (!_CPBrowserResizeControlBackgroundImage)
+    {
+        var path = [[CPBundle bundleForClass:[self class]] pathForResource:"browser-resize-control.png"];
+        _CPBrowserResizeControlBackgroundImage = [[CPImage alloc] initWithContentsOfFile:path
+                                                                                    size:CGSizeMake(15, 14)];
+    }
+
+    return _CPBrowserResizeControlBackgroundImage;
+}
+
 - (id)initWithFrame:(CGRect)aFrame
 {
     if (self = [super initWithFrame:aFrame])
-    {
-        var browser = [[CPBrowser alloc] init];
-        [self setBackgroundColor:[CPColor colorWithPatternImage:[browser valueForThemeAttribute:@"image-control-resize"]]];
-    }
-
+        [self setBackgroundColor:[CPColor colorWithPatternImage:[[self class] backgroundImage]]];
 
     return self;
 }
@@ -825,13 +819,13 @@
     return [_browser canDragRowsWithIndexes:rowIndexes inColumn:[_browser columnOfTableView:self] withEvent:[CPApp currentEvent]];
 }
 
-- (CPImage)dragImageForRowsWithIndexes:(CPIndexSet)dragRows tableColumns:(CPArray)theTableColumns event:(CPEvent)dragEvent offset:(CGPoint)dragImageOffset
+- (CPImage)dragImageForRowsWithIndexes:(CPIndexSet)dragRows tableColumns:(CPArray)theTableColumns event:(CPEvent)dragEvent offset:(CPPointPointer)dragImageOffset
 {
     return [_browser draggingImageForRowsWithIndexes:dragRows inColumn:[_browser columnOfTableView:self] withEvent:dragEvent offset:dragImageOffset] ||
            [super dragImageForRowsWithIndexes:dragRows tableColumns:theTableColumns event:dragEvent offset:dragImageOffset];
 }
 
-- (CPView)dragViewForRowsWithIndexes:(CPIndexSet)dragRows tableColumns:(CPArray)theTableColumns event:(CPEvent)dragEvent offset:(CGPoint)dragViewOffset
+- (CPView)dragViewForRowsWithIndexes:(CPIndexSet)dragRows tableColumns:(CPArray)theTableColumns event:(CPEvent)dragEvent offset:(CPPoint)dragViewOffset
 {
     var count = theTableColumns.length;
     while (count--)
@@ -844,6 +838,30 @@
            [super dragViewForRowsWithIndexes:dragRows tableColumns:theTableColumns event:dragEvent offset:dragViewOffset];
 }
 
+- (void)moveUp:(id)sender
+{
+    [super moveUp:sender];
+    [_browser selectRow:[self selectedRow] inColumn:[_browser selectedColumn]];
+}
+
+- (void)moveDown:(id)sender
+{
+    [super moveDown:sender];
+    [_browser selectRow:[self selectedRow] inColumn:[_browser selectedColumn]];
+}
+
+- (void)moveLeft:(id)sender
+{
+    var previousColumn = [_browser selectedColumn] - 1,
+        selectedRow = [_browser selectedRowInColumn:previousColumn];
+
+    [_browser selectRow:selectedRow inColumn:previousColumn];
+}
+
+- (void)moveRight:(id)sender
+{
+    [_browser selectRow:0 inColumn:[_browser selectedColumn] + 1];
+}
 
 @end
 

AppKit/CPButton.j

@@ -25,8 +25,7 @@
 
 @import "CPControl.j"
 @import "CPStringDrawing.j"
-@import "CPText.j"
-@import "CPWindow_Constants.j"
+
 
 /* @group CPBezelStyle */
 
@@ -60,11 +59,11 @@ CPMomentaryPushInButton = 7;
 CPMomentaryPushButton   = 0;
 CPMomentaryLight        = 7;
 
-CPNoButtonMask          = 0;
-CPContentsButtonMask    = 1;
-CPPushInButtonMask      = 2;
-CPGrayButtonMask        = 4;
-CPBackgroundButtonMask  = 8;
+CPNoButtonMask              = 0;
+CPContentsButtonMask        = 1;
+CPPushInButtonMask          = 2;
+CPGrayButtonMask            = 4;
+CPBackgroundButtonMask      = 8;
 
 CPNoCellMask                = CPNoButtonMask;
 CPContentsCellMask          = CPContentsButtonMask;
@@ -72,19 +71,16 @@ CPPushInCellMask            = CPPushInButtonMask;
 CPChangeGrayCellMask        = CPGrayButtonMask;
 CPChangeBackgroundCellMask  = CPBackgroundButtonMask;
 
-CPButtonStateMixed             = CPThemeState("mixed");
-CPButtonStateBezelStyleRounded = CPThemeState("rounded");
+CPButtonStateMixed                  = CPThemeState("mixed");
+CPButtonStateBezelStyleRounded      = CPThemeState("rounded");
 
 // add all future correspondance between bezel styles and theme state here.
-var CPButtonBezelStyleStateMap = @{
-        CPRoundedBezelStyle: CPButtonStateBezelStyleRounded,
-        CPRoundRectBezelStyle: [CPNull null],
-    };
+var CPButtonBezelStyleStateMap = [CPDictionary dictionaryWithObjects:[CPButtonStateBezelStyleRounded, nil]
+                                                             forKeys:[CPRoundedBezelStyle, CPRoundRectBezelStyle]];
 
-/// @cond IGNORE
-CPButtonDefaultHeight = 25.0;
+
+CPButtonDefaultHeight = 24.0;
 CPButtonImageOffset   = 3.0;
-/// @endcond
 
 /*!
     @ingroup appkit
@@ -120,14 +116,6 @@ CPButtonImageOffset   = 3.0;
     BOOL                _isTracking;
 }
 
-+ (Class)_binderClassForBinding:(CPString)aBinding
-{
-    if (aBinding === CPTargetBinding || [aBinding hasPrefix:CPArgumentBinding])
-        return [CPActionBinding class];
-
-    return [super _binderClassForBinding:aBinding];
-}
-
 + (id)buttonWithTitle:(CPString)aTitle
 {
     return [self buttonWithTitle:aTitle theme:[CPTheme defaultTheme]];
@@ -151,13 +139,8 @@ CPButtonImageOffset   = 3.0;
 
 + (id)themeAttributes
 {
-    return @{
-            @"image": [CPNull null],
-            @"image-offset": 0.0,
-            @"bezel-inset": _CGInsetMakeZero(),
-            @"content-inset": _CGInsetMakeZero(),
-            @"bezel-color": [CPNull null],
-        };
+    return [CPDictionary dictionaryWithObjects:[[CPNull null], 0.0, _CGInsetMakeZero(), _CGInsetMakeZero(), [CPNull null]]
+                                       forKeys:[@"image", @"image-offset", @"bezel-inset", @"content-inset", @"bezel-color"]];
 }
 
 /*!
@@ -238,7 +221,7 @@ CPButtonImageOffset   = 3.0;
     else if (![anObjectValue isKindOfClass:[CPNumber class]])
         anObjectValue = CPOnState;
     else if (anObjectValue >= CPOnState)
-        anObjectValue = CPOnState;
+        anObjectValue = CPOnState
     else if (anObjectValue < CPOffState)
         if ([self allowsMixedState])
             anObjectValue = CPMixedState;
@@ -539,7 +522,6 @@ CPButtonImageOffset   = 3.0;
     _isTracking = YES;
 
     var startedTracking = [super startTrackingAt:aPoint];
-
     if (_highlightsBy & (CPPushInCellMask | CPChangeGrayCellMask))
     {
         if (_showsStateBy & (CPChangeGrayCellMask | CPChangeBackgroundCellMask))
@@ -554,7 +536,6 @@ CPButtonImageOffset   = 3.0;
         else
             [self highlight:NO];
     }
-
     return startedTracking;
 }
 
@@ -1007,3 +988,6 @@ var CPButtonImageKey                    = @"CPButtonImageKey",
 }
 
 @end
+
+@import "CPCheckBox.j"
+@import "CPRadio.j"

AppKit/CPButtonBar.j

@@ -1,31 +1,5 @@
-/*
- * CPButtonBar.j
- * AppKit
- *
- * Created by Francisco Tolmasky.
- * Copyright 2009, 280 North, Inc.
- *
- * 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 "CPView.j"
-@import "CPWindow_Constants.j"
-
-@class CPSplitView
-
-@global CPPopUpButtonStatePullsDown
 
 
 @implementation CPButtonBar : CPView
@@ -38,7 +12,7 @@
 + (id)plusButton
 {
     var button = [[CPButton alloc] initWithFrame:CGRectMake(0, 0, 35, 25)],
-        image = [[CPTheme defaultTheme] valueForAttributeWithName:@"button-image-plus" forClass:[CPButtonBar class]];
+        image = [[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:[CPButtonBar class]] pathForResource:@"plus_button.png"] size:CGSizeMake(11, 12)];
 
     [button setBordered:NO];
     [button setImage:image];
@@ -50,7 +24,7 @@
 + (id)minusButton
 {
     var button = [[CPButton alloc] initWithFrame:CGRectMake(0, 0, 35, 25)],
-        image = [[CPTheme defaultTheme] valueForAttributeWithName:@"button-image-minus" forClass:[CPButtonBar class]];
+        image = [[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:[CPButtonBar class]] pathForResource:@"minus_button.png"] size:CGSizeMake(11, 4)];
 
     [button setBordered:NO];
     [button setImage:image];
@@ -62,7 +36,7 @@
 + (id)actionPopupButton
 {
     var button = [[CPPopUpButton alloc] initWithFrame:CGRectMake(0, 0, 35, 25)],
-        image = [[CPTheme defaultTheme] valueForAttributeWithName:@"button-image-action" forClass:[CPButtonBar class]];
+        image = [[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:[CPButtonBar class]] pathForResource:@"action_button.png"] size:CGSizeMake(22, 14)];
 
     [button addItemWithTitle:nil];
     [[button lastItem] setImage:image];
@@ -81,17 +55,8 @@
 
 + (id)themeAttributes
 {
-    return @{
-            @"resize-control-inset": CGInsetMake(0.0, 0.0, 0.0, 0.0),
-            @"resize-control-size": CGSizeMakeZero(),
-            @"resize-control-color": [CPNull null],
-            @"bezel-color": [CPNull null],
-            @"button-bezel-color": [CPNull null],
-            @"button-text-color": [CPNull null],
-            @"button-image-plus": [CPNull null],
-            @"button-image-minus": [CPNull null],
-            @"button-image-action": [CPNull null],
-        };
+    return [CPDictionary dictionaryWithObjects:[CGInsetMake(0.0, 0.0, 0.0, 0.0), CGSizeMakeZero(), [CPNull null], [CPNull null], [CPNull null], [CPNull null]]
+                                       forKeys:[@"resize-control-inset", @"resize-control-size", @"resize-control-color", @"bezel-color", @"button-bezel-color", @"button-text-color"]];
 }
 
 - (id)initWithFrame:(CGRect)aFrame

AppKit/CPCheckBox.j

@@ -44,12 +44,12 @@ CPCheckBoxImageOffset = 4.0;
     return @"check-box";
 }
 
-+ (Class)_binderClassForBinding:(CPString)aBinding
++ (Class)_binderClassForBinding:(CPString)theBinding
 {
-    if (aBinding === CPValueBinding)
+    if (theBinding === CPValueBinding)
         return [_CPCheckBoxValueBinder class];
 
-    return [super _binderClassForBinding:aBinding];
+    return [super _binderClassForBinding:theBinding];
 }
 
 - (id)initWithFrame:(CGRect)aFrame

AppKit/CPClipView.j

@@ -22,7 +22,6 @@
 
 @import "CPView.j"
 
-@class CPScrollView
 
 /*!
     @ingroup appkit
@@ -45,10 +44,10 @@
     if (_documentView == aView)
         return;
 
+    var defaultCenter = [CPNotificationCenter defaultCenter];
+
     if (_documentView)
     {
-        var defaultCenter = [CPNotificationCenter defaultCenter];
-
         [defaultCenter
             removeObserver:self
                       name:CPViewFrameDidChangeNotification
@@ -67,30 +66,24 @@
     if (_documentView)
     {
         [self addSubview:_documentView];
-        [self _observeDocumentView];
+
+        [_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];
     }
 }
 
-- (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];
-}
-
 /*!
     Returns the document view.
 */
@@ -240,12 +233,7 @@ var CPClipViewDocumentViewKey = @"CPScrollViewDocumentView";
 - (id)initWithCoder:(CPCoder)aCoder
 {
     if (self = [super initWithCoder:aCoder])
-    {
-        // 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];
-    }
+        [self setDocumentView:[aCoder decodeObjectForKey:CPClipViewDocumentViewKey]];
 
     return self;
 }

AppKit/CPCollectionView.j

@@ -20,22 +20,15 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#import "../Foundation/CPRange.h"
-
 @import <Foundation/CPArray.j>
 @import <Foundation/CPData.j>
 @import <Foundation/CPIndexSet.j>
 @import <Foundation/CPKeyedArchiver.j>
 @import <Foundation/CPKeyedUnarchiver.j>
 
+@import "CPView.j"
 @import "CPCollectionViewItem.j"
 @import "CPCompatibility.j"
-@import "CPDragServer_Constants.j"
-@import "CPPasteboard.j"
-@import "CPView.j"
-
-@class CPClipView
-
 
 /*!
     @ingroup appkit
@@ -48,7 +41,7 @@
     @par Delegate Methods
 
     @delegate - (void)collectionViewDidChangeSelection:(CPCollectionView)collectionView;
-    DEPRECATED: Please do not use.
+    Called when the selection in the collection view has changed.
     @param collectionView the collection view who's selection changed
 
     @delegate - (void)collectionView:(CPCollectionView)collectionView didDoubleClickOnItemAtIndex:(int)index;
@@ -70,8 +63,6 @@
     @return an array of drag types (CPString)
 */
 
-var HORIZONTAL_MARGIN = 2;
-
 @implementation CPCollectionView : CPView
 {
     CPArray                 _content;
@@ -108,17 +99,6 @@ var HORIZONTAL_MARGIN = 2;
     id                      _delegate;
 
     CPEvent                 _mouseDownEvent;
-
-    BOOL                    _needsMinMaxItemSizeUpdate;
-    CGSize                  _storedFrameSize;
-
-    BOOL                    _uniformSubviewsResizing @accessors(property=uniformSubviewsResizing);
-    BOOL                    _lockResizing;
-
-    CPInteger               _currentDropIndex;
-    CPDragOperation         _currentDragOperation;
-
-    _CPCollectionViewDropIndicator _dropView;
 }
 
 - (id)initWithFrame:(CGRect)aFrame
@@ -127,69 +107,46 @@ var HORIZONTAL_MARGIN = 2;
 
     if (self)
     {
-        _maxNumberOfRows = 0;
-        _maxNumberOfColumns = 0;
+        _items = [];
+        _content = [];
 
-        _minItemSize = _CGSizeMakeZero();
-        _maxItemSize = _CGSizeMakeZero();
+        _cachedItems = [];
+
+        _itemSize = CGSizeMakeZero();
+        _minItemSize = CGSizeMakeZero();
+        _maxItemSize = CGSizeMakeZero();
 
         [self setBackgroundColors:nil];
 
         _verticalMargin = 5.0;
-        _isSelectable = YES;
-        _allowsEmptySelection = YES;
+        _tileWidth = -1.0;
 
-        [self _init];
+        _selectionIndexes = [CPIndexSet indexSet];
+        _allowsEmptySelection = YES;
+        _isSelectable = YES;
     }
 
     return self;
 }
 
-- (void)_init
-{
-    _content = [];
-
-    _items = [];
-    _cachedItems = [];
-
-    _numberOfColumns = CPNotFound;
-    _numberOfRows = CPNotFound;
-
-    _itemSize = _CGSizeMakeZero();
-
-    _selectionIndexes = [CPIndexSet indexSet];
-
-    _storedFrameSize = _CGSizeMakeZero();
-
-    _needsMinMaxItemSizeUpdate = YES;
-    _uniformSubviewsResizing = NO;
-    _lockResizing = NO;
-
-    _currentDropIndex      = -1;
-    _currentDragOperation  = CPDragOperationNone;
-    _dropView = nil;
-
-    [self setAutoresizesSubviews:NO];
-    [self setAutoresizingMask:0];
-}
-
 /*!
     Sets the item prototype to \c anItem
 
     The item prototype should implement the CPCoding protocol
-    because the item is copied by archiving and unarchiving.
+    because the item is copied by archiving and unarchiving the
+    prototypal view.
 
     Example:
 
     <pre>
-      @implement MyCustomViewItem : CPCollectionViewItem
+      @implement MyCustomView : CPCollectionViewItem
       {
           CPArray   items   @accessors;
       }
 
-      - (id)initWithCibName:(CPString)aCibNameOrNil bundle:(CPBundle)aCibBundleOrNil
+      - (id)initWithFrame:(CGRect)aFrame
       {
-        self = [super initWithCibName:aCibNameOrNil bundle:aCibBundleOrNil];
+        self = [super initWithFrame:aFrame];
         if (self)
         {
           items = [];
@@ -226,7 +183,7 @@ var HORIZONTAL_MARGIN = 2;
     _itemForDragging = nil;
     _itemPrototype = anItem;
 
-    [self _reloadContentCachingRemovedItems:NO];
+    [self reloadContent];
 }
 
 /*!
@@ -249,7 +206,13 @@ var HORIZONTAL_MARGIN = 2;
         item = _cachedItems.pop();
 
     else
-        item = [_itemPrototype copy];
+    {
+        if (!_itemData)
+            if (_itemPrototype)
+                _itemData = [CPKeyedArchiver archivedDataWithRootObject:_itemPrototype];
+
+        item = [CPKeyedUnarchiver unarchiveObjectWithData:_itemData];
+    }
 
     [item setRepresentedObject:anObject];
     [[item view] setFrameSize:_itemSize];
@@ -404,10 +367,7 @@ var HORIZONTAL_MARGIN = 2;
     [[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];
-    }
 }
 
 /*!
@@ -418,13 +378,8 @@ var HORIZONTAL_MARGIN = 2;
     return [_selectionIndexes copy];
 }
 
-- (void)reloadContent
-{
-    [self _reloadContentCachingRemovedItems:YES];
-}
-
 /* @ignore */
-- (void)_reloadContentCachingRemovedItems:(BOOL)shouldCache
+- (void)reloadContent
 {
     // Remove current views
     var count = _items.length;
@@ -434,8 +389,7 @@ var HORIZONTAL_MARGIN = 2;
         [[_items[count] view] removeFromSuperview];
         [_items[count] setSelected:NO];
 
-        if (shouldCache)
-            _cachedItems.push(_items[count]);
+        _cachedItems.push(_items[count]);
     }
 
     _items = [];
@@ -459,166 +413,91 @@ var HORIZONTAL_MARGIN = 2;
     while ((index = [_selectionIndexes indexGreaterThanIndex:index]) != CPNotFound && index < count)
         [_items[index] setSelected:YES];
 
-    [self tileIfNeeded:NO];
-}
-
-- (void)resizeSubviewsWithOldSize:(CPSize)oldBoundsSize
-{
-    // Desactivate subviews autoresizing
-}
-
-- (void)resizeWithOldSuperviewSize:(CPSize)oldBoundsSize
-{
-    if (_lockResizing)
-        return;
-
-    _lockResizing = YES;
-
     [self tile];
-
-    _lockResizing = NO;
 }
 
+/* @ignore */
 - (void)tile
 {
-    [self tileIfNeeded:!_uniformSubviewsResizing];
-}
+    var width = CGRectGetWidth([self bounds]);
 
-- (void)tileIfNeeded:(BOOL)lazyFlag
-{
-    var frameSize           = [[self superview] frameSize],
-        count               = _items.length,
-        oldNumberOfColumns  = _numberOfColumns,
-        oldNumberOfRows     = _numberOfRows,
-        oldItemSize         = _itemSize,
-        storedFrameSize     = _storedFrameSize;
-
-    // No need to tile if we are not yet placed in the view hierarchy.
-    if (!frameSize)
+    if (width == _tileWidth)
         return;
 
-    [self _updateMinMaxItemSizeIfNeeded];
+    // We try to fit as many views per row as possible.  Any remaining space is then
+    // either proportioned out to the views (if their minSize != maxSize) or used as
+    // margin
+    var itemSize = CGSizeMakeCopy(_minItemSize);
 
-    [self _computeGridWithSize:frameSize count:@ref(count)];
-
-    //CPLog.debug("frameSize="+CPStringFromSize(frameSize) + "itemSize="+CPStringFromSize(itemSize) + " ncols=" +  colsRowsCount[0] +" nrows="+ colsRowsCount[1]+" displayCount="+ colsRowsCount[2]);
-
-    [self setFrameSize:_storedFrameSize];
-
-    //CPLog.debug("OLD " + oldNumberOfColumns + " NEW " + _numberOfColumns);
-    if (!lazyFlag ||
-        _numberOfColumns !== oldNumberOfColumns ||
-        _numberOfRows    !== oldNumberOfRows ||
-        !_CGSizeEqualToSize(_itemSize, oldItemSize))
-
-        [self displayItems:_items frameSize:_storedFrameSize itemSize:_itemSize columns:_numberOfColumns rows:_numberOfRows count:count];
-}
-
-- (void)_computeGridWithSize:(CGSize)aSuperviewSize count:(Function)countRef
-{
-    var width               = aSuperviewSize.width,
-        height              = aSuperviewSize.height,
-        itemSize            = _CGSizeMakeCopy(_minItemSize),
-        maxItemSizeWidth    = _maxItemSize.width,
-        maxItemSizeHeight   = _maxItemSize.height,
-        itemsCount          = [_items count],
-        numberOfRows,
-        numberOfColumns;
-
-    numberOfColumns = FLOOR(width / itemSize.width);
-
-    if (maxItemSizeWidth == 0)
-        numberOfColumns = MIN(numberOfColumns, _maxNumberOfColumns);
+    _numberOfColumns = MAX(1.0, FLOOR(width / itemSize.width));
 
     if (_maxNumberOfColumns > 0)
-        numberOfColumns = MIN(MIN(_maxNumberOfColumns, itemsCount), numberOfColumns);
+        _numberOfColumns = MIN(_maxNumberOfColumns, _numberOfColumns);
 
-    numberOfColumns = MAX(1.0, numberOfColumns);
+    var remaining = width - _numberOfColumns * itemSize.width,
+        itemsNeedSizeUpdate = NO;
 
-    itemSize.width = FLOOR(width / numberOfColumns);
+    if (remaining > 0 && itemSize.width < _maxItemSize.width)
+        itemSize.width = MIN(_maxItemSize.width, itemSize.width + FLOOR(remaining / _numberOfColumns));
 
-    if (maxItemSizeWidth > 0)
+    // When we ONE column and a non-integral width, the FLOORing above can cause the item width to be smaller than the total width.
+    if (_maxNumberOfColumns == 1 && itemSize.width < _maxItemSize.width && itemSize.width < width)
+        itemSize.width = MIN(_maxItemSize.width, width);
+
+    if (!CGSizeEqualToSize(_itemSize, itemSize))
     {
-        itemSize.width = MIN(maxItemSizeWidth, itemSize.width);
-
-        if (numberOfColumns == 1)
-            itemSize.width = MIN(maxItemSizeWidth, width);
+        _itemSize = itemSize;
+        itemsNeedSizeUpdate = YES;
     }
 
-    numberOfRows = CEIL(itemsCount / numberOfColumns);
+    var index = 0,
+        count = _items.length;
 
-    if (_maxNumberOfRows > 0)
-        numberOfRows = MIN(numberOfRows, _maxNumberOfRows);
+    if (_maxNumberOfColumns > 0 && _maxNumberOfRows > 0)
+        count = MIN(count, _maxNumberOfColumns * _maxNumberOfRows);
 
-    height = MAX(height, numberOfRows * (_minItemSize.height + _verticalMargin));
+    _numberOfRows = CEIL(count / _numberOfColumns);
 
-    var itemSizeHeight = FLOOR(height / numberOfRows);
-
-    if (maxItemSizeHeight > 0)
-        itemSizeHeight = MIN(itemSizeHeight, maxItemSizeHeight);
-
-    _itemSize        = _CGSizeMake(MAX(_minItemSize.width, itemSize.width), MAX(_minItemSize.height, itemSizeHeight));
-    _storedFrameSize = _CGSizeMake(MAX(width, _minItemSize.width), height);
-    _numberOfColumns = numberOfColumns;
-    _numberOfRows    = numberOfRows;
-    countRef(MIN(itemsCount, numberOfColumns * numberOfRows));
-}
-
-- (void)displayItems:(CPArray)displayItems frameSize:(CGSize)aFrameSize itemSize:(CGSize)anItemSize columns:(CPInteger)numberOfColumns rows:(CPInteger)numberOfRows count:(CPInteger)displayCount
-{
-//    CPLog.debug("DISPLAY ITEMS " + numberOfColumns + " " +  numberOfRows);
-
-    _horizontalMargin = _uniformSubviewsResizing ? FLOOR((aFrameSize.width - numberOfColumns * anItemSize.width) / (numberOfColumns + 1)) : HORIZONTAL_MARGIN;
+    _horizontalMargin = FLOOR((width - _numberOfColumns * itemSize.width) / (_numberOfColumns + 1));
 
     var x = _horizontalMargin,
-        y = -anItemSize.height;
+        y = -itemSize.height;
 
-    [displayItems enumerateObjectsUsingBlock:function(item, idx, stop)
+    for (; index < count; ++index)
     {
-        var view = [item view];
-
-        if (idx >= displayCount)
-        {
-            [view setFrameOrigin:_CGPointMake(-anItemSize.width, -anItemSize.height)];
-            return;
-        }
-
-        if (idx % numberOfColumns == 0)
+        if (index % _numberOfColumns == 0)
         {
             x = _horizontalMargin;
-            y += _verticalMargin + anItemSize.height;
+            y += _verticalMargin + itemSize.height;
         }
 
-        [view setFrameOrigin:_CGPointMake(x, y)];
-        [view setFrameSize:anItemSize];
+        var view = [_items[index] view];
 
-        x += anItemSize.width + _horizontalMargin;
-    }];
+        [view setFrameOrigin:CGPointMake(x, y)];
+
+        if (itemsNeedSizeUpdate)
+            [view setFrameSize:_itemSize];
+
+        x += itemSize.width + _horizontalMargin;
+    }
+
+    var superview = [self superview],
+        proposedHeight = y + itemSize.height + _verticalMargin;
+
+    if ([superview isKindOfClass:[CPClipView class]])
+    {
+        var superviewSize = [superview bounds].size;
+        proposedHeight = MAX(superviewSize.height, proposedHeight);
+    }
+
+    _tileWidth = width;
+    [self setFrameSize:CGSizeMake(width, proposedHeight)];
+    _tileWidth = -1.0;
 }
 
-- (void)_updateMinMaxItemSizeIfNeeded
+- (void)resizeSubviewsWithOldSize:(CGSize)aSize
 {
-    if (!_needsMinMaxItemSizeUpdate)
-        return;
-
-    var prototypeView;
-
-    if (_itemPrototype && (prototypeView = [_itemPrototype view]))
-    {
-        if (_minItemSize.width == 0)
-            _minItemSize.width = [prototypeView frameSize].width;
-
-        if (_minItemSize.height == 0)
-            _minItemSize.height = [prototypeView frameSize].height;
-
-        if (_maxItemSize.height == 0 && !([prototypeView autoresizingMask] & CPViewHeightSizable))
-            _maxItemSize.height = [prototypeView frameSize].height;
-
-        if (_maxItemSize.width == 0 && !([prototypeView autoresizingMask] & CPViewWidthSizable))
-            _maxItemSize.width = [prototypeView frameSize].width;
-
-        _needsMinMaxItemSizeUpdate = NO;
-    }
+    [self tile];
 }
 
 // Laying Out the Collection View
@@ -691,14 +570,10 @@ var HORIZONTAL_MARGIN = 2;
 {
     if (aSize === nil || aSize === undefined)
         [CPException raise:CPInvalidArgumentException reason:"Invalid value provided for minimum size"];
-
-    if (_CGSizeEqualToSize(_minItemSize, aSize))
+    if (CGSizeEqualToSize(_minItemSize, aSize))
         return;
 
-    _minItemSize = _CGSizeMakeCopy(aSize);
-
-    if (_CGSizeEqualToSize(_minItemSize, _CGSizeMakeZero()))
-        _needsMinMaxItemSizeUpdate = YES;
+    _minItemSize = CGSizeMakeCopy(aSize);
 
     [self tile];
 }
@@ -717,13 +592,10 @@ var HORIZONTAL_MARGIN = 2;
 */
 - (void)setMaxItemSize:(CGSize)aSize
 {
-    if (_CGSizeEqualToSize(_maxItemSize, aSize))
+    if (CGSizeEqualToSize(_maxItemSize, aSize))
         return;
 
-    _maxItemSize = _CGSizeMakeCopy(aSize);
-
-//    if (_maxItemSize.width == 0 || _maxItemSize.height == 0)
-//        _needsMinMaxItemSizeUpdate = YES;
+    _maxItemSize = CGSizeMakeCopy(aSize);
 
     [self tile];
 }
@@ -744,7 +616,7 @@ var HORIZONTAL_MARGIN = 2;
     _backgroundColors = backgroundColors;
 
     if (!_backgroundColors)
-        _backgroundColors = [[CPColor whiteColor]];
+        _backgroundColors = [CPColor whiteColor];
 
     if ([_backgroundColors count] === 1)
         [self setBackgroundColor:_backgroundColors[0]];
@@ -792,9 +664,9 @@ var HORIZONTAL_MARGIN = 2;
                     newSelectedRange = nil;
 
                 if (index < firstSelectedIndex)
-                    newSelectedRange = _CPMakeRange(index, (firstSelectedIndex - index) + 1);
+                    newSelectedRange = CPMakeRange(index, (firstSelectedIndex - index) + 1);
                 else
-                    newSelectedRange = _CPMakeRange(firstSelectedIndex, (index - firstSelectedIndex) + 1);
+                    newSelectedRange = CPMakeRange(firstSelectedIndex, (index - firstSelectedIndex) + 1);
 
                 indexes = [[self selectionIndexes] copy];
                 [indexes addIndexesInRange:newSelectedRange];
@@ -816,6 +688,65 @@ var HORIZONTAL_MARGIN = 2;
         [self setSelectionIndexes:[CPIndexSet indexSet]];
 }
 
+- (void)mouseDragged:(CPEvent)anEvent
+{
+    // Don't crash if we never registered the intial click.
+    if (!_mouseDownEvent)
+        return;
+
+    var locationInWindow = [anEvent locationInWindow],
+        mouseDownLocationInWindow = [_mouseDownEvent locationInWindow];
+
+    // FIXME: This is because Safari's drag hysteresis is 3px x 3px
+    if ((ABS(locationInWindow.x - mouseDownLocationInWindow.x) < 3) &&
+        (ABS(locationInWindow.y - mouseDownLocationInWindow.y) < 3))
+        return;
+
+    if (![_delegate respondsToSelector:@selector(collectionView:dragTypesForItemsAtIndexes:)])
+        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])
+        return;
+
+    // Set up the pasteboard
+    var dragTypes = [_delegate collectionView:self dragTypesForItemsAtIndexes:_selectionIndexes];
+
+    [[CPPasteboard pasteboardWithName:CPDragPboard] declareTypes:dragTypes owner:self];
+
+    if (!_itemForDragging)
+        _itemForDragging = [self newItemForRepresentedObject:_content[[_selectionIndexes firstIndex]]];
+    else
+        [_itemForDragging setRepresentedObject:_content[[_selectionIndexes firstIndex]]];
+
+    var view = [_itemForDragging view];
+
+    [view setFrameSize:_itemSize];
+    [view setAlphaValue:0.7];
+
+    [self dragView:view
+        at:[[_items[[_selectionIndexes firstIndex]] view] frame].origin
+        offset:CGSizeMakeZero()
+        event:_mouseDownEvent
+        pasteboard:nil
+        source:self
+        slideBack:YES];
+}
+
+/*!
+    Places the selected items on the specified pasteboard. The items are requested from the collection's delegate.
+    @param aPasteboard the pasteboard to put the items on
+    @param aType the format the pasteboard data
+*/
+- (void)pasteboard:(CPPasteboard)aPasteboard provideDataForType:(CPString)aType
+{
+    [aPasteboard setData:[_delegate collectionView:self dataForItemsAtIndexes:_selectionIndexes forType:aType] forType:aType];
+}
+
 // Cappuccino Additions
 
 /*!
@@ -833,13 +764,6 @@ var HORIZONTAL_MARGIN = 2;
     [self tile];
 }
 
-- (void)setUniformSubviewsResizing:(float)flag
-{
-    _uniformSubviewsResizing = flag;
-    [self tileIfNeeded:NO];
-}
-
-
 /*!
     Gets the collection view's current vertical spacing between elements.
 */
@@ -882,17 +806,10 @@ var HORIZONTAL_MARGIN = 2;
 
 - (int)_indexAtPoint:(CGPoint)thePoint
 {
-    var column = FLOOR(thePoint.x / (_itemSize.width + _horizontalMargin));
+    var row = FLOOR(thePoint.y / (_itemSize.height + _verticalMargin)),
+        column = FLOOR(thePoint.x / (_itemSize.width + _horizontalMargin));
 
-    if (column < _numberOfColumns)
-    {
-        var row = FLOOR(thePoint.y / (_itemSize.height + _verticalMargin));
-
-        if (row < _numberOfRows)
-            return (row * _numberOfColumns + column);
-    }
-
-    return CPNotFound;
+    return row * _numberOfColumns + column;
 }
 
 - (CPCollectionViewItem)itemAtIndex:(unsigned)anIndex
@@ -923,294 +840,6 @@ var HORIZONTAL_MARGIN = 2;
 
 @end
 
-@implementation CPCollectionView (DragAndDrop)
-/*
-    TODO: dropOperation is not supported yet. The visible drop operation is like CPCollectionViewDropBefore.
-*/
-
-/*!
-    Places the selected items on the specified pasteboard. The items are requested from the collection's delegate.
-    @param aPasteboard the pasteboard to put the items on
-    @param aType the format the pasteboard data
-*/
-- (void)pasteboard:(CPPasteboard)aPasteboard provideDataForType:(CPString)aType
-{
-    [aPasteboard setData:[_delegate collectionView:self dataForItemsAtIndexes:_selectionIndexes forType:aType] forType:aType];
-}
-
-- (void)_createDropIndicatorIfNeeded
-{
-    // Create and position the drop indicator view.
-
-    if (!_dropView)
-        _dropView = [[_CPCollectionViewDropIndicator alloc] initWithFrame:_CGRectMake(-8, -8, 0, 0)];
-
-    [_dropView setFrameSize:_CGSizeMake(10, _itemSize.height + _verticalMargin)];
-    [self addSubview:_dropView];
-}
-
-- (void)mouseDragged:(CPEvent)anEvent
-{
-    // Don't crash if we never registered the intial click.
-    if (!_mouseDownEvent)
-        return;
-
-    [self _createDropIndicatorIfNeeded];
-
-    var locationInWindow = [anEvent locationInWindow],
-        mouseDownLocationInWindow = [_mouseDownEvent locationInWindow];
-
-    // FIXME: This is because Safari's drag hysteresis is 3px x 3px
-    if ((ABS(locationInWindow.x - mouseDownLocationInWindow.x) < 3) &&
-        (ABS(locationInWindow.y - mouseDownLocationInWindow.y) < 3))
-        return;
-
-    if (![_delegate respondsToSelector:@selector(collectionView:dragTypesForItemsAtIndexes:)])
-        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])
-        return;
-
-    // Set up the pasteboard
-    var dragTypes = [_delegate collectionView:self dragTypesForItemsAtIndexes:_selectionIndexes];
-
-    [[CPPasteboard pasteboardWithName:CPDragPboard] declareTypes:dragTypes owner:self];
-
-    var dragImageOffset = _CGSizeMakeZero(),
-        view = [self _draggingViewForItemsAtIndexes:_selectionIndexes withEvent:_mouseDownEvent offset:dragImageOffset];
-
-    [view setFrameSize:_itemSize];
-    [view setAlphaValue:0.7];
-
-    var dragLocation = [self convertPoint:locationInWindow fromView:nil],
-        dragPoint = _CGPointMake(dragLocation.x - _itemSize.width / 2 , dragLocation.y - _itemSize.height / 2);
-
-    [self dragView:view
-        at:dragPoint
-        offset:dragImageOffset
-        event:_mouseDownEvent
-        pasteboard:nil
-        source:self
-        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]];
-
-    if (!_itemForDragging)
-        _itemForDragging = [self newItemForRepresentedObject:idx];
-    else
-        [_itemForDragging setRepresentedObject:idx];
-
-    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,
-        dropIndexRef = @ref(dropIndex),
-        dragOp = [self _validateDragWithInfo:draggingInfo dropIndex:dropIndexRef dropOperation:1];
-
-    dropIndex = dropIndexRef();
-
-    [self _createDropIndicatorIfNeeded];
-
-    [self _updateDragAndDropStateWithDraggingInfo:draggingInfo newDragOperation:dragOp newDropIndex:dropIndex newDropOperation:1];
-
-    return _currentDragOperation;
-}
-
-- (CPDragOperation)draggingUpdated:(id)draggingInfo
-{
-    if (![self _dropIndexDidChange:draggingInfo])
-        return _currentDragOperation;
-
-    var dropIndex,
-        dropIndexRef = @ref(dropIndex);
-
-    var dragOperation = [self _validateDragWithInfo:draggingInfo dropIndex:dropIndexRef dropOperation:1];
-
-    dropIndex = dropIndexRef();
-
-    [self _updateDragAndDropStateWithDraggingInfo:draggingInfo newDragOperation:dragOperation newDropIndex:dropIndex newDropOperation:1];
-
-    return dragOperation;
-}
-
-- (CPDragOperation)_validateDragWithInfo:(id)draggingInfo dropIndex:(Function)dropIndexRef dropOperation:(int)dropOperation
-{
-    var result = CPDragOperationMove,
-        dropIndex = [self _dropIndexForDraggingInfo:draggingInfo proposedDropOperation:dropOperation];
-
-    if ([_delegate respondsToSelector:@selector(collectionView:validateDrop:proposedIndex:dropOperation:)])
-    {
-        var dropIndexRef2 = @ref(dropIndex);
-
-        result = [_delegate collectionView:self validateDrop:draggingInfo proposedIndex:dropIndexRef2  dropOperation:dropOperation];
-
-        if (result !== CPDragOperationNone)
-        {
-            dropIndex = dropIndexRef2();
-        }
-    }
-
-    dropIndexRef(dropIndex);
-
-    return result;
-}
-
-- (void)draggingExited:(id)draggingInfo
-{
-    [self _updateDragAndDropStateWithDraggingInfo:draggingInfo newDragOperation:0 newDropIndex:-1 newDropOperation:1];
-}
-
-- (void)draggingEnded:(id)draggingInfo
-{
-    [self _updateDragAndDropStateWithDraggingInfo:draggingInfo newDragOperation:0 newDropIndex:-1 newDropOperation:1];
-}
-
-/*
-Not supported. Use -collectionView:dataForItemsAtIndexes:fortype:
-- (BOOL)_writeItemsAtIndexes:(CPIndexSet)indexes toPasteboard:(CPPasteboard)pboard
-{
-    if ([self respondsToSelector:@selector(collectionView:writeItemsAtIndexes:toPasteboard:)])
-        return [_delegate collectionView:self writeItemsAtIndexes:indexes toPasteboard:pboard];
-
-    return NO;
-}
-*/
-
-- (BOOL)performDragOperation:(id)draggingInfo
-{
-    var result = NO;
-
-    if (_currentDragOperation && _currentDropIndex !== -1)
-        result = [_delegate collectionView:self acceptDrop:draggingInfo index:_currentDropIndex dropOperation:1];
-
-    [self draggingEnded:draggingInfo]; // Is this correct ?
-
-    return result;
-}
-
-- (void)_updateDragAndDropStateWithDraggingInfo:(id)draggingInfo newDragOperation:(CPDragOperation)dragOperation newDropIndex:(CPInteger)dropIndex newDropOperation:(CPInteger)dropOperation
-{
-    _currentDropIndex = dropIndex;
-    _currentDragOperation = dragOperation;
-
-    var frameOrigin,
-        dropviewFrameWidth = _CGRectGetWidth([_dropView frame]);
-
-    if (_currentDropIndex == -1 || _currentDragOperation == CPDragOperationNone)
-        frameOrigin = _CGPointMake(-dropviewFrameWidth, 0);
-    else if (_currentDropIndex == 0)
-        frameOrigin = _CGPointMake(0, 0);
-    else
-    {
-        var offset;
-
-        if ((_currentDropIndex % _numberOfColumns) !== 0 || _currentDropIndex == [_items count])
-        {
-            dropIndex = _currentDropIndex - 1;
-            offset = (_horizontalMargin - dropviewFrameWidth) / 2;
-        }
-        else
-        {
-            offset = - _itemSize.width - dropviewFrameWidth - (_horizontalMargin - dropviewFrameWidth) / 2;
-        }
-
-        var rect = [self frameForItemAtIndex:dropIndex];
-
-        frameOrigin = _CGPointMake(_CGRectGetMaxX(rect) + offset, rect.origin.y - _verticalMargin);
-    }
-
-    [_dropView setFrameOrigin:frameOrigin];
-}
-
-- (BOOL)_dropIndexDidChange:(id)draggingInfo
-{
-    var dropIndex = [self _dropIndexForDraggingInfo:draggingInfo proposedDropOperation:1];
-
-    if (dropIndex == CPNotFound)
-        dropIndex = [[self content] count];
-
-    return (_currentDropIndex !== dropIndex)
-}
-
-- (CPInteger)_dropIndexForDraggingInfo:(id)draggingInfo proposedDropOperation:(int)dropOperation
-{
-    var location = [self convertPoint:[draggingInfo draggingLocation] fromView:nil],
-        locationX = location.x + _itemSize.width / 2;
-
-    var column = MIN(FLOOR(locationX / (_itemSize.width + _horizontalMargin)), _numberOfColumns),
-        row = FLOOR(location.y / (_itemSize.height + _verticalMargin));
-
-    if (row >= _numberOfRows - 1)
-    {
-        if (row >= _numberOfRows)
-        {
-            row = _numberOfRows - 1;
-            column = _numberOfColumns;
-        }
-
-        return MIN((row * _numberOfColumns + column), [_items count]);
-    }
-
-    return (row * _numberOfColumns + column);
-}
-
-@end
-
-@implementation _CPCollectionViewDropIndicator : CPView
-{
-}
-
-- (void)drawRect:(CGRect)aRect
-{
-    var context = [[CPGraphicsContext currentContext] graphicsPort],
-        width = _CGRectGetWidth(aRect),
-        circleRect = _CGRectMake(1, 1, width - 2, width - 2);
-
-    CGContextSetStrokeColor(context, [CPColor colorWithHexString:@"4886ca"]);
-    CGContextSetFillColor(context, [CPColor whiteColor]);
-    CGContextSetLineWidth(context, 3);
-
-    //draw white under the circle thing
-    CGContextFillRect(context, circleRect);
-
-    //draw the circle thing
-    CGContextStrokeEllipseInRect(context, circleRect);
-
-    //then draw the line
-    CGContextBeginPath(context);
-    CGContextMoveToPoint(context, FLOOR(width / 2), _CGRectGetMinY(aRect) + width);
-    CGContextAddLineToPoint(context, FLOOR(width / 2), _CGRectGetHeight(aRect));
-    CGContextStrokePath(context);
-}
-
-@end
-
 @implementation CPCollectionView (KeyboardInteraction)
 
 - (void)_modifySelectionWithNewIndex:(int)anIndex direction:(int)aDirection expand:(BOOL)shouldExpand
@@ -1225,9 +854,9 @@ Not supported. Use -collectionView:dataForItemsAtIndexes:fortype:
 
         // if the direction is backward (-1) check with the bottom anchor
         if (aDirection === -1)
-            [indexes addIndexesInRange:_CPMakeRange(anIndex, bottomAnchor - anIndex + 1)];
+            [indexes addIndexesInRange:CPMakeRange(anIndex, bottomAnchor - anIndex + 1)];
         else
-            [indexes addIndexesInRange:_CPMakeRange(topAnchor, anIndex -  topAnchor + 1)];
+            [indexes addIndexesInRange:CPMakeRange(topAnchor, anIndex -  topAnchor + 1)];
     }
     else
         indexes = [CPIndexSet indexSetWithIndex:anIndex];
@@ -1240,7 +869,7 @@ Not supported. Use -collectionView:dataForItemsAtIndexes:fortype:
 {
     var frame = [self frameForItemsAtIndexes:[self selectionIndexes]];
 
-    if (!_CGRectIsNull(frame))
+    if (!CGRectIsNull(frame))
         [self scrollRectToVisible:frame];
 }
 
@@ -1320,11 +949,6 @@ Not supported. Use -collectionView:dataForItemsAtIndexes:fortype:
     [self interpretKeyEvents:[anEvent]];
 }
 
-- (void)setAutoresizingMask:(int)aMask
-{
-    [super setAutoresizingMask:0];
-}
-
 @end
 
 @implementation CPCollectionView (Deprecated)
@@ -1359,12 +983,35 @@ var CPCollectionViewMinItemSizeKey              = @"CPCollectionViewMinItemSizeK
 
 @implementation CPCollectionView (CPCoding)
 
+- (void)awakeFromCib
+{
+    [super awakeFromCib];
+
+    var prototypeView = [_itemPrototype view];
+    if (prototypeView && (CGSizeEqualToSize(_minItemSize, CGSizeMakeZero()) || CGSizeEqualToSize(_maxItemSize, CGSizeMakeZero())))
+    {
+        var item = _itemPrototype;
+
+        if (CGSizeEqualToSize(_minItemSize, CGSizeMakeZero()))
+            _minItemSize = [prototypeView frameSize];
+        else if (CGSizeEqualToSize(_maxItemSize, CGSizeMakeZero()))
+            _maxItemSize = [prototypeView frameSize];
+    }
+}
+
 - (id)initWithCoder:(CPCoder)aCoder
 {
     self = [super initWithCoder:aCoder];
 
     if (self)
     {
+        _items = [];
+        _content = [];
+
+        _cachedItems = [];
+
+        _itemSize = CGSizeMakeZero();
+
         _minItemSize = [aCoder decodeSizeForKey:CPCollectionViewMinItemSizeKey];
         _maxItemSize = [aCoder decodeSizeForKey:CPCollectionViewMaxItemSizeKey];
 
@@ -1378,7 +1025,11 @@ var CPCollectionViewMinItemSizeKey              = @"CPCollectionViewMinItemSizeK
 
         [self setBackgroundColors:[aCoder decodeObjectForKey:CPCollectionViewBackgroundColorsKey]];
 
-        [self _init];
+        _tileWidth = -1.0;
+
+        _selectionIndexes = [CPIndexSet indexSet];
+
+        _allowsEmptySelection = YES;
     }
 
     return self;
@@ -1388,10 +1039,10 @@ var CPCollectionViewMinItemSizeKey              = @"CPCollectionViewMinItemSizeK
 {
     [super encodeWithCoder:aCoder];
 
-    if (!_CGSizeEqualToSize(_minItemSize, _CGSizeMakeZero()))
+    if (!CGSizeEqualToSize(_minItemSize, CGSizeMakeZero()))
       [aCoder encodeSize:_minItemSize forKey:CPCollectionViewMinItemSizeKey];
 
-    if (!_CGSizeEqualToSize(_maxItemSize, _CGSizeMakeZero()))
+    if (!CGSizeEqualToSize(_maxItemSize, CGSizeMakeZero()))
       [aCoder encodeSize:_maxItemSize forKey:CPCollectionViewMaxItemSizeKey];
 
     [aCoder encodeInt:_maxNumberOfRows forKey:CPCollectionViewMaxNumberOfRowsKey];

AppKit/CPCollectionViewItem.j

@@ -22,38 +22,13 @@
 
 @import "CPViewController.j"
 
+
 /*!
     Represents an object inside a CPCollectionView.
 */
 @implementation CPCollectionViewItem : CPViewController
 {
     BOOL    _isSelected;
-    CPData  _cachedArchive;
-}
-
-- (id)copy
-{
-    var cibName = [self cibName],
-        copy;
-
-    if (cibName)
-    {
-        copy = [[[self class] alloc] initWithCibName:cibName bundle:[self cibBundle]];
-    }
-    else
-    {
-        if (!_cachedArchive)
-            _cachedArchive = [CPKeyedArchiver archivedDataWithRootObject:self];
-
-        copy = [CPKeyedUnarchiver unarchiveObjectWithData:_cachedArchive];
-
-        // copy connections
-    }
-
-    [copy setRepresentedObject:[self representedObject]];
-    [copy setSelected:_isSelected];
-
-    return copy;
 }
 
 // Setting the Represented Object

AppKit/CPColor.j

@@ -21,24 +21,12 @@
  */
 
 @import <Foundation/CPObject.j>
-@import "CPGraphicsContext.j"
 
 @import "CGColor.j"
 
 @import "CPCompatibility.j"
 @import "CPImage.j"
 
-
-/*!
-    Orientation to use with \c CPColorPattern for vertical patterns.
-*/
-CPColorPatternIsVertical = YES;
-
-/*!
-    Orientation to use with \c CPColorPattern for horizontal patterns.
-*/
-CPColorPatternIsHorizontal = NO;
-
 /// @cond IGNORE
 
 var _redComponent        = 0,
@@ -69,6 +57,64 @@ var cachedBlackColor,
 
 /// @endcond
 
+/*!
+    Orientation to use with \c CPColorPattern for vertical patterns.
+*/
+CPColorPatternIsVertical = YES;
+
+/*!
+    Orientation to use with \c CPColorPattern for horizontal patterns.
+*/
+CPColorPatternIsHorizontal = NO;
+
+/*!
+    To create a simple color with a pattern image:
+
+    <code>CPColorWithImages(name, width, height{, bundle})</code>
+
+    To create a color with a three part pattern image:
+
+    <code>CPColorWithImages(slices{, orientation})</code>
+
+    where slices is an array of three [name, width, height{, bundle}] arrays,
+    and orientation is \c CPColorPatternIsVertical or \ref CPColorPatternIsHorizontal.
+    If orientatation is not passed, it defaults to \ref CPColorPatternIsHorizontal.
+
+    To create a color with a nine part pattern image:
+
+    <code>CPColorWithImages(slices);</code>
+
+    where slices is an array of nine [name, width, height{, bundle}] arrays.
+*/
+function CPColorWithImages()
+{
+    if (arguments.length < 3)
+    {
+        var slices = arguments[0],
+            imageSlices = [];
+
+        for (var i = 0; i < slices.length; ++i)
+        {
+            var slice = slices[i];
+
+            imageSlices.push(slice ? CPImageInBundle(slice[0], CGSizeMake(slice[1], slice[2]), slice[3]) : nil);
+        }
+
+        if (imageSlices.length === 3)
+            return [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices:imageSlices isVertical:arguments[1] || CPColorPatternIsHorizontal]];
+        else
+            return [CPColor colorWithPatternImage:[[CPNinePartImage alloc] initWithImageSlices:imageSlices]];
+    }
+    else if (arguments.length === 3 || arguments.length === 4)
+    {
+        return [CPColor colorWithPatternImage:CPImageInBundle(arguments[0], CGSizeMake(arguments[1], arguments[2]), arguments[3])];
+    }
+    else
+    {
+        return nil;
+    }
+}
+
 /*!
     @ingroup appkit
 
@@ -693,7 +739,7 @@ url("data:image/png;base64,BASE64ENCODEDDATA")  // if there is a pattern image
 
         for (var i = 0; i < slices.length; ++i)
         {
-            var imgDescription = [slices[i] description] || "nil";
+            var imgDescription = [slices[i] description];
 
             description += imgDescription.replace(/^/mg, "        ") + ",\n";
         }
@@ -701,7 +747,7 @@ url("data:image/png;base64,BASE64ENCODEDDATA")  // if there is a pattern image
         description = description.substr(0, description.length - 2) + "\n    ]\n}";
     }
     else
-        description += ([patternImage description] || "nil").replace(/^/mg, "    ") + "\n}";
+        description += [patternImage description].replace(/^/mg, "    ") + "\n}";
 
     return description;
 }
@@ -826,551 +872,4 @@ var byteToHex = function(n)
            hexCharacters.charAt(n % 16);
 };
 
-/*!
-    To create a simple color with a pattern image:
-        CPColorWithImages(name, width, height{, bundle})
-
-    To create a color with a three-part/nine-part image using a pattern string:
-        CPColorWithImages(pattern, attributes{, bundle})
-
-    <pattern> must have one or more placeholders. There are there possible
-    placeholders available that together can be used to build a filename:
-
-    style     A top-level style, for example normal (empty) and "default".
-    state     The state of a view, for example "highlighted" and "disabled".
-    position  The position of an image within a 3-part or 9-part image.
-              This must be provided.
-
-    Each placeholder is filled with the values you pass in a the attributes object.
-    Neither style nor state are necessary, if you omit them the next level of the
-    hierarchy is the top level.
-
-    Attributes
-    ----------
-    styles: [...]
-    An array of style names. For example, if you want to generate the filenames
-    "button-bezel" and "default-button-bezel", you would use ["", "default"]
-    for the styles.
-
-    states: [...]
-    An array of state names.
-
-    positions: <spec>
-    Specifies the naming convention for the slices of the image. For 3-part images,
-    <spec> may be one of:
-
-        "@"     Equivalent to ["left", "center", "right"] for horizontal
-                images, ["top", "center", "bottom"] for vertical images
-        "#"     Equivalent to ["0", "1", "2"]
-        [...]   An array of any three literal strings
-
-    For 9-part images, <spec> may be one of:
-
-        "@" | "abbrev"  Equivalent to ["top-left", "top", "top-right",
-                                       "left", "center", "right",
-                                       "bottom-left", "bottom", "bottom-right"]
-        "full"          Equivalent to ["top-left", "top-center", "top-right",
-                                       "center-left", "center-center", "center-right",
-                                       "bottom-left", "bottom-center", "bottom-right"]
-        "#"              Equivalent to ["0", "1", "2", "3", "4", "5", "6", "7", "8"]
-        [...]           An array of any nine literal strings
-
-    width: <number>
-    The width of the left image for horizontal 3-part images, the top image for
-    vertical 3-part images, or the top left corner for 9-part images.
-
-    height: <number>
-    The height of the left image for horizontal 3-part images, the top image for
-    vertical 3-part images, or the top left corner for 9-part images.
-
-    centerWidth: <number>
-    For a horizontal 3-part image that has a center slice width that is not 1.0,
-    set this for the width of the center slice. If omitted, it defaults
-    to 1.0. Not used for 9-part images.
-
-    rightWidth: <number>
-    For a horizontal 3-part image that has different left/right slice widths,
-    or a 9-part image that has different left/right corner slice widths,
-    set this for the width of the right slice. If omitted, the "width"
-    value is used for left and right widths.
-
-    centerHeight: <number>
-    For a vertical 3-part image that has a center slice height that is not 1.0,
-    set this for the height of the center slice. If omitted, it defaults
-    to 1.0. Not used for 9-part images.
-
-    bottomHeight: <number>
-    For a vertical image that has different top/bottom slice heights,
-    or a 9-part image that has different top/bottom corner slice heights,
-    set this for the height of the bottom slice. If omitted, the "height"
-    value is used for top and bottom heights.
-
-    centerIsNil: <BOOL>
-    For 9-part images, if the center image is nil, set this to YES.
-    If omitted or set to NO, a center image must be provided.
-
-    separator: <string>
-    The separator to use between components of the pattern.
-    If it is omitted, it defaults to "-".
-
-    orientation: PatternIsHorizontal | PatternIsVertical
-    The orientation of the image. This must be specified for 3-part images,
-    it should NOT be specified for 9-part images.
-
-    Using a pattern, all of this:
-
-    bezelColor = PatternColor(
-        [
-            ["button-bezel-left.png", 4.0, 24.0],
-            ["button-bezel-center.png", 1.0, 24.0],
-            ["button-bezel-right.png", 4.0, 24.0]
-        ],
-        PatternIsHorizontal),
-
-    highlightedBezelColor = PatternColor(
-        [
-            ["button-bezel-highlighted-left.png", 4.0, 24.0],
-            ["button-bezel-highlighted-center.png", 1.0, 24.0],
-            ["button-bezel-highlighted-right.png", 4.0, 24.0]
-        ],
-        PatternIsHorizontal),
-
-    disabledBezelColor = PatternColor(
-        [
-            ["button-bezel-disabled-left.png", 4.0, 24.0],
-            ["button-bezel-disabled-center.png", 1.0, 24.0],
-            ["button-bezel-disabled-right.png", 4.0, 24.0]
-        ],
-        PatternIsHorizontal),
-
-    defaultBezelColor = PatternColor(
-        [
-            ["default-button-bezel-left.png", 4.0, 24.0],
-            ["default-button-bezel-center.png", 1.0, 24.0],
-            ["default-button-bezel-right.png", 4.0, 24.0]
-        ],
-        PatternIsHorizontal),
-
-    defaultHighlightedBezelColor = PatternColor(
-        [
-            ["default-button-bezel-highlighted-left.png", 4.0, 24.0],
-            ["default-button-bezel-highlighted-center.png", 1.0, 24.0],
-            ["default-button-bezel-highlighted-right.png", 4.0, 24.0]
-        ],
-        PatternIsHorizontal),
-
-    defaultDisabledBezelColor = PatternColor(
-        [
-            ["default-button-bezel-disabled-left.png", 4.0, 24.0],
-            ["default-button-bezel-disabled-center.png", 1.0, 24.0],
-            ["default-button-bezel-disabled-right.png", 4.0, 24.0]
-        ],
-        PatternIsHorizontal)
-
-    can be replaced with this:
-
-    bezelColors = PatternColor(
-        "{style}button-bezel{state}{position}.png",
-        {
-            styles: ["", "default"],
-            states: ["", "highlighted", "disabled"],
-            positions: "@",
-            width: 4.0,
-            height: 24.0,
-            orientation: PatternIsHorizontal
-        })
-
-    Which would effectively create the following object:
-
-    {
-        "@":
-        {
-            "@": <ThreePartImage>:
-            [
-                ["button-bezel-left.png", 4.0, 24.0],
-                ["button-bezel-center.png", 1.0, 24.0],
-                ["button-bezel-right.png", 4.0, 24.0]
-            ],
-            "highlighted": <ThreePartImage>:
-            [
-                ["button-bezel-highlighted-left.png", 4.0, 24.0],
-                ["button-bezel-highlighted-center.png", 1.0, 24.0],
-                ["button-bezel-highlighted-right.png", 4.0, 24.0]
-            ],
-            "disabled": <ThreePartImage>:
-            [
-                ["button-bezel-disabled-left.png", 4.0, 24.0],
-                ["button-bezel-disabled-center.png", 1.0, 24.0],
-                ["button-bezel-disabled-right.png", 4.0, 24.0]
-            ]
-        },
-
-        "default":
-        {
-            "@": <ThreePartImage>:
-            [
-                ["default-button-bezel-left.png", 4.0, 24.0],
-                ["default-button-bezel-center.png", 1.0, 24.0],
-                ["default-button-bezel-right.png", 4.0, 24.0]
-            ],
-            "highlighted": <ThreePartImage>:
-            [
-                ["default-button-bezel-highlighted-left.png", 4.0, 24.0],
-                ["default-button-bezel-highlighted-center.png", 1.0, 24.0],
-                ["default-button-bezel-highlighted-right.png", 4.0, 24.0]
-            ],
-            "disabled": <ThreePartImage>:
-            [
-                ["default-button-bezel-disabled-left.png", 4.0, 24.0],
-                ["button-bezel-disabled-center.png", 1.0, 24.0],
-                ["default-button-bezel-disabled-right.png", 4.0, 24.0]
-            ]
-        }
-    }
-
-    To reference empty names in the pattern color, use the key "@".
-    So, for example, to reference the "default" style, "disabled" state,
-    you would use the following expression:
-
-    bezelColors["@"]["disabled"]
-
-    To create a color with a three-part pattern image explicitly:
-        CPColorWithImages(slices, orientation)
-
-    where slices is an array of three [name, width, height{, bundle}] arrays,
-    and orientation is CPColorPatternIsVertical or CPColorPatternIsHorizontal.
-
-    To create a color with a nine-part pattern image explicitly:
-        CPColorWithImages(slices);
-
-    where slices is an array of nine [name, width, height{, bundle}] arrays.
-*/
-function CPColorWithImages()
-{
-    var slices = nil,
-        numParts = 0,
-        isVertical = false,
-        imageFactory = CPImageInBundle,
-        args = Array.prototype.slice.apply(arguments);
-
-    if (typeof(args[args.length - 1]) === "function")
-        imageFactory = args.pop();
-
-    switch (args.length)
-    {
-        case 1:
-            return imageFromSlices(args[0], isVertical, imageFactory);
-
-        case 2:
-            // New-style 3-part and 9-part images
-            if (typeof(args[0]) === "string")
-                return patternColorsFromPattern.call(this, args[0], args[1], imageFactory);
-
-            return imageFromSlices(args[0], args[1], imageFactory);
-
-        case 3:
-        case 4:
-            return [CPColor colorWithPatternImage:imageFactory(args[0], args[1], args[2], args[3])];
-
-        default:
-            throw("ERROR: Invalid argument count: " + args.length);
-    }
-}
-
-var imageFromSlices = function(slices, isVertical, imageFactory)
-{
-    var imageSlices = [];
-
-    for (var i = 0; i < slices.length; ++i)
-    {
-        var slice = slices[i];
-
-        imageSlices.push(slice ? imageFactory(slice[0], slice[1], slice[2], slice[3]) : nil);
-    }
-
-    switch (slices.length)
-    {
-        case 3:
-            return [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices:imageSlices isVertical:isVertical]];
-
-        case 9:
-            return [CPColor colorWithPatternImage:[[CPNinePartImage alloc] initWithImageSlices:imageSlices]];
-
-        default:
-            throw("ERROR: Invalid number of image slices: " + slices.length);
-    }
-};
-
-var patternColorsFromPattern = function(pattern, attributes, imageFactory)
-{
-    if (pattern.match(/^.*\{[^}]+\}/))
-    {
-        var width = attributes["width"],
-            height = attributes["height"],
-            separator = attributes["separator"] || "-",
-            orientation = attributes["orientation"],
-            rightWidth,
-            bottomHeight,
-            centerWidthHeight,
-            centerIsNil,
-            numParts;
-
-        // positions are mandatory
-        if (pattern.indexOf("{position}") < 0)
-            throw("ERROR: Pattern strings must have a {position} placeholder (\"" + pattern + "\")");
-
-        if (orientation === undefined)
-        {
-            numParts = 9;
-
-            if (attributes["centerIsNil"] !== undefined)
-                centerIsNil = attributes["centerIsNil"];
-        }
-        else
-        {
-            numParts = 3;
-            isVertical = orientation === PatternIsVertical;
-
-            if (isVertical)
-            {
-                if (attributes["centerHeight"])
-                    centerWidthHeight = attributes["centerHeight"];
-            }
-            else
-            {
-                if (attributes["centerWidth"])
-                    centerWidthHeight = attributes["centerWidth"];
-            }
-        }
-
-        if (attributes["rightWidth"])
-            rightWidth = attributes["rightWidth"];
-
-        if (attributes["bottomHeight"])
-            bottomHeight = attributes["bottomHeight"];
-
-        var positions = attributes["positions"] || "@",
-            states = nil,
-            styles = nil;
-
-        if (numParts === 3)
-        {
-            if (positions === "@")
-            {
-                if (isVertical)
-                    positions = ["top", "center", "bottom"];
-                else
-                    positions = ["left", "center", "right"];
-            }
-            else if (positions === "#")
-                positions = ["0", "1", "2"];
-            else
-                throw("ERROR: Invalid positions: " + positions)
-        }
-        else // numParts === 9
-        {
-            if (positions === "@" || positions === "abbrev")
-                positions = ["top-left", "top", "top-right", "left", "center", "right", "bottom-left", "bottom", "bottom-right"];
-            else if (positions === "full")
-                positions = ["top-left", "top-center", "top-right", "center-left", "center-center", "center-right", "bottom-left", "bottom-center", "bottom-right"];
-            else if (positions === "#")
-                positions = ["0", "1", "2", "3", "4", "5", "6", "7", "8"];
-            else
-                throw("ERROR: Invalid positions: " + positions)
-        }
-
-        // states
-        if (pattern.indexOf("{state}") >= 0)
-        {
-            states = attributes["states"];
-
-            if (!states)
-                throw("ERROR: {state} placeholder in the pattern (\"" + pattern + "\") but no states item in the attributes");
-        }
-
-        // styles
-        if (pattern.indexOf("{style}") >= 0)
-        {
-            styles = attributes["styles"];
-
-            if (!styles)
-                throw("ERROR: {style} placeholder in the pattern (\"" + pattern + "\") but no styles item in the attributes");
-        }
-
-        // Now assemble the hierarchy
-        var placeholder = "{position}",
-            pos = pattern.indexOf(placeholder),
-            i;
-
-        for (i = 0; i < positions.length; ++i)
-            positions[i] = pattern.replace(placeholder, pos === 0 ? positions[i] + separator : separator + positions[i]);
-
-        var slices = positions,
-            object = slices,
-            key,
-            sep;
-
-        if (states)
-        {
-            placeholder = "{state}";
-            pos = pattern.indexOf(placeholder);
-            object = {};
-
-            for (i = 0; i < states.length; ++i)
-            {
-                var state = states[i];
-                key = state || "@";
-                sep = state ? separator : "";
-
-                object[key] = slices.slice(0);
-                replacePlaceholderInArray(object[key], placeholder, pos === 0 ? state + sep : sep + state);
-            }
-        }
-
-        if (styles)
-        {
-            placeholder = "{style}";
-            pos = pattern.indexOf(placeholder);
-
-            var styleObject = {};
-
-            for (i = 0; i < styles.length; ++i)
-            {
-                var style = styles[i];
-                key = style || "@";
-                sep = style ? separator : "";
-
-                if (states)
-                {
-                    styleObject[key] = cloneObject(object);
-                    replacePlaceholderInObject(styleObject[key], placeholder, pos === 0 ? style + sep : sep + style);
-                }
-                else
-                {
-                    styleObject[key] = slices.slice(0);
-                    replacePlaceholderInArray(styleObject[key], placeholder, pos === 0 ? style + sep : sep + style);
-                }
-            }
-
-            object = styleObject;
-        }
-
-        if (styles || states)
-        {
-            if (numParts === 3)
-                makeThreePartSlicesFromObject(object, width, height, centerWidthHeight, rightWidth, bottomHeight, isVertical);
-            else
-                makeNinePartSlicesFromObject(object, width, height, rightWidth, bottomHeight, centerIsNil);
-
-            makeImagesFromObject(object, isVertical, imageFactory);
-            return object;
-        }
-        else
-        {
-            if (numParts === 3)
-                makeThreePartSlicesFromArray(object, width, height, centerWidthHeight, rightWidth, bottomHeight, isVertical);
-            else
-                makeNinePartSlicesFromArray(object, width, height, rightWidth, bottomHeight, centerIsNil);
-
-            return imageFromSlices(object, isVertical, imageFactory);
-        }
-    }
-    else
-        throw("ERROR: No placeholders in slice pattern (\"" + pattern + "\")");
-};
-
-var replacePlaceholderInArray = function(array, find, replacement)
-{
-    for (var i = 0; i < array.length; ++i)
-        array[i] = array[i].replace(find, replacement);
-};
-
-var replacePlaceholderInObject = function(object, find, replacement)
-{
-    for (var key in object)
-        if (object.hasOwnProperty(key))
-            if (object[key].constructor === Array)
-                replacePlaceholderInArray(object[key], find, replacement);
-            else
-                replacePlaceholderInObject(object[key], find, replacement);
-};
-
-var cloneObject = function(object)
-{
-    var clone = {};
-
-    for (var key in object)
-        if (object.hasOwnProperty(key))
-            if (object[key].constructor === Array)
-                clone[key] = object[key].slice(0);
-            else if (typeof(object[key]) === "object")
-                clone[key] = cloneObject(object[key]);
-            else
-                clone[key] = object[key];
-
-    return clone;
-};
-
-var makeThreePartSlicesFromObject = function(object, width, height, centerWidthHeight, rightWidth, bottomHeight, isVertical)
-{
-    for (var key in object)
-        if (object.hasOwnProperty(key))
-            if (object[key].constructor === Array)
-                makeThreePartSlicesFromArray(object[key], width, height, centerWidthHeight, rightWidth, bottomHeight, isVertical);
-            else // object
-                makeThreePartSlicesFromObject(object[key], width, height, centerWidthHeight, rightWidth, bottomHeight, isVertical);
-};
-
-var makeThreePartSlicesFromArray = function(array, width, height, centerWidthHeight, rightWidth, bottomHeight, isVertical)
-{
-    array[0] = [array[0], width, height];
-
-    if (isVertical)
-    {
-        array[1] = [array[1], width, centerWidthHeight ? centerWidthHeight : 1.0];
-        array[2] = [array[2], width, bottomHeight ? bottomHeight : height];
-    }
-    else
-    {
-        array[1] = [array[1], centerWidthHeight ? centerWidthHeight : 1.0, height];
-        array[2] = [array[2], rightWidth ? rightWidth : width, height];
-    }
-};
-
-var makeNinePartSlicesFromObject = function(object, width, height, rightWidth, bottomHeight, centerIsNil)
-{
-    for (var key in object)
-        if (object.hasOwnProperty(key))
-            if (object[key].constructor === Array)
-                makeNinePartSlicesFromArray(object[key], width, height, rightWidth, bottomHeight, centerIsNil);
-            else // object
-                makeNinePartSlicesFromObject(object[key], width, height, rightWidth, bottomHeight, centerIsNil);
-};
-
-var makeNinePartSlicesFromArray = function(array, width, height, rightWidth, bottomHeight, centerIsNil)
-{
-    rightWidth = rightWidth ? rightWidth : width;
-    bottomHeight = bottomHeight ? bottomHeight : height;
-
-    array[0] = [array[0], width, height];                // top-left
-    array[1] = [array[1], 1.0, height];                  // top
-    array[2] = [array[2], rightWidth, height];           // top-right
-    array[3] = [array[3], width, 1.0];                   // left
-    array[4] = centerIsNil ? nil : [array[4], 1.0, 1.0]; // center
-    array[5] = [array[5], rightWidth, 1.0];              // right
-    array[6] = [array[6], width, bottomHeight];          // bottom-left
-    array[7] = [array[7], 1.0, bottomHeight];            // bottom
-    array[8] = [array[8], rightWidth, bottomHeight];     // bottom-right
-};
-
-var makeImagesFromObject = function(object, isVertical, imageFactory)
-{
-    for (var key in object)
-        if (object.hasOwnProperty(key))
-            if (object[key].constructor === Array)
-                object[key] = imageFromSlices(object[key], isVertical, imageFactory);
-            else // object
-                makeImagesFromObject(object[key], isVertical, imageFactory);
-};
-
 /// @endcond

AppKit/CPColorPanel.j

@@ -20,32 +20,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+@import "CPApplication.j"
 @import "CPButton.j"
 @import "CPCookie.j"
 @import "CPPanel.j"
-@import "CPPasteboard.j"
 @import "CPView.j"
 
-@class CPSlider
-
-@global CPApp
-
-/*
-    A color wheel
-    @global
-    @group CPColorPanelMode
-*/
-CPWheelColorPickerMode = 1;
-
-/*
-    Slider based picker
-    @global
-    @group CPColorPanelMode
-*/
-CPSliderColorPickerMode = 2;
-
-CPColorPickerViewWidth  = 265;
-CPColorPickerViewHeight = 370;
 
 CPColorPanelColorDidChangeNotification = @"CPColorPanelColorDidChangeNotification";
 
@@ -58,6 +38,22 @@ var PREVIEW_HEIGHT = 20.0,
 var SharedColorPanel = nil,
     ColorPickerClasses = [];
 
+/*
+    A color wheel
+    @global
+    @group CPColorPanelMode
+*/
+CPWheelColorPickerMode = 1;
+/*
+    Slider based picker
+    @global
+    @group CPColorPanelMode
+*/
+CPSliderColorPickerMode = 2;
+
+CPColorPickerViewWidth  = 265;
+CPColorPickerViewHeight = 370;
+
 /*!
     @ingroup appkit
     @class CPColorPanel
@@ -127,7 +123,7 @@ var SharedColorPanel = nil,
 
     if (self)
     {
-        //[[self contentView] setBackgroundColor:[CPColor colorWithWhite:0.95 alpha:1.0]];
+        [[self contentView] setBackgroundColor:[CPColor colorWithWhite:0.95 alpha:1.0]];
 
         [self setTitle:@"Color Panel"];
         [self setLevel:CPFloatingWindowLevel];
@@ -252,8 +248,8 @@ var SharedColorPanel = nil,
         var height = (TOOLBAR_HEIGHT + 10 + PREVIEW_HEIGHT + 5 + SWATCH_HEIGHT + 32),
             bounds = [[self contentView] bounds];
 
-        [view setFrameSize:CGSizeMake(bounds.size.width - 10, bounds.size.height - height)];
-        [view setFrameOrigin:CGPointMake(5, height)];
+        [view setFrameSize:CPSizeMake(bounds.size.width - 10, bounds.size.height - height)];
+        [view setFrameOrigin:CPPointMake(5, height)];
     }
 
     [_currentView removeFromSuperview];
@@ -423,7 +419,7 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
     CPCookie        _swatchCookie;
 }
 
-- (id)initWithFrame:(CGRect)aFrame
+- (id)initWithFrame:(CPRect)aFrame
 {
     self = [super initWithFrame:aFrame];
 
@@ -441,7 +437,7 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
     for (var i = 0; i < 50; i++)
     {
         // FIXME: http://280north.lighthouseapp.com/projects/13294-cappuccino/tickets/25-implement-cpbox
-        var view = [[CPView alloc] initWithFrame:CGRectMake(13 * i + 1, 1, 12, 12)],
+        var view = [[CPView alloc] initWithFrame:CPRectMake(13 * i + 1, 1, 12, 12)],
             fillView = [[CPView alloc] initWithFrame:CGRectInset([view bounds], 1.0, 1.0)];
 
         [view setBackgroundColor:whiteColor];
@@ -596,7 +592,7 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
     CPColorPanel    _colorPanel;
 }
 
-- (id)initWithFrame:(CGRect)aFrame
+- (id)initWithFrame:(CPRect)aFrame
 {
     self = [super initWithFrame:aFrame];
 
@@ -637,7 +633,7 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
 
     [[CPPasteboard pasteboardWithName:CPDragPboard] declareTypes:[CPColorDragType] owner:self];
 
-    var bounds = CGRectMake(0, 0, 15, 15);
+    var bounds = CPRectMake(0, 0, 15, 15);
 
     // FIXME: http://280north.lighthouseapp.com/projects/13294-cappuccino/tickets/25-implement-cpbox
     var dragView = [[CPView alloc] initWithFrame:bounds],
@@ -649,8 +645,8 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
     [dragView addSubview:dragFillView];
 
     [self dragView:dragView
-                at:CGPointMake(point.x - bounds.size.width / 2.0, point.y - bounds.size.height / 2.0)
-            offset:CGPointMake(0.0, 0.0)
+                at:CPPointMake(point.x - bounds.size.width / 2.0, point.y - bounds.size.height / 2.0)
+            offset:CPPointMake(0.0, 0.0)
              event:anEvent
         pasteboard:nil
             source:self

AppKit/CPColorPicker.j

@@ -24,12 +24,6 @@
 
 @import "CPView.j"
 
-@class CPSlider
-
-@global CPColorPickerViewWidth
-@global CPColorPickerViewHeight
-@global CPWheelColorPickerMode
-
 
 /*!
     @ingroup appkit
@@ -228,7 +222,7 @@
     float       _radius;
 }
 
-- (id)initWithFrame:(CGRect)aFrame
+- (id)initWithFrame:(CPRect)aFrame
 {
     if (self = [super initWithFrame:aFrame])
     {
@@ -275,13 +269,13 @@
 #endif
 }
 
-- (void)setFrameSize:(CGSize)aSize
+- (void)setFrameSize:(CPSize)aSize
 {
     [super setFrameSize:aSize];
     [self setWheelSize:aSize];
 }
 
-- (void)setWheelSize:(CGSize)aSize
+- (void)setWheelSize:(CPSize)aSize
 {
     var min = MIN(aSize.width, aSize.height);
 
@@ -359,7 +353,7 @@
     _angle     = [self radiansToDegrees:angle];
     _distance  = (distance / _radius) * 100.0;
 
-    [_crosshair setFrameOrigin:CGPointMake(COS(angle) * distance + midX - 2.0, SIN(angle) * distance + midY - 2.0)];
+    [_crosshair setFrameOrigin:CPPointMake(COS(angle) * distance + midX - 2.0, SIN(angle) * distance + midY - 2.0)];
 }
 
 - (void)setPositionToColor:(CPColor)aColor

AppKit/CPColorSpace.j

@@ -20,8 +20,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-@import <Foundation/CPObject.j>
-
 var sRGBColorSpace = nil;
 
 /*!

AppKit/CPColorWell.j

@@ -45,12 +45,12 @@ var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiv
     CPColor _color;
 }
 
-+ (Class)_binderClassForBinding:(CPString)aBinding
++ (Class)_binderClassForBinding:(CPString)theBinding
 {
-    if (aBinding == CPValueBinding)
+    if (theBinding == CPValueBinding)
         return [CPColorWellValueBinder class];
 
-    return [super _binderClassForBinding:aBinding];
+    return [super _binderClassForBinding:theBinding];
 }
 
 + (CPString)defaultThemeClass
@@ -60,13 +60,8 @@ var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiv
 
 + (id)themeAttributes
 {
-    return @{
-            @"bezel-inset": _CGInsetMakeZero(),
-            @"bezel-color": [CPNull null],
-            @"content-inset": _CGInsetMake(3.0, 3.0, 3.0, 3.0),
-            @"content-border-inset": _CGInsetMakeZero(),
-            @"content-border-color": [CPNull null],
-        };
+    return [CPDictionary dictionaryWithObjects:[_CGInsetMakeZero(), [CPNull null], _CGInsetMake(3.0, 3.0, 3.0, 3.0), _CGInsetMakeZero(), [CPNull null]]
+                                       forKeys:[@"bezel-inset", @"bezel-color", @"content-inset", @"content-border-inset", @"content-border-color"]];
 }
 
 - (void)_reverseSetBinding
@@ -320,7 +315,7 @@ var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiv
 
 - (void)_updatePlaceholdersWithOptions:(CPDictionary)options
 {
-    var placeholderColor = [CPColor blackColor];
+    var placeholderColor = [CPColor blueColor];
 
     [self _setPlaceholder:placeholderColor forMarker:CPMultipleValuesMarker isDefault:YES];
     [self _setPlaceholder:placeholderColor forMarker:CPNoSelectionMarker isDefault:YES];
@@ -328,19 +323,30 @@ var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiv
     [self _setPlaceholder:placeholderColor forMarker:CPNullMarker isDefault:YES];
 }
 
-- (id)valueForBinding:(CPString)aBinding
+- (void)setValueFor:(CPString)theBinding
 {
-    return [_source color];
-}
+    var destination = [_info objectForKey:CPObservedObjectKey],
+        keyPath = [_info objectForKey:CPObservedKeyPathKey],
+        options = [_info objectForKey:CPOptionsKey],
+        newValue = [destination valueForKeyPath:keyPath],
+        isPlaceholder = CPIsControllerMarker(newValue);
 
-- (void)setValue:(id)aValue forBinding:(CPString)theBinding
-{
-    [_source setColor:aValue];
-}
+    if (isPlaceholder)
+    {
+        if (newValue === CPNotApplicableMarker && [options objectForKey:CPRaisesForNotApplicableKeysBindingOption])
+        {
+           [CPException raise:CPGenericException
+                       reason:@"can't transform non applicable key on: " + _source + " value: " + newValue];
+        }
 
-- (void)setPlaceholderValue:(id)aValue withMarker:(CPString)aMarker forBinding:(CPString)aBinding
-{
-    [_source setColor:aValue];
+        newValue = [self _placeholderForMarker:newValue];
+    }
+    else
+    {
+        newValue = [self transformValue:newValue withOptions:options];
+    }
+
+    [_source setColor:newValue];
 }
 
 @end

AppKit/CPComboBox.j

@@ -20,7 +20,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-@import "CPText.j"
 @import "CPTextField.j"
 @import "_CPPopUpList.j"
 
@@ -60,18 +59,15 @@ var CPComboBoxTextSubview = @"text",
 
 + (id)themeAttributes
 {
-    return @{
-                @"popup-button-size": _CGSizeMake(21.0, 29.0),
-                @"border-inset": _CGInsetMake(3.0, 3.0, 3.0, 3.0),
-            };
+    return [CPDictionary dictionaryWithObjectsAndKeys:_CGSizeMake(21.0, 29.0), @"popup-button-size", _CGInsetMake(3.0, 3.0, 3.0, 3.0), @"border-inset"];
 }
 
-+ (Class)_binderClassForBinding:(CPString)aBinding
++ (Class)_binderClassForBinding:(CPString)theBinding
 {
-    if (aBinding === CPContentBinding || aBinding === CPContentValuesBinding)
+    if (theBinding === CPContentBinding || theBinding === CPContentValuesBinding)
         return [_CPComboBoxContentBinder class];
 
-    return [super _binderClassForBinding:aBinding];
+    return [super _binderClassForBinding:theBinding];
 }
 
 - (id)initWithFrame:(CGRect)aFrame
@@ -87,7 +83,7 @@ var CPComboBoxTextSubview = @"text",
 - (void)_initComboBox
 {
     _items = [CPArray array];
-//    _listClass = [_CPPopUpList class];
+    _listClass = [_CPPopUpList class];
     _usesDataSource = NO;
     _completes = NO;
     _canComplete = NO;
@@ -1114,7 +1110,7 @@ var CPComboBoxCompletionTest = function(object, index, context)
 */
 @implementation _CPComboBoxContentBinder : CPBinder
 
-- (void)setValueFor:(CPString)aBinding
+- (void)setValueFor:(CPString)theBinding
 {
     var destination = [_info objectForKey:CPObservedObjectKey],
         keyPath = [_info objectForKey:CPObservedKeyPathKey],
@@ -1156,15 +1152,13 @@ var CPComboBoxCompletionTest = function(object, index, context)
     else
         newValue = [self transformValue:newValue withOptions:options];
 
-    switch (aBinding)
+    switch (theBinding)
     {
-        case CPContentBinding:
-            [_source setContent:newValue];
-            break;
+        case CPContentBinding:          [_source setContent:newValue];
+                                        break;
 
-        case CPContentValuesBinding:
-            [_source setContentValues:newValue];
-            break;
+        case CPContentValuesBinding:    [_source setContentValues:newValue];
+                                        break;
     }
 }
 

AppKit/CPCompatibility.j

@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-@import "CPEvent_Constants.j"
+@import "CPEvent.j"
 @import "CPPlatform.j"
 
 
@@ -38,58 +38,58 @@ CPWindowsOperatingSystem                = 1;
 CPOtherOperatingSystem                  = 2;
 
 // Features
-CPCSSRGBAFeature                        = 5;
+CPCSSRGBAFeature                        = 1 << 5;
 
-CPHTMLCanvasFeature                     = 6;
-CPHTMLContentEditableFeature            = 7;
-CPHTMLDragAndDropFeature                = 8;
+CPHTMLCanvasFeature                     = 1 << 6;
+CPHTMLContentEditableFeature            = 1 << 7;
+CPHTMLDragAndDropFeature                = 1 << 8;
 
-CPJavaScriptInnerTextFeature            = 9;
-CPJavaScriptTextContentFeature          = 10;
-CPJavaScriptClipboardEventsFeature      = 11;
-CPJavaScriptClipboardAccessFeature      = 12;
-CPJavaScriptCanvasDrawFeature           = 13;
-CPJavaScriptCanvasTransformFeature      = 14;
+CPJavaScriptInnerTextFeature            = 1 << 9;
+CPJavaScriptTextContentFeature          = 1 << 10;
+CPJavaScriptClipboardEventsFeature      = 1 << 11;
+CPJavaScriptClipboardAccessFeature      = 1 << 12;
+CPJavaScriptCanvasDrawFeature           = 1 << 13;
+CPJavaScriptCanvasTransformFeature      = 1 << 14;
 
-CPVMLFeature                            = 15;
+CPVMLFeature                            = 1 << 15;
 
-CPJavaScriptRemedialKeySupport          = 16;
-CPJavaScriptShadowFeature               = 20;
+CPJavaScriptRemedialKeySupport          = 1 << 16;
+CPJavaScriptShadowFeature               = 1 << 20;
 
-CPJavaScriptNegativeMouseWheelValues    = 22;
-CPJavaScriptMouseWheelValues_8_15       = 23;
+CPJavaScriptNegativeMouseWheelValues    = 1 << 22;
+CPJavaScriptMouseWheelValues_8_15       = 1 << 23;
 
-CPOpacityRequiresFilterFeature          = 24;
+CPOpacityRequiresFilterFeature          = 1 << 24;
 
-// Internet explorer does not allow dynamically changing the type of an input element
-CPInputTypeCanBeChangedFeature          = 25;
-CPHTML5DragAndDropSourceYOffBy1         = 26;
+//Internet explorer does not allow dynamically changing the type of an input element
+CPInputTypeCanBeChangedFeature          = 1 << 25;
+CPHTML5DragAndDropSourceYOffBy1         = 1 << 26;
 
-CPSOPDisabledFromFileURLs               = 27;
+CPSOPDisabledFromFileURLs               = 1 << 27;
 
 // element.style.font can be set for an element not in the DOM.
-CPInputSetFontOutsideOfDOM              = 28;
+CPInputSetFontOutsideOfDOM              = 1 << 28;
 
 // Input elements have 1 px of extra padding on the left regardless of padding setting.
-CPInput1PxLeftPadding                   = 29;
-CPInputOnInputEventFeature              = 30;
+CPInput1PxLeftPadding                   = 1 << 29;
+CPInputOnInputEventFeature              = 1 << 30;
 
-CPFileAPIFeature                        = 31;
-
-/*
-    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
-*/
+// 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;
 
 var USER_AGENT                          = "",
     PLATFORM_ENGINE                     = CPUnknownBrowserEngine,
-    PLATFORM_FEATURES                   = [],
+    PLATFORM_FEATURES                   = 0,
     PLATFORM_BUGS                       = 0,
     PLATFORM_STYLE_JS_PROPERTIES        = {};
 
 // default these features to true
-PLATFORM_FEATURES[CPInputTypeCanBeChangedFeature] = YES;
-PLATFORM_FEATURES[CPInputSetFontOutsideOfDOM] = YES;
+
+PLATFORM_FEATURES |= CPInputTypeCanBeChangedFeature;
+PLATFORM_FEATURES |= CPInputSetFontOutsideOfDOM;
 
 if (typeof window !== "undefined" && typeof window.navigator !== "undefined")
     USER_AGENT = window.navigator.userAgent;
@@ -99,7 +99,7 @@ if (typeof window !== "undefined" && window.opera)
 {
     PLATFORM_ENGINE = CPOperaBrowserEngine;
 
-    PLATFORM_FEATURES[CPJavaScriptCanvasDrawFeature] = YES;
+    PLATFORM_FEATURES |= CPJavaScriptCanvasDrawFeature;
 }
 
 // Internet Explorer
@@ -108,16 +108,16 @@ else if (typeof window !== "undefined" && window.attachEvent) // Must follow Ope
     PLATFORM_ENGINE = CPInternetExplorerBrowserEngine;
 
     // Features we can only be sure of with IE (no known independent tests)
-    PLATFORM_FEATURES[CPVMLFeature] = YES;
-    PLATFORM_FEATURES[CPJavaScriptRemedialKeySupport] = YES;
-    PLATFORM_FEATURES[CPJavaScriptShadowFeature] = YES;
+    PLATFORM_FEATURES |= CPVMLFeature;
+    PLATFORM_FEATURES |= CPJavaScriptRemedialKeySupport;
+    PLATFORM_FEATURES |= CPJavaScriptShadowFeature;
 
-    PLATFORM_FEATURES[CPOpacityRequiresFilterFeature] = YES;
+    PLATFORM_FEATURES |= CPOpacityRequiresFilterFeature;
 
-    PLATFORM_FEATURES[CPInputTypeCanBeChangedFeature] = NO;
+    PLATFORM_FEATURES &= ~CPInputTypeCanBeChangedFeature;
 
     // Tested in Internet Explore 8 and 9.
-    PLATFORM_FEATURES[CPInputSetFontOutsideOfDOM] = NO;
+    PLATFORM_FEATURES &= ~CPInputSetFontOutsideOfDOM;
 }
 
 // WebKit
@@ -126,15 +126,15 @@ else if (USER_AGENT.indexOf("AppleWebKit/") != -1)
     PLATFORM_ENGINE = CPWebKitBrowserEngine;
 
     // Features we can only be sure of with WebKit (no known independent tests)
-    PLATFORM_FEATURES[CPCSSRGBAFeature] = YES;
-    PLATFORM_FEATURES[CPHTMLContentEditableFeature] = YES;
+    PLATFORM_FEATURES |= CPCSSRGBAFeature;
+    PLATFORM_FEATURES |= CPHTMLContentEditableFeature;
 
     if (USER_AGENT.indexOf("Chrome") === -1)
-        PLATFORM_FEATURES[CPHTMLDragAndDropFeature] = YES;
+        PLATFORM_FEATURES |= CPHTMLDragAndDropFeature;
 
-    PLATFORM_FEATURES[CPJavaScriptClipboardEventsFeature] = YES;
-    PLATFORM_FEATURES[CPJavaScriptClipboardAccessFeature] = YES;
-    PLATFORM_FEATURES[CPJavaScriptShadowFeature] = YES;
+    PLATFORM_FEATURES |= CPJavaScriptClipboardEventsFeature;
+    PLATFORM_FEATURES |= CPJavaScriptClipboardAccessFeature;
+    PLATFORM_FEATURES |= CPJavaScriptShadowFeature;
 
     var versionStart = USER_AGENT.indexOf("AppleWebKit/") + "AppleWebKit/".length,
         versionEnd = USER_AGENT.indexOf(" ", versionStart),
@@ -144,22 +144,22 @@ else if (USER_AGENT.indexOf("AppleWebKit/") != -1)
         minorVersion = parseInt(versionString.substr(versionDivision + 1));
 
     if ((USER_AGENT.indexOf("Safari") !== CPNotFound && (majorVersion > 525 || (majorVersion === 525 && minorVersion > 14))) || USER_AGENT.indexOf("Chrome") !== CPNotFound)
-        PLATFORM_FEATURES[CPJavaScriptRemedialKeySupport] = YES;
+        PLATFORM_FEATURES |= CPJavaScriptRemedialKeySupport;
 
     // FIXME this is a terrible hack to get around this bug:
     // https://bugs.webkit.org/show_bug.cgi?id=21548
     if (![CPPlatform isBrowser])
-        PLATFORM_FEATURES[CPJavaScriptRemedialKeySupport] = YES;
+        PLATFORM_FEATURES |= CPJavaScriptRemedialKeySupport;
 
     if (majorVersion < 532 || (majorVersion === 532 && minorVersion < 6))
-        PLATFORM_FEATURES[CPHTML5DragAndDropSourceYOffBy1] = YES;
+        PLATFORM_FEATURES |= CPHTML5DragAndDropSourceYOffBy1;
 
     // This is supposedly fixed in webkit r123603. Seems to work in Chrome 21 but not Safari 6.0.
     if (majorVersion < 537)
-        PLATFORM_FEATURES[CPInput1PxLeftPadding] = YES;
+        PLATFORM_FEATURES |= CPInput1PxLeftPadding;
 
     if (USER_AGENT.indexOf("Chrome") === CPNotFound)
-        PLATFORM_FEATURES[CPSOPDisabledFromFileURLs] = YES;
+        PLATFORM_FEATURES |= CPSOPDisabledFromFileURLs;
 
     // Assume this bug was introduced around Safari 5.1/Chrome 16. This could probably be tighter.
     if (majorVersion > 533)
@@ -177,74 +177,59 @@ else if (USER_AGENT.indexOf("Gecko") !== -1) // Must follow KHTML check.
 {
     PLATFORM_ENGINE = CPGeckoBrowserEngine;
 
-    PLATFORM_FEATURES[CPJavaScriptCanvasDrawFeature] = YES;
+    PLATFORM_FEATURES |= CPJavaScriptCanvasDrawFeature;
 
     var index = USER_AGENT.indexOf("Firefox"),
         version = (index === -1) ? 2.0 : parseFloat(USER_AGENT.substring(index + "Firefox".length + 1));
 
     if (version >= 3.0)
-        PLATFORM_FEATURES[CPCSSRGBAFeature] = YES;
+        PLATFORM_FEATURES |= CPCSSRGBAFeature;
 
     if (version < 3.0)
-        PLATFORM_FEATURES[CPJavaScriptMouseWheelValues_8_15] = YES;
+        PLATFORM_FEATURES |= CPJavaScriptMouseWheelValues_8_15;
 
     // Some day this might be fixed and should be version prefixed. No known fixed version yet.
-    PLATFORM_FEATURES[CPInput1PxLeftPadding] = YES;
+    PLATFORM_FEATURES |= CPInput1PxLeftPadding;
 }
 
-// Feature-specific checks
+// Feature Specific Checks
 if (typeof document != "undefined")
 {
     var canvasElement = document.createElement("canvas");
-
-    // Detect canvas support
+    // Detect Canvas Support
     if (canvasElement && canvasElement.getContext)
     {
-        PLATFORM_FEATURES[CPHTMLCanvasFeature] = YES;
+        PLATFORM_FEATURES |= CPHTMLCanvasFeature;
 
-        // Any browser that supports canvas supports CSS opacity
-        PLATFORM_FEATURES[CPOpacityRequiresFilterFeature] = NO;
-
-        // Detect canvas setTransform/transform support
+        // Detect Canvas setTransform/transform support
         var context = document.createElement("canvas").getContext("2d");
 
         if (context && context.setTransform && context.transform)
-            PLATFORM_FEATURES[CPJavaScriptCanvasTransformFeature] = YES;
+            PLATFORM_FEATURES |= CPJavaScriptCanvasTransformFeature;
     }
 
     var DOMElement = document.createElement("div");
 
     // Detect whether we have innerText or textContent (or neither)
     if (DOMElement.innerText != undefined)
-        PLATFORM_FEATURES[CPJavaScriptInnerTextFeature] = YES;
+        PLATFORM_FEATURES |= CPJavaScriptInnerTextFeature;
     else if (DOMElement.textContent != undefined)
-        PLATFORM_FEATURES[CPJavaScriptTextContentFeature] = YES;
+        PLATFORM_FEATURES |= CPJavaScriptTextContentFeature;
 
     var DOMInputElement = document.createElement("input");
-
     if ("oninput" in DOMInputElement)
-        PLATFORM_FEATURES[CPInputOnInputEventFeature] = YES;
+        PLATFORM_FEATURES |= CPInputOnInputEventFeature;
     else if (typeof DOMInputElement.setAttribute === "function")
     {
         DOMInputElement.setAttribute("oninput", "return;");
-
         if (typeof DOMInputElement.oninput === "function")
-            PLATFORM_FEATURES[CPInputOnInputEventFeature] = YES;
+            PLATFORM_FEATURES |= CPInputOnInputEventFeature;
     }
-
-    // Detect FileAPI support
-    if (typeof DOMInputElement.setAttribute === "function")
-    {
-        DOMInputElement.setAttribute("type", "file");
-        PLATFORM_FEATURES[CPFileAPIFeature] = !!DOMInputElement["files"];
-    }
-    else
-        PLATFORM_FEATURES[CPFileAPIFeature] = NO;
 }
 
 function CPFeatureIsCompatible(aFeature)
 {
-    return !!PLATFORM_FEATURES[aFeature];
+    return PLATFORM_FEATURES & aFeature;
 }
 
 function CPPlatformHasBug(aBug)
@@ -325,18 +310,11 @@ function CPBrowserStyleProperty(aProperty)
                 break;
             default:
                 var prefixes = ["Webkit", "Moz", "O", "ms"],
-                    strippedProperty = aProperty.split('-').join(' '),
-                    capProperty = [strippedProperty capitalizedString].split(' ').join('');
+                    capProperty = [aProperty capitalizedString];
 
                 for (var i = 0; i < prefixes.length; i++)
                 {
-                    // First check if the property is already valid without being formatted, otherwise try the capitalized property
-                    if (prefixes[i] + aProperty in testElement.style)
-                    {
-                        r = prefixes[i] + aProperty;
-                        break;
-                    }
-                    else if (prefixes[i] + capProperty in testElement.style)
+                    if (prefixes[i] + capProperty in testElement.style)
                     {
                         r = prefixes[i] + capProperty;
                         break;
@@ -374,21 +352,9 @@ function CPBrowserCSSProperty(aProperty)
     {
         if (browserProperty.substring(0, prefix.length) == prefix)
         {
-            var browserPropertyWithoutPrefix = browserProperty.substring(prefix.length),
-                parts = browserPropertyWithoutPrefix.match(/[A-Z][a-z]+/g);
-
-            // If there were any capitalized words in the browserProperty, insert a "-" between each one
-            if (parts && parts.length > 0)
-                browserPropertyWithoutPrefix = parts.join("-");
-
-            return prefixes[prefix] + browserPropertyWithoutPrefix.toLowerCase();
+            return prefixes[prefix] + browserProperty.substring(prefix.length).toLowerCase();
         }
     }
 
-    var parts = browserProperty.match(/[A-Z][a-z]+/g);
-
-    if (parts && parts.length > 0)
-        browserProperty = parts.join("-");
-
     return browserProperty.toLowerCase();
 }

AppKit/CPControl.j

@@ -20,16 +20,14 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-@import <Foundation/CPFormatter.j>
-@import <Foundation/CPTimer.j>
+#import "../Foundation/Ref.h"
 
+@import "../Foundation/CPFormatter.j"
 @import "CPFont.j"
 @import "CPShadow.j"
 @import "CPView.j"
 @import "CPKeyValueBinding.j"
 
-@global CPApp
-
 CPLeftTextAlignment      = 0;
 CPRightTextAlignment     = 1;
 CPCenterTextAlignment    = 2;
@@ -110,19 +108,28 @@ var CPControlBlackColor = [CPColor blackColor];
 
 + (CPDictionary)themeAttributes
 {
-    return @{
-            @"alignment": CPLeftTextAlignment,
-            @"vertical-alignment": CPTopVerticalTextAlignment,
-            @"line-break-mode": CPLineBreakByClipping,
-            @"text-color": [CPColor blackColor],
-            @"font": [CPFont systemFontOfSize:CPFontCurrentSystemSize],
-            @"text-shadow-color": [CPNull null],
-            @"text-shadow-offset": _CGSizeMakeZero(),
-            @"image-position": CPImageLeft,
-            @"image-scaling": CPScaleToFit,
-            @"min-size": _CGSizeMakeZero(),
-            @"max-size": _CGSizeMake(-1.0, -1.0),
-        };
+    return [CPDictionary dictionaryWithObjects:[CPLeftTextAlignment,
+                                                CPTopVerticalTextAlignment,
+                                                CPLineBreakByClipping,
+                                                [CPColor blackColor],
+                                                [CPFont systemFontOfSize:CPFontCurrentSystemSize],
+                                                [CPNull null],
+                                                _CGSizeMakeZero(),
+                                                CPImageLeft,
+                                                CPScaleToFit,
+                                                _CGSizeMakeZero(),
+                                                _CGSizeMake(-1.0, -1.0)]
+                                       forKeys:[@"alignment",
+                                                @"vertical-alignment",
+                                                @"line-break-mode",
+                                                @"text-color",
+                                                @"font",
+                                                @"text-shadow-color",
+                                                @"text-shadow-offset",
+                                                @"image-position",
+                                                @"image-scaling",
+                                                @"min-size",
+                                                @"max-size"]];
 }
 
 + (void)initialize
@@ -141,14 +148,12 @@ var CPControlBlackColor = [CPColor blackColor];
     [self exposeBinding:@"enabled"];
 }
 
-+ (Class)_binderClassForBinding:(CPString)aBinding
++ (Class)_binderClassForBinding:(CPString)theBinding
 {
-    if (aBinding === CPValueBinding)
+    if (theBinding === CPValueBinding)
         return [_CPValueBinder class];
-    else if ([aBinding hasPrefix:CPEnabledBinding])
-        return [CPMultipleValueAndBinding class];
 
-    return [super _binderClassForBinding:aBinding];
+    return [super _binderClassForBinding:theBinding];
 }
 
 /*!
@@ -230,9 +235,6 @@ var CPControlBlackColor = [CPColor blackColor];
 {
     [self _reverseSetBinding];
 
-    var binding = [CPBinder getBinding:CPTargetBinding forObject:self];
-    [binding invokeAction];
-
     return [CPApp sendAction:anAction to:anObject from:self];
 }
 
@@ -395,14 +397,6 @@ var CPControlBlackColor = [CPColor blackColor];
         [self highlight:YES];
 }
 
-/*!
-    Enabled controls accept first mouse by default.
-*/
-- (BOOL)acceptsFirstMouse:(CPEvent)anEvent
-{
-    return [self isEnabled];
-}
-
 - (void)mouseDown:(CPEvent)anEvent
 {
     if (![self isEnabled])
@@ -551,10 +545,10 @@ var CPControlBlackColor = [CPColor blackColor];
     {
         value = nil;
 
-        if ([_formatter getObjectValue:@ref(value) forString:aString errorDescription:nil] === NO)
+        if ([_formatter getObjectValue:AT_REF(value) forString:aString errorDescription:nil] === NO)
         {
             // If the given string is non-empty and doesn't work, Cocoa tries an empty string.
-            if (!aString || [_formatter getObjectValue:@ref(value) forString:@"" errorDescription:nil] === NO)
+            if (!aString || [_formatter getObjectValue:AT_REF(value) forString:@"" errorDescription:nil] === NO)
                 value = undefined;  // Means the value is invalid
         }
     }
@@ -607,7 +601,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:[CPDictionary dictionaryWithObject:[note object] forKey:"CPFieldEditor"]];
 }
 
 - (void)textDidChange:(CPNotification)note
@@ -616,7 +610,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:[CPDictionary dictionaryWithObject:[note object] forKey:"CPFieldEditor"]];
 }
 
 - (void)textDidEndEditing:(CPNotification)note
@@ -627,7 +621,7 @@ var CPControlBlackColor = [CPColor blackColor];
 
     [self _reverseSetBinding];
 
-    [[CPNotificationCenter defaultCenter] postNotificationName:CPControlTextDidEndEditingNotification object:self userInfo:@{ "CPFieldEditor": [note object] }];
+    [[CPNotificationCenter defaultCenter] postNotificationName:CPControlTextDidEndEditingNotification object:self userInfo:[CPDictionary dictionaryWithObject:[note object] forKey:"CPFieldEditor"]];
 }
 
 /*!

AppKit/CPController.j

@@ -64,7 +64,7 @@ var CPControllerDeclaredKeysKey = @"CPControllerDeclaredKeysKey";
         count = _editors.length;
 
     for (; index < count; ++index)
-        if (![[_editors objectAtIndex:index] commitEditing])
+        if (![[_editors objectAtIndex:i] commitEditing])
             return NO;
 
     return YES;

AppKit/CPCookie.j

@@ -94,7 +94,7 @@
         domain = "";
 
 #if PLATFORM(DOM)
-    document.cookie = _cookieName + "=" + value + expires + "; path=/" + domain;
+    document.cookie = _cookieName+"="+value+expires+"; path=/"+domain;
 #else
     _cookieValue = value;
     _expires = expires;

AppKit/CPCursor.j

@@ -23,8 +23,6 @@ Cursor support by browser:
 
 @import <Foundation/CPObject.j>
 
-@global CPApp
-
 var currentCursor = nil,
     cursorStack = [],
     cursors = {},
@@ -79,7 +77,7 @@ var currentCursor = nil,
 */
 - (id)initWithImage:(CPImage)image foregroundColorHint:(CPColor)foregroundColor backgroundColorHint:(CPColor)backgroundColor hotSpot:(CGPoint)aHotSpot
 {
-    return [self initWithImage:image hotSpot:aHotSpot];
+    return [self initWithImage:image hotSpot:hotSpot];
 }
 
 + (void)hide
@@ -161,13 +159,7 @@ var currentCursor = nil,
         var cssString;
 
         if (doesHaveImage)
-        {
-            var themeResourcePath = [[[CPApp themeBlend] bundle] resourcePath],
-                extension = CPBrowserIsEngine(CPInternetExplorerBrowserEngine) ? @"cur" : @"png";
-
-            cssString = [CPString stringWithFormat:@"url(%@cursors/%@.%@), %@", themeResourcePath, cursorName, extension, aString];
-        }
-
+            cssString = [CPString stringWithFormat:@"url(%@/CPCursor/%@.cur), %@", [[CPBundle bundleForClass:self] resourcePath], cursorName, aString];
         else
         {
             // IE <= 8 does not support some cursors, map them to supported cursors

AppKit/CPDictionaryController.j

@@ -1,168 +0,0 @@
-/*
- * CPDictionaryController.j
- * AppKit
- *
- * Adapted from Cocotron, by Johannes Fortmann
- *
- * Created by Blair Duncan
- * Copyright 2013, SGL Studio, BBDO Toronto 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 "CPArrayController.j"
-
-@implementation CPDictionaryController : CPArrayController
-{
-    CPDictionary    _contentDictionary;
-
-    CPArray         _includedKeys @accessors(property=includedKeys);
-    CPArray         _excludedKeys @accessors(property=excludedKeys);
-
-    CPString        _initialKey @accessors(property=initialKey);
-    id              _initialValue @accessors(property=initialValue);
-}
-
-- (id)init
-{
-    self = [super init];
-
-    if (self)
-    {
-        _initialKey = @"key";
-        _initialValue = @"value";
-    }
-
-    return self;
-}
-
-- (id)newObject
-{
-    var keys = [_contentDictionary allKeys],
-        newKey = _initialKey,
-        count = 0;
-
-    if ([keys containsObject:newKey])
-        while ([keys containsObject:newKey])
-            newKey = [CPString stringWithFormat:@"%@%i", _initialKey, ++count];
-
-    return [self _newObjectWithKey:newKey value:_initialValue];
-}
-
-- (id)_newObjectWithKey:(CPString)aKey value:(id)aValue
-{
-    var aNewObject = [_CPDictionaryControllerKeyValuePair new];
-
-    aNewObject._dictionary = _contentDictionary;
-    aNewObject._controller = self;
-    aNewObject._key = aKey;
-
-    if (aValue !== nil)
-        [aNewObject setValue:aValue];
-
-    return aNewObject;
-}
-
-- (CPDictionary)contentDictionary
-{
-    return _contentDictionary;
-}
-
-- (void)setContentDictionary:(CPDictionary)aDictionary
-{
-    if (aDictionary == _contentDictionary)
-        return;
-
-    if ([aDictionary isKindOfClass:[CPDictionary class]])
-        _contentDictionary = aDictionary;
-    else
-        _contentDictionary = nil;
-
-    var array = [CPArray array],
-        allKeys = [_contentDictionary allKeys];
-
-    [allKeys addObjectsFromArray:_includedKeys];
-
-    var iter = [[CPSet setWithArray:allKeys] objectEnumerator],
-        obj;
-
-    while ((obj = [iter nextObject]) !== nil)
-        if (![_excludedKeys containsObject:obj])
-            [array addObject:[self _newObjectWithKey:obj value:nil]];
-
-    [super setContent:array];
-}
-
-
-@end
-
-
-var CPIncludedKeys  = @"CPIncludedKeys",
-    CPExcludedKeys  = @"CPExcludedKeys";
-
-@implementation CPDictionaryController (CPCoding)
-
-- (id)initWithCoder:(CPCoder)aCoder
-{
-    self = [super initWithCoder:aCoder];
-
-    if (self)
-    {
-        _includedKeys = [aCoder decodeObjectForKey:CPIncludedKeys];
-        _excludedKeys = [aCoder decodeObjectForKey:CPExcludedKeys];
-        _initialKey = @"key";
-        _initialValue = @"value";
-    }
-
-    return self;
-}
-
-- (void)encodeWithCoder:(CPCoder)aCoder
-{
-    [super encodeWithCoder:aCoder];
-
-    [aCoder encodeObject:_includedKeys forKey:CPIncludedKeys];
-    [aCoder encodeObject:_excludedKeys forKey:CPExcludedKeys];
-}
-
-@end
-
-
-
-
-@implementation _CPDictionaryControllerKeyValuePair : CPObject
-{
-    CPString                _key @accessors(property=key);
-    CPDictionary            _dictionary @accessors(property=dictionary);
-    CPDictionaryController  _controller @accessors(property=controller);
-}
-
-- (id)value
-{
-   return [_dictionary objectForKey:_key];
-}
-
-- (void)setValue:(id)aValue
-{
-   [_dictionary setObject:aValue forKey:_key];
-}
-
-- (BOOL)isExplicitlyIncluded
-{
-    return [[_controller _includedKeys] containsObject:_key];
-}
-
-
-@end

AppKit/CPDocument.j

@@ -23,16 +23,12 @@
 @import <Foundation/CPString.j>
 @import <Foundation/CPArray.j>
 
-@import "CPAlert.j"
+@import "CPApplication.j"
 @import "CPResponder.j"
 @import "CPSavePanel.j"
 @import "CPViewController.j"
 @import "CPWindowController.j"
 
-@class CPDocumentController
-
-@global CPApp
-
 
 /*
     @global
@@ -129,7 +125,7 @@ var CPDocumentUntitledCount = 0;
     if (self)
     {
         _windowControllers = [];
-        _viewControllersForWindowControllers = @{};
+        _viewControllersForWindowControllers = [CPDictionary dictionary];
 
         _hasUndoManager = YES;
         _changeCount = 0;
@@ -146,7 +142,7 @@ var CPDocumentUntitledCount = 0;
     @param anError not used
     @return the initialized document
 */
-- (id)initWithType:(CPString)aType error:(/*{*/CPError/*}*/)anError
+- (id)initWithType:(CPString)aType error:({CPError})anError
 {
     self = [self init];
 
@@ -215,7 +211,7 @@ var CPDocumentUntitledCount = 0;
     @throws CPUnsupportedMethodException if this method hasn't been overridden by the subclass
     @return the document data
 */
-- (CPData)dataOfType:(CPString)aType error:(/*{*/CPError/*}*/)anError
+- (CPData)dataOfType:(CPString)aType error:({CPError})anError
 {
     [CPException raise:CPUnsupportedMethodException
                 reason:"dataOfType:error: must be overridden by the document subclass."];

AppKit/CPDocumentController.j

@@ -25,10 +25,6 @@
 
 @import "CPDocument.j"
 @import "CPOpenPanel.j"
-@import "CPMenuItem.j"
-@import "CPWindowController.j"
-
-@global CPApp
 
 
 var CPSharedDocumentController = nil;
@@ -128,7 +124,7 @@ var CPSharedDocumentController = nil;
     @param anError not used
     @return the created document
 */
-- (CPDocument)makeUntitledDocumentOfType:(CPString)aType error:(/*{*/CPError/*}*/)anError
+- (CPDocument)makeUntitledDocumentOfType:(CPString)aType error:({CPError})anError
 {
     return [[[self documentClassForType:aType] alloc] initWithType:aType error:anError];
 }
@@ -148,7 +144,7 @@ var CPSharedDocumentController = nil;
     {
         var type = [self typeForContentsOfURL:anAbsoluteURL error:anError];
 
-        result = [self makeDocumentWithContentsOfURL:anAbsoluteURL ofType:type delegate:self didReadSelector:@selector(document:didRead:contextInfo:) contextInfo:@{ @"shouldDisplay": shouldDisplay }];
+        result = [self makeDocumentWithContentsOfURL:anAbsoluteURL ofType:type delegate:self didReadSelector:@selector(document:didRead:contextInfo:) contextInfo:[CPDictionary dictionaryWithObject:shouldDisplay forKey:@"shouldDisplay"]];
 
         [self addDocument:result];
 
@@ -343,10 +339,10 @@ var CPSharedDocumentController = nil;
 - (void)closeAllDocumentsWithDelegate:(id)aDelegate didCloseAllSelector:(SEL)didCloseSelector contextInfo:(Object)info
 {
     var context = {
-            delegate: aDelegate,
-            selector: didCloseSelector,
-            context: info
-        };
+        delegate: aDelegate,
+        selector: didCloseSelector,
+        context: info
+    };
 
     [self _closeDocumentsStartingWith:nil shouldClose:YES context:context];
 }

AppKit/CPDragServer.j

@@ -20,17 +20,22 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-@import "CPDragServer_Constants.j"
+@import "CPApplication.j"
 @import "CPEvent.j"
 @import "CPImageView.j"
 @import "CPPasteboard.j"
 @import "CPView.j"
-@import "CPWindow_Constants.j"
+@import "CPWindow.j"
 
-@class CPWindow  // This file is imported by CPWindow.j
-@class _CPDOMDataTransferPasteboard
 
-@global CPApp
+CPDragOperationNone     = 0;
+CPDragOperationCopy     = 1 << 1;
+CPDragOperationLink     = 1 << 1;
+CPDragOperationGeneric  = 1 << 2;
+CPDragOperationPrivate  = 1 << 3;
+CPDragOperationMove     = 1 << 4;
+CPDragOperationDelete   = 1 << 5;
+CPDragOperationEvery    = -1;
 
 #define DRAGGING_WINDOW(anObject) ([anObject isKindOfClass:[CPWindow class]] ? anObject : [anObject window])
 
@@ -67,7 +72,7 @@ var CPDragServerSource             = nil,
 - (unsigned)draggingSourceOperationMask
 */
 
-- (CGPoint)draggingLocation
+- (CPPoint)draggingLocation
 {
     return [[CPDragServer sharedDragServer] draggingLocation];
 }
@@ -248,7 +253,7 @@ var CPDraggingSource_draggedImage_movedTo_          = 1 << 0,
             _draggingUpdateTimer = [CPTimer scheduledTimerWithTimeInterval:CPDragServerPeriodicUpdateInterval
                                                                     target:self
                                                                   selector:@selector(_sendPeriodicDraggingUpdate:)
-                                                                  userInfo:@{ "platformWindow":aPlatformWindow, "location":aLocation }
+                                                                  userInfo:[CPDictionary dictionaryWithJSObject:{platformWindow:aPlatformWindow, location:aLocation}]
                                                                    repeats:NO];
 
         var scrollView = [_draggingDestination isKindOfClass:[CPView class]] ? [_draggingDestination enclosingScrollView] : nil;
@@ -456,7 +461,6 @@ var CPDraggingSource_draggedImage_movedTo_          = 1 << 0,
     else if (type === CPKeyDown)
     {
         var characters = [anEvent characters];
-
         if (characters === CPEscapeFunctionKey)
         {
             _dragOperation = CPDragOperationNone;
@@ -473,7 +477,39 @@ var CPDraggingSource_draggedImage_movedTo_          = 1 << 0,
     // If we're not a mouse up, then we're going to want to grab the next event.
     [CPApp setTarget:self selector:@selector(trackDragging:)
         forNextEventMatchingMask:CPMouseMovedMask | CPLeftMouseDraggedMask | CPLeftMouseUpMask | CPKeyDownMask
-        untilDate:nil inMode:0 dequeue:YES];
+        untilDate:nil inMode:0 dequeue:NO];
+}
+
+@end
+
+@implementation CPWindow (CPDraggingAdditions)
+
+/* @ignore */
+- (id)_dragHitTest:(CGPoint)aPoint pasteboard:(CPPasteboard)aPasteboard
+{
+    // If none of our views or ourselves has registered for drag events...
+    if (!_inclusiveRegisteredDraggedTypes)
+        return nil;
+
+// We don't need to do this because the only place this gets called
+// -_dragHitTest: in CPPlatformWindow does this already. Perhaps to
+// be safe?
+//    if (![self containsPoint:aPoint])
+//        return nil;
+
+    var adjustedPoint = [self convertPlatformWindowToBase:aPoint],
+        hitView = [_windowView hitTest:adjustedPoint];
+
+    while (hitView && ![aPasteboard availableTypeFromArray:[hitView registeredDraggedTypes]])
+        hitView = [hitView superview];
+
+    if (hitView)
+        return hitView;
+
+    if ([aPasteboard availableTypeFromArray:[self registeredDraggedTypes]])
+        return self;
+
+    return nil;
 }
 
 @end

AppKit/CPDragServer_Constants.j

@@ -1,30 +0,0 @@
-/*
- * CPDragServer_Constants.j
- * AppKit
- *
- * Created by Francisco Tolmasky.
- * Copyright 2008, 280 North, Inc.
- *
- * 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
- */
-
-CPDragOperationNone     = 0;
-CPDragOperationCopy     = 1 << 1;
-CPDragOperationLink     = 1 << 1;
-CPDragOperationGeneric  = 1 << 2;
-CPDragOperationPrivate  = 1 << 3;
-CPDragOperationMove     = 1 << 4;
-CPDragOperationDelete   = 1 << 5;
-CPDragOperationEvery    = -1;

AppKit/CPEvent.j

@@ -20,19 +20,162 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-@import "CPEvent_Constants.j"
-
 @import <Foundation/CPObject.j>
-@import <Foundation/CPObjJRuntime.j>
-@import <Foundation/CPString.j>
-
-@import "CPCompatibility.j"
-@import "CGGeometry.j"
 @import "CPText.j"
 
-@class CPTextField
 
-@global CPApp
+CPLeftMouseDown                         = 1;
+CPLeftMouseUp                           = 2;
+CPRightMouseDown                        = 3;
+CPRightMouseUp                          = 4;
+CPMouseMoved                            = 5;
+CPLeftMouseDragged                      = 6;
+CPRightMouseDragged                     = 7;
+CPMouseEntered                          = 8;
+CPMouseExited                           = 9;
+CPKeyDown                               = 10;
+CPKeyUp                                 = 11;
+CPFlagsChanged                          = 12;
+CPAppKitDefined                         = 13;
+CPSystemDefined                         = 14;
+CPApplicationDefined                    = 15;
+CPPeriodic                              = 16;
+CPCursorUpdate                          = 17;
+CPScrollWheel                           = 22;
+CPOtherMouseDown                        = 25;
+CPOtherMouseUp                          = 26;
+CPOtherMouseDragged                     = 27;
+
+// iPhone Event Types
+CPTouchStart                            = 28;
+CPTouchMove                             = 29;
+CPTouchEnd                              = 30;
+CPTouchCancel                           = 31;
+
+CPAlphaShiftKeyMask                     = 1 << 16;
+CPShiftKeyMask                          = 1 << 17;
+CPControlKeyMask                        = 1 << 18;
+CPAlternateKeyMask                      = 1 << 19;
+CPCommandKeyMask                        = 1 << 20;
+CPNumericPadKeyMask                     = 1 << 21;
+CPHelpKeyMask                           = 1 << 22;
+CPFunctionKeyMask                       = 1 << 23;
+CPDeviceIndependentModifierFlagsMask    = 0xffff0000;
+
+CPLeftMouseDownMask                     = 1 << CPLeftMouseDown;
+CPLeftMouseUpMask                       = 1 << CPLeftMouseUp;
+CPRightMouseDownMask                    = 1 << CPRightMouseDown;
+CPRightMouseUpMask                      = 1 << CPRightMouseUp;
+CPOtherMouseDownMask                    = 1 << CPOtherMouseDown;
+CPOtherMouseUpMask                      = 1 << CPOtherMouseUp;
+CPMouseMovedMask                        = 1 << CPMouseMoved;
+CPLeftMouseDraggedMask                  = 1 << CPLeftMouseDragged;
+CPRightMouseDraggedMask                 = 1 << CPRightMouseDragged;
+CPOtherMouseDragged                     = 1 << CPOtherMouseDragged;
+CPMouseEnteredMask                      = 1 << CPMouseEntered;
+CPMouseExitedMask                       = 1 << CPMouseExited;
+CPCursorUpdateMask                      = 1 << CPCursorUpdate;
+CPKeyDownMask                           = 1 << CPKeyDown;
+CPKeyUpMask                             = 1 << CPKeyUp;
+CPFlagsChangedMask                      = 1 << CPFlagsChanged;
+CPAppKitDefinedMask                     = 1 << CPAppKitDefined;
+CPSystemDefinedMask                     = 1 << CPSystemDefined;
+CPApplicationDefinedMask                = 1 << CPApplicationDefined;
+CPPeriodicMask                          = 1 << CPPeriodic;
+CPScrollWheelMask                       = 1 << CPScrollWheel;
+CPAnyEventMask                          = 0xffffffff;
+
+CPUpArrowFunctionKey                    = "\uF700";
+CPDownArrowFunctionKey                  = "\uF701";
+CPLeftArrowFunctionKey                  = "\uF702";
+CPRightArrowFunctionKey                 = "\uF703";
+CPF1FunctionKey                         = "\uF704";
+CPF2FunctionKey                         = "\uF705";
+CPF3FunctionKey                         = "\uF706";
+CPF4FunctionKey                         = "\uF707";
+CPF5FunctionKey                         = "\uF708";
+CPF6FunctionKey                         = "\uF709";
+CPF7FunctionKey                         = "\uF70A";
+CPF8FunctionKey                         = "\uF70B";
+CPF9FunctionKey                         = "\uF70C";
+CPF10FunctionKey                        = "\uF70D";
+CPF11FunctionKey                        = "\uF70E";
+CPF12FunctionKey                        = "\uF70F";
+CPF13FunctionKey                        = "\uF710";
+CPF14FunctionKey                        = "\uF711";
+CPF15FunctionKey                        = "\uF712";
+CPF16FunctionKey                        = "\uF713";
+CPF17FunctionKey                        = "\uF714";
+CPF18FunctionKey                        = "\uF715";
+CPF19FunctionKey                        = "\uF716";
+CPF20FunctionKey                        = "\uF717";
+CPF21FunctionKey                        = "\uF718";
+CPF22FunctionKey                        = "\uF719";
+CPF23FunctionKey                        = "\uF71A";
+CPF24FunctionKey                        = "\uF71B";
+CPF25FunctionKey                        = "\uF71C";
+CPF26FunctionKey                        = "\uF71D";
+CPF27FunctionKey                        = "\uF71E";
+CPF28FunctionKey                        = "\uF71F";
+CPF29FunctionKey                        = "\uF720";
+CPF30FunctionKey                        = "\uF721";
+CPF31FunctionKey                        = "\uF722";
+CPF32FunctionKey                        = "\uF723";
+CPF33FunctionKey                        = "\uF724";
+CPF34FunctionKey                        = "\uF725";
+CPF35FunctionKey                        = "\uF726";
+CPInsertFunctionKey                     = "\uF727";
+CPDeleteFunctionKey                     = "\uF728";
+CPHomeFunctionKey                       = "\uF729";
+CPBeginFunctionKey                      = "\uF72A";
+CPEndFunctionKey                        = "\uF72B";
+CPPageUpFunctionKey                     = "\uF72C";
+CPPageDownFunctionKey                   = "\uF72D";
+CPPrintScreenFunctionKey                = "\uF72E";
+CPScrollLockFunctionKey                 = "\uF72F";
+CPPauseFunctionKey                      = "\uF730";
+CPSysReqFunctionKey                     = "\uF731";
+CPBreakFunctionKey                      = "\uF732";
+CPResetFunctionKey                      = "\uF733";
+CPStopFunctionKey                       = "\uF734";
+CPMenuFunctionKey                       = "\uF735";
+CPUserFunctionKey                       = "\uF736";
+CPSystemFunctionKey                     = "\uF737";
+CPPrintFunctionKey                      = "\uF738";
+CPClearLineFunctionKey                  = "\uF739";
+CPClearDisplayFunctionKey               = "\uF73A";
+CPInsertLineFunctionKey                 = "\uF73B";
+CPDeleteLineFunctionKey                 = "\uF73C";
+CPInsertCharFunctionKey                 = "\uF73D";
+CPDeleteCharFunctionKey                 = "\uF73E";
+CPPrevFunctionKey                       = "\uF73F";
+CPNextFunctionKey                       = "\uF740";
+CPSelectFunctionKey                     = "\uF741";
+CPExecuteFunctionKey                    = "\uF742";
+CPUndoFunctionKey                       = "\uF743";
+CPRedoFunctionKey                       = "\uF744";
+CPFindFunctionKey                       = "\uF745";
+CPHelpFunctionKey                       = "\uF746";
+CPModeSwitchFunctionKey                 = "\uF747";
+CPEscapeFunctionKey                     = "\u001B";
+CPSpaceFunctionKey                      = "\u0020";
+
+
+CPDOMEventDoubleClick                   = "dblclick";
+CPDOMEventMouseDown                     = "mousedown";
+CPDOMEventMouseUp                       = "mouseup";
+CPDOMEventMouseMoved                    = "mousemove";
+CPDOMEventMouseDragged                  = "mousedrag";
+CPDOMEventKeyUp                         = "keyup";
+CPDOMEventKeyDown                       = "keydown";
+CPDOMEventKeyPress                      = "keypress";
+CPDOMEventCopy                          = "copy";
+CPDOMEventPaste                         = "paste";
+CPDOMEventScrollWheel                   = "mousewheel";
+CPDOMEventTouchStart                    = "touchstart";
+CPDOMEventTouchMove                     = "touchmove";
+CPDOMEventTouchEnd                      = "touchend";
+CPDOMEventTouchCancel                   = "touchcancel";
 
 var _CPEventPeriodicEventPeriod         = 0,
     _CPEventPeriodicEventTimer          = nil,
@@ -47,7 +190,7 @@ var _CPEventPeriodicEventPeriod         = 0,
 @implementation CPEvent : CPObject
 {
     CPEventType         _type;
-    CGPoint             _location;
+    CPPoint             _location;
     unsigned            _modifierFlags;
     CPTimeInterval      _timestamp;
     CPGraphicsContext   _context;
@@ -63,7 +206,6 @@ var _CPEventPeriodicEventPeriod         = 0,
     DOMEvent            _DOMEvent;
     int                 _data1;
     int                 _data2;
-    short               _subtype;
 
     float               _deltaX;
     float               _deltaY;
@@ -166,13 +308,13 @@ var _CPEventPeriodicEventPeriod         = 0,
 }
 
 /* @ignore */
-- (id)_initMouseEventWithType:(CPEventType)anEventType location:(CGPoint)aPoint modifierFlags:(unsigned)modifierFlags
+- (id)_initMouseEventWithType:(CPEventType)anEventType location:(CPPoint)aPoint modifierFlags:(unsigned)modifierFlags
     timestamp:(CPTimeInterval)aTimestamp windowNumber:(int)aWindowNumber context:(CPGraphicsContext)aGraphicsContext
     eventNumber:(int)anEventNumber clickCount:(int)aClickCount pressure:(float)aPressure
 {
     if (self = [self _initWithType:anEventType])
     {
-        _location = CGPointCreateCopy(aPoint);
+        _location = CPPointCreateCopy(aPoint);
         _modifierFlags = modifierFlags;
         _timestamp = aTimestamp;
         _context = aGraphicsContext;
@@ -186,13 +328,13 @@ var _CPEventPeriodicEventPeriod         = 0,
 }
 
 /* @ignore */
-- (id)_initKeyEventWithType:(CPEventType)anEventType location:(CGPoint)aPoint modifierFlags:(unsigned int)modifierFlags
+- (id)_initKeyEventWithType:(CPEventType)anEventType location:(CPPoint)aPoint modifierFlags:(unsigned int)modifierFlags
     timestamp:(CPTimeInterval)aTimestamp windowNumber:(int)aWindowNumber context:(CPGraphicsContext)aGraphicsContext
     characters:(CPString)characters charactersIgnoringModifiers:(CPString)unmodCharacters isARepeat:(BOOL)isARepeat keyCode:(unsigned short)code
 {
     if (self = [self _initWithType:anEventType])
     {
-        _location = CGPointCreateCopy(aPoint);
+        _location = CPPointCreateCopy(aPoint);
         _modifierFlags = modifierFlags;
         _timestamp = aTimestamp;
         _context = aGraphicsContext;
@@ -213,7 +355,7 @@ var _CPEventPeriodicEventPeriod         = 0,
 {
     if (self = [self _initWithType:anEventType])
     {
-        _location = CGPointCreateCopy(aPoint);
+        _location = CPPointCreateCopy(aPoint);
         _modifierFlags = modifierFlags;
         _timestamp = aTimestamp;
         _context = aGraphicsContext;
@@ -507,7 +649,7 @@ var _CPEventPeriodicEventPeriod         = 0,
         case CPKeyDown:
         case CPKeyUp:
         case CPFlagsChanged:
-            return [CPString stringWithFormat:@"CPEvent: type=%d loc=%@ time=%.1f flags=0x%X win=%@ winNum=%d ctxt=%@ chars=\"%@\" unmodchars=\"%@\" repeat=%d keyCode=%d", _type, CGStringFromPoint(_location), _timestamp, _modifierFlags, _window, _windowNumber, _context, _characters, _charactersIgnoringModifiers, _isARepeat, _keyCode];
+            return [CPString stringWithFormat:@"CPEvent: type=%d loc=%@ time=%.1f flags=0x%X win=%@ winNum=%d ctxt=%@ chars=\"%@\" unmodchars=\"%@\" repeat=%d keyCode=%d", _type, CPStringFromPoint(_location), _timestamp, _modifierFlags, _window, _windowNumber, _context, _characters, _charactersIgnoringModifiers, _isARepeat, _keyCode];
         case CPLeftMouseDown:
         case CPLeftMouseUp:
         case CPRightMouseDown:
@@ -517,9 +659,9 @@ var _CPEventPeriodicEventPeriod         = 0,
         case CPRightMouseDragged:
         case CPMouseEntered:
         case CPMouseExited:
-            return [CPString stringWithFormat:@"CPEvent: type=%d loc=%@ time=%.1f flags=0x%X win=%@ winNum=%d ctxt=%@ evNum=%d click=%d buttonNumber=%d pressure=%f", _type, CGStringFromPoint(_location), _timestamp, _modifierFlags, _window, _windowNumber, _context, _eventNumber, _clickCount, [self buttonNumber], _pressure];
+            return [CPString stringWithFormat:@"CPEvent: type=%d loc=%@ time=%.1f flags=0x%X win=%@ winNum=%d ctxt=%@ evNum=%d click=%d buttonNumber=%d pressure=%f", _type, CPStringFromPoint(_location), _timestamp, _modifierFlags, _window, _windowNumber, _context, _eventNumber, _clickCount, [self buttonNumber], _pressure];
         default:
-            return [CPString stringWithFormat:@"CPEvent: type=%d loc=%@ time=%.1f flags=0x%X win=%@ winNum=%d ctxt=%@ subtype=%d data1=%d data2=%d", _type, CGStringFromPoint(_location), _timestamp, _modifierFlags, _window, _windowNumber, _context, _subtype, _data1, _data2];
+            return [CPString stringWithFormat:@"CPEvent: type=%d loc=%@ time=%.1f flags=0x%X win=%@ winNum=%d ctxt=%@ subtype=%d data1=%d data2=%d", _type, CPStringFromPoint(_location), _timestamp, _modifierFlags, _window, _windowNumber, _context, _subtype, _data1, _data2];
     }
 }
 

AppKit/CPEvent_Constants.j

@@ -1,174 +0,0 @@
-/*
- * CPEvent_Constants.j
- * AppKit
- *
- * Created by Francisco Tolmasky.
- * Copyright 2008, 280 North, Inc.
- *
- * 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
- */
-
-CPLeftMouseDown                         = 1;
-CPLeftMouseUp                           = 2;
-CPRightMouseDown                        = 3;
-CPRightMouseUp                          = 4;
-CPMouseMoved                            = 5;
-CPLeftMouseDragged                      = 6;
-CPRightMouseDragged                     = 7;
-CPMouseEntered                          = 8;
-CPMouseExited                           = 9;
-CPKeyDown                               = 10;
-CPKeyUp                                 = 11;
-CPFlagsChanged                          = 12;
-CPAppKitDefined                         = 13;
-CPSystemDefined                         = 14;
-CPApplicationDefined                    = 15;
-CPPeriodic                              = 16;
-CPCursorUpdate                          = 17;
-CPScrollWheel                           = 22;
-CPOtherMouseDown                        = 25;
-CPOtherMouseUp                          = 26;
-CPOtherMouseDragged                     = 27;
-
-// iPhone Event Types
-CPTouchStart                            = 28;
-CPTouchMove                             = 29;
-CPTouchEnd                              = 30;
-CPTouchCancel                           = 31;
-
-CPAlphaShiftKeyMask                     = 1 << 16;
-CPShiftKeyMask                          = 1 << 17;
-CPControlKeyMask                        = 1 << 18;
-CPAlternateKeyMask                      = 1 << 19;
-CPCommandKeyMask                        = 1 << 20;
-CPNumericPadKeyMask                     = 1 << 21;
-CPHelpKeyMask                           = 1 << 22;
-CPFunctionKeyMask                       = 1 << 23;
-CPDeviceIndependentModifierFlagsMask    = 0xffff0000;
-
-CPLeftMouseDownMask                     = 1 << CPLeftMouseDown;
-CPLeftMouseUpMask                       = 1 << CPLeftMouseUp;
-CPRightMouseDownMask                    = 1 << CPRightMouseDown;
-CPRightMouseUpMask                      = 1 << CPRightMouseUp;
-CPOtherMouseDownMask                    = 1 << CPOtherMouseDown;
-CPOtherMouseUpMask                      = 1 << CPOtherMouseUp;
-CPMouseMovedMask                        = 1 << CPMouseMoved;
-CPLeftMouseDraggedMask                  = 1 << CPLeftMouseDragged;
-CPRightMouseDraggedMask                 = 1 << CPRightMouseDragged;
-CPOtherMouseDragged                     = 1 << CPOtherMouseDragged;
-CPMouseEnteredMask                      = 1 << CPMouseEntered;
-CPMouseExitedMask                       = 1 << CPMouseExited;
-CPCursorUpdateMask                      = 1 << CPCursorUpdate;
-CPKeyDownMask                           = 1 << CPKeyDown;
-CPKeyUpMask                             = 1 << CPKeyUp;
-CPFlagsChangedMask                      = 1 << CPFlagsChanged;
-CPAppKitDefinedMask                     = 1 << CPAppKitDefined;
-CPSystemDefinedMask                     = 1 << CPSystemDefined;
-CPApplicationDefinedMask                = 1 << CPApplicationDefined;
-CPPeriodicMask                          = 1 << CPPeriodic;
-CPScrollWheelMask                       = 1 << CPScrollWheel;
-CPAnyEventMask                          = 0xffffffff;
-
-CPUpArrowFunctionKey                    = "\uF700";
-CPDownArrowFunctionKey                  = "\uF701";
-CPLeftArrowFunctionKey                  = "\uF702";
-CPRightArrowFunctionKey                 = "\uF703";
-CPF1FunctionKey                         = "\uF704";
-CPF2FunctionKey                         = "\uF705";
-CPF3FunctionKey                         = "\uF706";
-CPF4FunctionKey                         = "\uF707";
-CPF5FunctionKey                         = "\uF708";
-CPF6FunctionKey                         = "\uF709";
-CPF7FunctionKey                         = "\uF70A";
-CPF8FunctionKey                         = "\uF70B";
-CPF9FunctionKey                         = "\uF70C";
-CPF10FunctionKey                        = "\uF70D";
-CPF11FunctionKey                        = "\uF70E";
-CPF12FunctionKey                        = "\uF70F";
-CPF13FunctionKey                        = "\uF710";
-CPF14FunctionKey                        = "\uF711";
-CPF15FunctionKey                        = "\uF712";
-CPF16FunctionKey                        = "\uF713";
-CPF17FunctionKey                        = "\uF714";
-CPF18FunctionKey                        = "\uF715";
-CPF19FunctionKey                        = "\uF716";
-CPF20FunctionKey                        = "\uF717";
-CPF21FunctionKey                        = "\uF718";
-CPF22FunctionKey                        = "\uF719";
-CPF23FunctionKey                        = "\uF71A";
-CPF24FunctionKey                        = "\uF71B";
-CPF25FunctionKey                        = "\uF71C";
-CPF26FunctionKey                        = "\uF71D";
-CPF27FunctionKey                        = "\uF71E";
-CPF28FunctionKey                        = "\uF71F";
-CPF29FunctionKey                        = "\uF720";
-CPF30FunctionKey                        = "\uF721";
-CPF31FunctionKey                        = "\uF722";
-CPF32FunctionKey                        = "\uF723";
-CPF33FunctionKey                        = "\uF724";
-CPF34FunctionKey                        = "\uF725";
-CPF35FunctionKey                        = "\uF726";
-CPInsertFunctionKey                     = "\uF727";
-CPDeleteFunctionKey                     = "\uF728";
-CPHomeFunctionKey                       = "\uF729";
-CPBeginFunctionKey                      = "\uF72A";
-CPEndFunctionKey                        = "\uF72B";
-CPPageUpFunctionKey                     = "\uF72C";
-CPPageDownFunctionKey                   = "\uF72D";
-CPPrintScreenFunctionKey                = "\uF72E";
-CPScrollLockFunctionKey                 = "\uF72F";
-CPPauseFunctionKey                      = "\uF730";
-CPSysReqFunctionKey                     = "\uF731";
-CPBreakFunctionKey                      = "\uF732";
-CPResetFunctionKey                      = "\uF733";
-CPStopFunctionKey                       = "\uF734";
-CPMenuFunctionKey                       = "\uF735";
-CPUserFunctionKey                       = "\uF736";
-CPSystemFunctionKey                     = "\uF737";
-CPPrintFunctionKey                      = "\uF738";
-CPClearLineFunctionKey                  = "\uF739";
-CPClearDisplayFunctionKey               = "\uF73A";
-CPInsertLineFunctionKey                 = "\uF73B";
-CPDeleteLineFunctionKey                 = "\uF73C";
-CPInsertCharFunctionKey                 = "\uF73D";
-CPDeleteCharFunctionKey                 = "\uF73E";
-CPPrevFunctionKey                       = "\uF73F";
-CPNextFunctionKey                       = "\uF740";
-CPSelectFunctionKey                     = "\uF741";
-CPExecuteFunctionKey                    = "\uF742";
-CPUndoFunctionKey                       = "\uF743";
-CPRedoFunctionKey                       = "\uF744";
-CPFindFunctionKey                       = "\uF745";
-CPHelpFunctionKey                       = "\uF746";
-CPModeSwitchFunctionKey                 = "\uF747";
-CPEscapeFunctionKey                     = "\u001B";
-CPSpaceFunctionKey                      = "\u0020";
-
-
-CPDOMEventDoubleClick                   = "dblclick";
-CPDOMEventMouseDown                     = "mousedown";
-CPDOMEventMouseUp                       = "mouseup";
-CPDOMEventMouseMoved                    = "mousemove";
-CPDOMEventMouseDragged                  = "mousedrag";
-CPDOMEventKeyUp                         = "keyup";
-CPDOMEventKeyDown                       = "keydown";
-CPDOMEventKeyPress                      = "keypress";
-CPDOMEventCopy                          = "copy";
-CPDOMEventPaste                         = "paste";
-CPDOMEventScrollWheel                   = "mousewheel";
-CPDOMEventTouchStart                    = "touchstart";
-CPDOMEventTouchMove                     = "touchmove";
-CPDOMEventTouchEnd                      = "touchend";
-CPDOMEventTouchCancel                   = "touchcancel";

AppKit/CPFlashView.j

@@ -38,6 +38,7 @@ var IEFlashCLSID = "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000";
 #if PLATFORM(DOM)
     DOMElement      _DOMParamElement;
     DOMElement      _DOMObjectElement;
+    DOMElement      _DOMInnerObjectElement;
 #endif
 }
 
@@ -51,16 +52,22 @@ var IEFlashCLSID = "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000";
         if (!CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
         {
             _DOMObjectElement = document.createElement(@"object");
-            _DOMObjectElement.id = [self elementID];
             _DOMObjectElement.width = @"100%";
             _DOMObjectElement.height = @"100%";
             _DOMObjectElement.style.top = @"0px";
             _DOMObjectElement.style.left = @"0px";
             _DOMObjectElement.type = @"application/x-shockwave-flash";
+            _DOMObjectElement.setAttribute(@"classid", IEFlashCLSID);
+
             _DOMParamElement = document.createElement(@"param");
             _DOMParamElement.name = @"movie";
 
+            _DOMInnerObjectElement = document.createElement(@"object");
+            _DOMInnerObjectElement.width = @"100%";
+            _DOMInnerObjectElement.height = @"100%";
+
             _DOMObjectElement.appendChild(_DOMParamElement);
+            _DOMObjectElement.appendChild(_DOMInnerObjectElement);
 
             _DOMElement.appendChild(_DOMObjectElement);
         }
@@ -82,7 +89,7 @@ var IEFlashCLSID = "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000";
     if (!CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
     {
         _DOMParamElement.value = [aFlashMovie filename];
-        _DOMObjectElement.data = [aFlashMovie filename];
+        _DOMInnerObjectElement.data = [aFlashMovie filename];
     }
     else
         [self _rebuildIEObjects];
@@ -100,14 +107,11 @@ var IEFlashCLSID = "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000";
         enumerator = [aDictionary keyEnumerator],
         key;
 
-    if (key = [enumerator nextObject])
-        varString = [varString stringByAppendingFormat:@"%@=%@", key, [aDictionary objectForKey:key]];
-
-    while (key = [enumerator nextObject])
+    while ((key = [enumerator nextObject]) !== nil)
         varString = [varString stringByAppendingFormat:@"&%@=%@", key, [aDictionary objectForKey:key]];
 
     if (!_params)
-        _params = @{};
+        _params = [CPDictionary dictionary];
 
     [_params setObject:varString forKey:@"flashvars"];
     [self setParameters:_params];
@@ -137,7 +141,7 @@ var IEFlashCLSID = "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000";
 #if PLATFORM(DOM)
     if (!CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
     {
-        _paramElements = @{};
+        _paramElements = [CPDictionary dictionary];
 
         var enumerator = [_params keyEnumerator],
             key;
@@ -180,20 +184,10 @@ var IEFlashCLSID = "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000";
     _DOMObjectElement = document.createElement(@"object");
     _DOMElement.appendChild(_DOMObjectElement);
 
-    _DOMObjectElement.outerHTML = [CPString stringWithFormat:@"<object id=%@ classid=%@ width=%@ height=%@>%@</object>", [self elementID], IEFlashCLSID, CGRectGetWidth([self bounds]), CGRectGetHeight([self bounds]), paramString];
+    _DOMObjectElement.outerHTML = [CPString stringWithFormat:@"<object classid=%@ width=%@ height=%@>%@</object>", IEFlashCLSID, CGRectGetWidth([self bounds]), CGRectGetHeight([self bounds]), paramString];
 }
 #endif
 
-- (CPString)elementID
-{
-    return @"CPFV_" + [self UID];
-}
-
-- (void)mouseMoved:(id)sommit
-{
-    [[[self window] platformWindow] _propagateCurrentDOMEvent:YES];
-}
-
 - (void)mouseDragged:(CPEvent)anEvent
 {
     [[[self window] platformWindow] _propagateCurrentDOMEvent:YES];

AppKit/CPFont.j

@@ -281,7 +281,7 @@ following:
            that dynamically tracks the current system font size.
     @return the requested system font
 */
-+ (CPFont)systemFontOfSize:(CGSize)aSize
++ (CPFont)systemFontOfSize:(CPSize)aSize
 {
     return _CPSystemFont(aSize === 0 ? _CPFontSystemFontSize : aSize, NO);
 }
@@ -293,7 +293,7 @@ following:
            that dynamically tracks the current system font size.
     @return the requested bold system font
 */
-+ (CPFont)boldSystemFontOfSize:(CGSize)aSize
++ (CPFont)boldSystemFontOfSize:(CPSize)aSize
 {
     return _CPSystemFont(aSize === 0 ? _CPFontSystemFontSize : aSize, YES);
 }

AppKit/CPFontManager.j

@@ -24,8 +24,6 @@
 
 @import "CPFont.j"
 
-@global CPApp
-
 CPItalicFontMask                    = 1 << 0;
 CPBoldFontMask                      = 1 << 1;
 CPUnboldFontMask                    = 1 << 2;
@@ -56,7 +54,7 @@ var CPSharedFontManager     = nil,
     id              _delegate @accessors(property=delegate);
 
     CPFont          _selectedFont;
-    BOOL            _multiple @accessors(getter=isMultiple, setter=setMultiple:);
+    BOOL            _multiple @accessors;
 
     CPDictionary    _activeChange;
 }
@@ -141,7 +139,7 @@ var CPSharedFontManager     = nil,
 - (void)setSelectedFont:(CPFont)aFont isMultiple:(BOOL)aFlag
 {
     _selectedFont = aFont;
-    _multiple = aFlag;
+    _isMultiple = aFlag;
 
     // TODO Notify CPFontPanel when it exists.
 }
@@ -151,6 +149,11 @@ var CPSharedFontManager     = nil,
     return _selectedFont;
 }
 
+- (BOOL)isMultiple
+{
+    return _isMultiple;
+}
+
 - (int)weightOfFont:(CPFont)aFont
 {
     // TODO Weight 5 is a normal of book weight and 9 and above is bold, but it would be nice to be more
@@ -208,8 +211,7 @@ var CPSharedFontManager     = nil,
 
 - (@action)addFontTrait:(id)sender
 {
-    var tag = [sender tag];
-    _activeChange = tag === nil ? @{} : @{ @"addTraits": tag };
+    _activeChange = [CPDictionary dictionaryWithObject:[sender tag] forKey:@"addTraits"];
 
     [self sendAction];
 }

AppKit/CPGradient.j

@@ -20,16 +20,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-@import <Foundation/CPObject.j>
-@import <Foundation/CPException.j>
-@import <Foundation/CPMutableArray.j>
-
-@import "CGColor.j"
-@import "CGColorSpace.j"
-@import "CGGradient.j"
-@import "CPBezierPath.j"
-@import "CPGraphicsContext.j"
-
 CPGradientDrawsBeforeStartingLocation   = kCGGradientDrawsBeforeStartLocation;
 CPGradientDrawsAfterEndingLocation      = kCGGradientDrawsAfterEndLocation;
 
@@ -41,11 +31,6 @@ CPGradientDrawsAfterEndingLocation      = kCGGradientDrawsAfterEndLocation;
     CGGradient _gradient;
 }
 
-- (id)initWithStartingColor:(CPColor)startingColor endingColor:(CPColor)endingColor
-{
-    return [self initWithColors:[startingColor, endingColor]];
-}
-
 - (id)initWithColors:(CPArray)someColors
 {
     var count = [someColors count];
@@ -89,19 +74,7 @@ CPGradientDrawsAfterEndingLocation      = kCGGradientDrawsAfterEndLocation;
     CGContextClipToRect(ctx, rect);
     CGContextAddRect(ctx, rect);
 
-    [self _drawInRect:rect atAngle:angle];
-
-    CGContextRestoreGState(ctx);
-}
-
-/*!
-    @ignore like draw in rect but apply no clipping.
-*/
-- (void)_drawInRect:(CGRect)rect atAngle:(float)angle
-{
-    var ctx = [[CPGraphicsContext currentContext] graphicsPort],
-
-        startPoint,
+    var startPoint,
         endPoint;
 
     // Modulo of negative values doesn't work as expected in JS.
@@ -135,25 +108,7 @@ CPGradientDrawsAfterEndingLocation      = kCGGradientDrawsAfterEndLocation;
                            startPoint.y + length * SIN(radians));
 
     [self drawFromPoint:startPoint toPoint:endPoint options:CPGradientDrawsBeforeStartingLocation | CPGradientDrawsAfterEndingLocation];
-}
-
-- (void)drawInBezierPath:(CPBezierPath)aPath angle:(float)anAngle
-{
-    [CPGraphicsContext saveGraphicsState];
-
-    var ctx = [[CPGraphicsContext currentContext] graphicsPort];
-
-    // Nail down the path which CGContextDrawLinearGradient will cause to be filled.
-    // Note we don't do this by clipping to the path and then calling drawInRect:atAngle:
-    // as this would cut off any antialias of the drawing, plus any active context shadow.
-    CGContextBeginPath(ctx);
-    CGContextAddPath(ctx, aPath._path);
-    CGContextSetLineWidth(ctx, [aPath lineWidth]);
-    CGContextClosePath(ctx);
-
-    [self _drawInRect:[aPath bounds] atAngle:anAngle];
-
-    [CPGraphicsContext restoreGraphicsState];
+    CGContextRestoreGState(ctx);
 }
 
 - (void)drawFromPoint:(NSPoint)startingPoint toPoint:(NSPoint)endingPoint options:(NSGradientDrawingOptions)options

AppKit/CPGraphicsContext.j

@@ -68,7 +68,6 @@ var CPGraphicsContextCurrent = nil,
 + (void)restoreGraphicsState
 {
     var lastContext = [CPGraphicsContextThreadStack lastObject];
-
     if (lastContext)
     {
         [lastContext restoreGraphicsState];

AppKit/CPImage.j

@@ -21,14 +21,12 @@
  */
 
 @import <Foundation/CPBundle.j>
+@import <Foundation/CPGeometry.j>
 @import <Foundation/CPNotificationCenter.j>
 @import <Foundation/CPObject.j>
 @import <Foundation/CPRunLoop.j>
 @import <Foundation/CPString.j>
-@import <Foundation/CPData.j>
 
-@import "CGGeometry.j"
-@import "CPCompatibility.j"
 
 CPImageLoadStatusInitialized    = 0;
 CPImageLoadStatusLoading        = 1;
@@ -48,47 +46,18 @@ var imagesForNames = { },
     AppKitImageForNames = { },
     ImageDescriptionFormat = "%s {\n   filename: \"%s\",\n   size: { width:%f, height:%f }\n}";
 
-AppKitImageForNames[CPImageNameColorPanel]              = _CGSizeMake(26.0, 29.0);
-AppKitImageForNames[CPImageNameColorPanelHighlighted]   = _CGSizeMake(26.0, 29.0);
+AppKitImageForNames[CPImageNameColorPanel]              = CGSizeMake(26.0, 29.0);
+AppKitImageForNames[CPImageNameColorPanelHighlighted]   = CGSizeMake(26.0, 29.0);
 
-/*!
-    Returns a resource image with a relative path and size
-    in a bundle.
-
-    @param filename A filename or relative path to a resource image.
-    @param width    Width of the image. May be omitted.
-    @param height   Height of the image. May be omitted if width is omitted.
-    @param size     Instead of passing width/height, a CGSize may be passed.
-    @param bundle   Bundle in which the image resource can be found.
-                    If omitted, defaults to the main bundle.
-    @return CPImage
-*/
-function CPImageInBundle()
+function CPImageInBundle(aFilename, aSize, aBundle)
 {
-    var filename = arguments[0],
-        size = nil,
-        bundle = nil;
+    if (!aBundle)
+        aBundle = [CPBundle mainBundle];
 
-    if (typeof(arguments[1]) === "number")
-    {
-        if (arguments[1] !== nil && arguments[1] !== undefined)
-            size = _CGSizeMake(arguments[1], arguments[2]);
+    if (aSize)
+        return [[CPImage alloc] initWithContentsOfFile:[aBundle pathForResource:aFilename] size:aSize];
 
-        bundle = arguments[3];
-    }
-    else if (typeof(arguments[1]) === "object")
-    {
-        size = arguments[1];
-        bundle = arguments[2];
-    }
-
-    if (!bundle)
-        bundle = [CPBundle mainBundle];
-
-    if (size)
-        return [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:filename] size:size];
-
-    return [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:filename]];
+    return [[CPImage alloc] initWithContentsOfFile:[aBundle pathForResource:aFilename]];
 }
 
 function CPAppKitImage(aFilename, aSize)
@@ -131,7 +100,7 @@ function CPAppKitImage(aFilename, aSize)
 
 - (id)init
 {
-    return [self initByReferencingFile:@"" size:_CGSizeMake(-1, -1)];
+    return [self initByReferencingFile:@"" size:CGSizeMake(-1, -1)];
 }
 
 /*!
@@ -148,7 +117,7 @@ function CPAppKitImage(aFilename, aSize)
 
     if (self)
     {
-        _size = _CGSizeMakeCopy(aSize);
+        _size = CPSizeCreateCopy(aSize);
         _filename = aFilename;
         _loadStatus = CPImageLoadStatusInitialized;
     }
@@ -180,7 +149,7 @@ function CPAppKitImage(aFilename, aSize)
 */
 - (id)initWithContentsOfFile:(CPString)aFilename
 {
-    self = [self initByReferencingFile:aFilename size:_CGSizeMake(-1, -1)];
+    self = [self initByReferencingFile:aFilename size:CGSizeMake(-1, -1)];
 
     if (self)
         [self load];
@@ -247,7 +216,7 @@ function CPAppKitImage(aFilename, aSize)
 */
 - (void)setSize:(CGSize)aSize
 {
-    _size = _CGSizeMakeCopy(aSize);
+    _size = CGSizeMakeCopy(aSize);
 }
 
 /*!
@@ -302,14 +271,6 @@ function CPAppKitImage(aFilename, aSize)
     return _name;
 }
 
-/*!
-    Returns the underlying Image element for a single image.
-*/
-- (Image)image
-{
-    return _image;
-}
-
 /*!
     Sets the receiver's delegate.
     @param the delegate
@@ -398,11 +359,6 @@ function CPAppKitImage(aFilename, aSize)
 #endif
 }
 
-- (BOOL)isSingleImage
-{
-    return YES;
-}
-
 - (BOOL)isThreePartImage
 {
     return NO;
@@ -446,7 +402,7 @@ function CPAppKitImage(aFilename, aSize)
 
     // FIXME: IE is wrong on image sizes????
     if (!_size || (_size.width == -1 && _size.height == -1))
-        _size = _CGSizeMake(_image.width, _image.height);
+        _size = CGSizeMake(_image.width, _image.height);
 
     [[CPNotificationCenter defaultCenter]
         postNotificationName:CPImageDidLoadNotification
@@ -534,11 +490,6 @@ function CPAppKitImage(aFilename, aSize)
     return _isVertical;
 }
 
-- (BOOL)isSingleImage
-{
-    return NO;
-}
-
 - (BOOL)isThreePartImage
 {
     return YES;
@@ -603,11 +554,6 @@ var CPThreePartImageImageSlicesKey  = @"CPThreePartImageImageSlicesKey",
     return _imageSlices;
 }
 
-- (BOOL)isSingleImage
-{
-    return NO;
-}
-
 - (BOOL)isThreePartImage
 {
     return NO;

AppKit/CPImageView.j

@@ -26,9 +26,6 @@
 @import "CPImage.j"
 @import "CPShadowView.j"
 
-@global CPImagesPboardType
-@global appkit_tag_dom_elements
-
 CPImageAlignCenter      = 0;
 CPImageAlignTop         = 1;
 CPImageAlignTopLeft     = 2;
@@ -70,14 +67,12 @@ var CPImageViewEmptyPlaceholderImage = nil;
     CPImageViewEmptyPlaceholderImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"empty.png"]];
 }
 
-+ (Class)_binderClassForBinding:(CPString)aBinding
++ (Class)_binderClassForBinding:(CPString)theBinding
 {
-    if (aBinding === CPValueBinding || aBinding === CPValueURLBinding || aBinding === CPValuePathBinding || aBinding === CPDataBinding)
+    if (theBinding === CPValueBinding || theBinding === CPValueURLBinding || theBinding === CPValuePathBinding || theBinding === CPDataBinding)
         return [CPImageViewValueBinder class];
-    else if ([aBinding hasPrefix:CPEditableBinding])
-        return [CPMultipleValueAndBinding class];
 
-    return [super _binderClassForBinding:aBinding];
+    return [super _binderClassForBinding:theBinding];
 }
 
 - (id)initWithFrame:(CGRect)aFrame
@@ -476,30 +471,16 @@ var CPImageViewEmptyPlaceholderImage = nil;
 {
     var image;
 
-    if (aValue == nil)
-        image = nil;
-    else if (aBinding === CPDataBinding)
+    if (aBinding === CPDataBinding)
         image = [[CPImage alloc] initWithData:aValue];
     else if (aBinding === CPValueURLBinding || aBinding === CPValuePathBinding)
-        image = [CPImage cachedImageWithContentsOfFile:aValue];
+        image = [[CPImage alloc] initWithContentsOfFile:aValue];
     else if (aBinding === CPValueBinding)
         image = aValue;
 
     [_source setImage:image];
 }
 
-- (void)valueForBinding:(CPString)aBinding
-{
-    var image = [_source image];
-
-    if (aBinding === CPDataBinding)
-        return [image data];
-    else if (aBinding === CPValueURLBinding || aBinding === CPValuePathBinding)
-        return [image filename];
-    else if (aBinding === CPValueBinding)
-        return image;
-}
-
 @end
 
 var CPImageViewImageKey          = @"CPImageViewImageKey",
@@ -584,21 +565,3 @@ var CPImageViewImageKey          = @"CPImageViewImageKey",
 }
 
 @end
-
-@implementation CPImage (CahedImage)
-
-+ (CPImage)cachedImageWithContentsOfFile:(CPString)aFile
-{
-    var cached_name = [CPString stringWithFormat:@"%@_%d", [self class], [aFile hash]],
-        image = [CPImage imageNamed:cached_name];
-
-    if (!image)
-    {
-        image = [[CPImage alloc] initWithContentsOfFile:aFile];
-        [image setName:cached_name];
-    }
-
-    return image;
-}
-
-@end

AppKit/CPKeyBinding.j

@@ -21,10 +21,9 @@
  */
 
 @import <Foundation/CPObject.j>
-@import <Foundation/CPArray.j>
 
-@import "CPEvent_Constants.j"
-@import "CPText.j"
+@import "CPEvent.j"
+
 
 CPStandardKeyBindings = {
     @"@.": @"cancelOperation:",

AppKit/CPKeyValueBinding.j

@@ -26,14 +26,11 @@
 @import <Foundation/CPObject.j>
 @import <Foundation/CPArray.j>
 @import <Foundation/CPDictionary.j>
-@import <Foundation/CPInvocation.j>
 @import <Foundation/CPValueTransformer.j>
-@import <Foundation/CPKeyValueObserving.j>
 
-@class CPButton
 
-var exposedBindingsMap = @{},
-    bindingsMap = @{};
+var exposedBindingsMap = [CPDictionary new],
+    bindingsMap = [CPDictionary new];
 
 var CPBindingOperationAnd = 0,
     CPBindingOperationOr  = 1;
@@ -41,7 +38,7 @@ var CPBindingOperationAnd = 0,
 @implementation CPBinder : CPObject
 {
     CPDictionary    _info;
-    id              _source @accessors(getter=source);
+    id              _source;
 
     JSObject        _suppressedNotifications;
     JSObject        _placeholderForMarker;
@@ -97,9 +94,9 @@ var CPBindingOperationAnd = 0,
     if (!theBinding)
         return;
 
-    var info = theBinding._info,
-        observedObject = [info objectForKey:CPObservedObjectKey],
-        keyPath = [info objectForKey:CPObservedKeyPathKey];
+    var infoDictionary = theBinding._info,
+        observedObject = [infoDictionary objectForKey:CPObservedObjectKey],
+        keyPath = [infoDictionary objectForKey:CPObservedKeyPathKey];
 
     [observedObject removeObserver:theBinding forKeyPath:keyPath];
     [bindings removeObjectForKey:aBinding];
@@ -108,7 +105,6 @@ var CPBindingOperationAnd = 0,
 + (void)unbindAllForObject:(id)anObject
 {
     var bindings = [bindingsMap objectForKey:[anObject UID]];
-
     if (!bindings)
         return;
 
@@ -123,17 +119,12 @@ var CPBindingOperationAnd = 0,
 
 - (id)initWithBinding:(CPString)aBinding name:(CPString)aName to:(id)aDestination keyPath:(CPString)aKeyPath options:(CPDictionary)options from:(id)aSource
 {
-    // We use [self init] here because subclasses override init. We can't override this method
-    // because their initialization has to occur before this method in this class is executed.
-    self = [self init];
+    self = [super init];
 
     if (self)
     {
         _source = aSource;
-        _info = @{
-                CPObservedObjectKey: aDestination,
-                CPObservedKeyPathKey: aKeyPath,
-            };
+        _info   = [CPDictionary dictionaryWithObjects:[aDestination, aKeyPath] forKeys:[CPObservedObjectKey, CPObservedKeyPathKey]];
         _suppressedNotifications = {};
         _placeholderForMarker = {};
 
@@ -145,10 +136,9 @@ var CPBindingOperationAnd = 0,
         [aDestination addObserver:self forKeyPath:aKeyPath options:CPKeyValueObservingOptionNew context:aBinding];
 
         var bindings = [bindingsMap objectForKey:[_source UID]];
-
         if (!bindings)
         {
-            bindings = @{};
+            bindings = [CPDictionary new];
             [bindingsMap setObject:bindings forKey:[_source UID]];
         }
 
@@ -159,25 +149,21 @@ var CPBindingOperationAnd = 0,
     return self;
 }
 
-- (void)raiseIfNotApplicable:(id)aValue forKeyPath:(CPString)keyPath options:(CPDictionary)options
-{
-    if (aValue === CPNotApplicableMarker && [options objectForKey:CPRaisesForNotApplicableKeysBindingOption])
-    {
-       [CPException raise:CPGenericException
-                   reason:@"Cannot transform non-applicable key on: " + _source + " key path: " + keyPath + " value: " + aValue];
-    }
-}
-
 - (void)setValueFor:(CPString)theBinding
 {
     var destination = [_info objectForKey:CPObservedObjectKey],
         keyPath = [_info objectForKey:CPObservedKeyPathKey],
         options = [_info objectForKey:CPOptionsKey],
-        newValue = [destination valueForKeyPath:keyPath];
+        newValue = [destination valueForKeyPath:keyPath],
+        isPlaceholder = CPIsControllerMarker(newValue);
 
-    if (CPIsControllerMarker(newValue))
+    if (isPlaceholder)
     {
-        [self raiseIfNotApplicable:newValue forKeyPath:keyPath options:options];
+        if (newValue === CPNotApplicableMarker && [options objectForKey:CPRaisesForNotApplicableKeysBindingOption])
+        {
+           [CPException raise:CPGenericException
+                       reason:@"Cannot transform non-applicable key on: " + _source + " key path: " + keyPath + " value: " + newValue];
+        }
 
         var value = [self _placeholderForMarker:newValue];
         [self setPlaceholderValue:value withMarker:newValue forBinding:theBinding];
@@ -224,7 +210,6 @@ var CPBindingOperationAnd = 0,
         return;
 
     var objectSuppressions = _suppressedNotifications[[anObject UID]];
-
     if (objectSuppressions && objectSuppressions[aKeyPath])
         return;
 
@@ -243,7 +228,6 @@ var CPBindingOperationAnd = 0,
         if (!valueTransformer)
         {
             var valueTransformerClass = CPClassFromString(valueTransformerName);
-
             if (valueTransformerClass)
             {
                 valueTransformer = [[valueTransformerClass alloc] init];
@@ -301,7 +285,6 @@ var CPBindingOperationAnd = 0,
 
     var uid = [anObject UID],
         objectSuppressions = _suppressedNotifications[uid];
-
     if (!objectSuppressions)
         _suppressedNotifications[uid] = objectSuppressions = {};
 
@@ -318,7 +301,6 @@ var CPBindingOperationAnd = 0,
 
     var uid = [anObject UID],
         objectSuppressions = _suppressedNotifications[uid];
-
     if (!objectSuppressions)
         return;
 
@@ -335,7 +317,6 @@ var CPBindingOperationAnd = 0,
             optionName = CPBinderPlaceholderOptions[count],
             isExplicit = [options containsKey:optionName],
             placeholder = isExplicit ? [options objectForKey:optionName] : nil;
-
         [self _setPlaceholder:placeholder forMarker:marker isDefault:!isExplicit];
     }
 }
@@ -345,13 +326,11 @@ var CPBindingOperationAnd = 0,
     [self _updatePlaceholdersWithOptions:options];
 }
 
-- (JSObject)_placeholderForMarker:(id)aMarker
+- (void)_placeholderForMarker:aMarker
 {
-    var placeholder = _placeholderForMarker[[aMarker UID]];
-
+    var placeholder = _placeholderForMarker[aMarker];
     if (placeholder)
-        return placeholder.value;
-
+        return placeholder['value'];
     return nil;
 }
 
@@ -359,14 +338,14 @@ var CPBindingOperationAnd = 0,
 {
     if (isDefault)
     {
-        var existingPlaceholder = _placeholderForMarker[[aMarker UID]];
+        var existingPlaceholder = _placeholderForMarker[aMarker];
 
         // Don't overwrite an explicitly set placeholder with a default.
-        if (existingPlaceholder && !existingPlaceholder.isDefault)
+        if (existingPlaceholder && !existingPlaceholder['isDefault'])
             return;
     }
 
-    _placeholderForMarker[[aMarker UID]] = { 'isDefault': isDefault, 'value': aPlaceholder };
+    _placeholderForMarker[aMarker] = { 'isDefault': isDefault, 'value': aPlaceholder };
 }
 
 @end
@@ -378,7 +357,7 @@ var CPBindingOperationAnd = 0,
     [CPBinder exposeBinding:aBinding forClass:[self class]];
 }
 
-+ (Class)_binderClassForBinding:(CPString)aBinding
++ (Class)_binderClassForBinding:(CPString)theBinding
 {
     return [CPBinder class];
 }
@@ -431,7 +410,7 @@ var CPBindingOperationAnd = 0,
     [binderClass unbind:aBinding forObject:self];
 }
 
-- (CPString)_replacementKeyPathForBinding:(CPString)binding
+- (id)_replacementKeyPathForBinding:(CPString)binding
 {
     return binding;
 }
@@ -440,13 +419,13 @@ var CPBindingOperationAnd = 0,
 
 /*!
     @ignore
-    Provides stub implementations that simply calls super for the "objectValue" binding.
-    This class should not be necessary but assures backwards compliance with our old way of doing bindings.
-
-    IMPORTANT!
-    Every class with a value binding should implement a subclass to handle its specific value binding logic.
+    Provides stub implementations that simply call super for the "objectValue" binding
+    This class should not be necessary but assures backwards compliance with our old way of doing bindings
+    Every class with a value binding should implement a subclass to handle it's specific value binding logic
 */
 @implementation _CPValueBinder : CPBinder
+{
+}
 
 - (void)setValueFor:(CPString)theBinding
 {
@@ -460,9 +439,8 @@ var CPBindingOperationAnd = 0,
 
 @end
 
-@implementation _CPMultipleValueBooleanBinding : CPBinder
+@implementation _CPKeyValueOrBinding : CPBinder
 {
-    CPBindingOperationKind _operation;
 }
 
 - (void)setValueFor:(CPString)aBinding
@@ -472,14 +450,7 @@ var CPBindingOperationAnd = 0,
     if (!bindings)
         return;
 
-    var baseBinding = aBinding.replace(/\d$/, "");
-
-    [_source setValue:[self resolveMultipleValuesForBinding:baseBinding bindings:bindings booleanOperation:_operation] forKey:baseBinding];
-}
-
-- (void)reverseSetValueFor:(CPString)theBinding
-{
-    // read-only
+    [_source setValue:resolveMultipleValues(aBinding, bindings, CPBindingOperationOr) forKey:aBinding];
 }
 
 - (void)observeValueForKeyPath:(CPString)aKeyPath ofObject:(id)anObject change:(CPDictionary)changes context:(id)context
@@ -487,146 +458,61 @@ var CPBindingOperationAnd = 0,
     [self setValueFor:context];
 }
 
-- (BOOL)resolveMultipleValuesForBinding:(CPString)aBinding bindings:(CPDictionary)bindings booleanOperation:(CPBindingOperationKind)operation
+@end
+
+@implementation _CPKeyValueAndBinding : CPBinder
 {
-    var bindingName = aBinding,
+}
+
+- (void)setValueFor:(CPString)aBinding
+{
+    var bindings = [bindingsMap objectForKey:[_source UID]];
+
+    if (!bindings)
+        return;
+
+    [_source setValue:resolveMultipleValues(aBinding, bindings, CPBindingOperationAnd) forKey:aBinding];
+}
+
+- (void)observeValueForKeyPath:(CPString)aKeyPath ofObject:(id)anObejct change:(CPDictionary)changes context:(id)context
+{
+    [self setValueFor:context];
+}
+
+@end
+
+var resolveMultipleValues = function(/*CPString*/key, /*CPDictionary*/bindings, /*GSBindingOperationKind*/operation)
+{
+    var bindingName = key,
         theBinding,
-        count = 2;
+        count = 1;
 
     while (theBinding = [bindings objectForKey:bindingName])
     {
-        var info    = theBinding._info,
-            object  = [info objectForKey:CPObservedObjectKey],
-            keyPath = [info objectForKey:CPObservedKeyPathKey],
-            options = [info objectForKey:CPOptionsKey],
-            value   = [object valueForKeyPath:keyPath];
+        var infoDictionary = theBinding._info,
+            object  = [infoDictionary objectForKey:CPObservedObjectKey],
+            keyPath = [infoDictionary objectForKey:CPObservedKeyPathKey],
+            options = [infoDictionary objectForKey:CPOptionsKey];
 
-        if (CPIsControllerMarker(value))
-        {
-            [self raiseIfNotApplicable:value forKeyPath:keyPath options:options];
-            value = [theBinding _placeholderForMarker:value];
-        }
-        else
-            value = [theBinding transformValue:value withOptions:options];
+        var value = [theBinding transformValue:[object valueForKeyPath:keyPath] withOptions:options];
 
-        if (operation === CPBindingOperationOr)
-        {
-            // Any true condition means true for OR
-            if (value)
-                return YES;
-        }
+        if (value == operation)
+            return operation;
 
-        // Any false condition means false for AND
-        else if (!value)
-            return NO;
-
-        bindingName = aBinding + (count++);
+        bindingName = [CPString stringWithFormat:@"%@%i", key, ++count];
     }
 
-    // If we get here, all OR conditions were false or all AND conditions were true
-    return operation === CPBindingOperationOr ? NO : YES;
-}
+    return !operation;
+};
 
-@end
-
-@implementation CPMultipleValueAndBinding : _CPMultipleValueBooleanBinding
-
-- (id)init
+var invokeAction = function(/*CPString*/targetKey, /*CPString*/argumentKey, /*CPDictionary*/bindings)
 {
-    if (self = [super init])
-        _operation = CPBindingOperationAnd;
+    var theBinding = [bindings objectForKey:targetKey],
+        infoDictionary = theBinding._info,
 
-    return self;
-}
-
-@end
-
-@implementation CPMultipleValueOrBinding : _CPMultipleValueBooleanBinding
-
-- (id)init
-{
-    if (self = [super init])
-        _operation = CPBindingOperationOr;
-
-    return self;
-}
-
-@end
-
-@implementation _CPMultipleValueActionBinding : CPBinder
-{
-    CPString _argumentBinding;
-    CPString _targetBinding;
-}
-
-- (void)setValueFor:(CPString)theBinding
-{
-    // Called when the binding is first created
-    [self checkForNullBinding:theBinding initializing:YES];
-}
-
-- (void)reverseSetValueFor:(CPString)theBinding
-{
-    // no-op
-}
-
-- (void)observeValueForKeyPath:(CPString)aKeyPath ofObject:(id)anObject change:(CPDictionary)changes context:(id)context
-{
-    // context is the binding name
-    [self checkForNullBinding:context initializing:NO];
-}
-
-/*!
-    @ignore
-
-    When the value of a multiple-value argument binding changes,
-    if the binding is marked not to allow null arguments, we have to check
-    if the binding's value is nil and disable the button if it is.
-    Otherwise the button is enabled.
-*/
-- (void)checkForNullBinding:(CPString)theBinding initializing:(BOOL)isInitializing
-{
-    // Only done for buttons
-    if (![_source isKindOfClass:CPButton])
-        return;
-
-    // We start with the button enabled for the first argument during init,
-    // and subsequent checks can disable it.
-    if (isInitializing && theBinding === CPArgumentBinding)
-        [_source setEnabled:YES];
-
-    var bindings = [bindingsMap valueForKey:[_source UID]],
-        binding  = [bindings objectForKey:theBinding],
-        info     = binding._info,
-        options  = [info objectForKey:CPOptionsKey];
-
-    if (![options valueForKey:CPAllowsNullArgumentBindingOption])
-    {
-        var object  = [info objectForKey:CPObservedObjectKey],
-            keyPath = [info objectForKey:CPObservedKeyPathKey],
-            value   = [object valueForKeyPath:keyPath];
-
-        if (value === nil || value === undefined)
-        {
-            [_source setEnabled:NO];
-            return;
-        }
-    }
-
-    // If a binding value changed and did not fail the null test, enable the button
-    if (!isInitializing)
-        [_source setEnabled:YES];
-}
-
-- (void)invokeAction
-{
-    var bindings = [bindingsMap valueForKey:[_source UID]],
-        theBinding = [bindings objectForKey:CPTargetBinding],
-
-        info     = theBinding._info,
-        object   = [info objectForKey:CPObservedObjectKey],
-        keyPath  = [info objectForKey:CPObservedKeyPathKey],
-        options  = [info objectForKey:CPOptionsKey],
+        object   = [infoDictionary objectForKey:CPObservedObjectKey],
+        keyPath  = [infoDictionary objectForKey:CPObservedKeyPathKey],
+        options  = [infoDictionary objectForKey:CPOptionsKey],
 
         target   = [object valueForKeyPath:keyPath],
         selector = [options objectForKey:CPSelectorNameBindingOption];
@@ -634,194 +520,27 @@ var CPBindingOperationAnd = 0,
     if (!target || !selector)
         return;
 
-    var invocation = [CPInvocation invocationWithMethodSignature:[target methodSignatureForSelector:selector]],
-        bindingName = CPArgumentBinding,
+    var invocation = [CPInvocation invocationWithMethodSignature:[target methodSignatureForSelector:selector]];
+    [invocation setSelector:selector];
+
+    var bindingName = argumentKey,
         count = 1;
 
     while (theBinding = [bindings objectForKey:bindingName])
     {
-        info   = theBinding._info;
-        object = [info objectForKey:CPObservedObjectKey];
-        keyPath  = [info objectForKey:CPObservedKeyPathKey];
+        infoDictionary = theBinding._info;
 
-        [invocation setArgument:[object valueForKeyPath:keyPath] atIndex:++count];
+        keyPath = [infoDictionary objectForKey:CPObserverKeyPathKey];
+        object  = [[infoDictionary objectForKey:CPObservedObjectKey] valueForKeyPath:keyPath];
 
-        bindingName = CPArgumentBinding + count;
+        if (object)
+            [invocation setArgument:object atIndex:++count];
+
+        bindingName = [CPString stringWithFormat:@"%@%i", argumentKey, count];
     }
 
-    [invocation setSelector:selector];
-    [invocation invokeWithTarget:target];
-}
-
-@end
-
-@implementation CPActionBinding : _CPMultipleValueActionBinding
-
-- (id)init
-{
-    if (self = [super init])
-    {
-        _argumentBinding = CPArgumentBinding;
-        _targetBinding = CPTargetBinding;
-    }
-
-    return self;
-}
-
-@end
-
-@implementation CPDoubleClickActionBinding : _CPMultipleValueActionBinding
-
-- (id)init
-{
-    if (self = [super init])
-    {
-        _argumentBinding = CPArgumentBinding;
-        _targetBinding = CPTargetBinding;
-    }
-
-    return self;
-}
-
-@end
-
-/*!
-    Abstract superclass for CPValueWithPatternBinding and CPTitleWithPatternBinding.
-*/
-@implementation _CPPatternBinding : CPBinder
-{
-    CPString _bindingKey;
-    CPString _patternPlaceholder;
-}
-
-- (void)setValueFor:(CPString)aBinding
-{
-    var bindings = [bindingsMap valueForKey:[_source UID]];
-
-    if (!bindings)
-        return;
-
-    // Strip off any trailing number from the binding name
-    var baseBinding = aBinding.replace(/\d$/, ""),
-        result = [self resolveMultipleValuesForBindings:bindings];
-
-    if (result.isPlaceholder)
-        [self setPlaceholderValue:result.value withMarker:result.marker forBinding:baseBinding];
-    else
-        [self setValue:result.value forBinding:baseBinding];
-}
-
-- (void)reverseSetValueFor:(CPString)theBinding
-{
-    // read-only
-}
-
-- (void)observeValueForKeyPath:(CPString)aKeyPath ofObject:(id)anObject change:(CPDictionary)changes context:(id)context
-{
-    [self setValueFor:context];
-}
-
-- (JSObject)resolveMultipleValuesForBindings:(CPDictionary)bindings
-{
-    var theBinding,
-        result = { value:@"", isPlaceholder:NO, marker:nil };
-
-    for (var count = 1; theBinding = [bindings objectForKey:_bindingKey + count]; ++count)
-    {
-        var info    = theBinding._info,
-            object  = [info objectForKey:CPObservedObjectKey],
-            keyPath = [info objectForKey:CPObservedKeyPathKey],
-            options = [info objectForKey:CPOptionsKey],
-            value   = [object valueForKeyPath:keyPath];
-
-        if (count === 1)
-            result.value = [options objectForKey:CPDisplayPatternBindingOption];
-
-        if (CPIsControllerMarker(value))
-        {
-            [self raiseIfNotApplicable:value forKeyPath:keyPath options:options];
-
-            result.isPlaceholder = YES;
-            result.marker = value;
-
-            value = [theBinding _placeholderForMarker:value];
-        }
-        else
-            value = [theBinding transformValue:value withOptions:options];
-
-        if (value === nil || value === undefined)
-            value = @"";
-
-        result.value = result.value.replace("%{" + _patternPlaceholder + count + "}@", [value description]);
-    }
-
-    return result;
-}
-
-@end
-
-
-/*!
-    Users of this class must override setValue:forKey: and if the
-    key is CPDisplayPatternValueBinding, set the appropriate value
-    for the control class. For example, CPTextField uses setObjectValue.
-*/
-@implementation CPValueWithPatternBinding : _CPPatternBinding
-
-- (id)init
-{
-    if (self = [super init])
-    {
-        _bindingKey = CPDisplayPatternValueBinding;
-        _patternPlaceholder = @"value";
-    }
-
-    return self;
-}
-
-@end
-
-
-/*!
-    Users of this class must override setValue:forKey: and if the
-    key is CPDisplayPatternTitleBinding, set the appropriate value
-    for the control class. For example, CPBox uses setTitle.
-*/
-@implementation CPTitleWithPatternBinding : _CPPatternBinding
-
-- (id)init
-{
-    if (self = [super init])
-    {
-        _bindingKey = CPDisplayPatternTitleBinding;
-        _patternPlaceholder = @"title";
-    }
-
-    return self;
-}
-
-@end
-
-@implementation _CPStateMarker : CPObject
-{
-    CPString _name;
-}
-
-- (id)initWithName:(CPString)aName
-{
-    if (self = [super init])
-        _name = aName
-
-    return self;
-}
-
-- (CPString)description
-{
-    return "<" + _name + ">";
-}
-
-@end
-
+    [invocation invoke];
+};
 
 // Keys in options dictionary
 
@@ -831,23 +550,18 @@ CPObservedKeyPathKey    = @"CPObservedKeyPathKey";
 CPOptionsKey            = @"CPOptionsKey";
 
 // special markers
-CPNoSelectionMarker     = [[_CPStateMarker alloc] initWithName:@"NO SELECTION MARKER"];
-CPMultipleValuesMarker  = [[_CPStateMarker alloc] initWithName:@"MULTIPLE VALUES MARKER"];
-CPNotApplicableMarker   = [[_CPStateMarker alloc] initWithName:@"NOT APPLICABLE MARKER"];
-CPNullMarker            = [[_CPStateMarker alloc] initWithName:@"NULL MARKER"];
+CPMultipleValuesMarker  = @"CPMultipleValuesMarker";
+CPNoSelectionMarker     = @"CPNoSelectionMarker";
+CPNotApplicableMarker   = @"CPNotApplicableMarker";
+CPNullMarker            = @"CPNullMarker";
 
 // Binding name constants
 CPAlignmentBinding                        = @"alignment";
-CPArgumentBinding                         = @"argument";
 CPContentArrayBinding                     = @"contentArray";
 CPContentBinding                          = @"content";
 CPContentObjectBinding                    = @"contentObject";
 CPContentObjectsBinding                   = @"contentObjects";
 CPContentValuesBinding                    = @"contentValues";
-CPDisplayPatternTitleBinding              = @"displayPatternTitle";
-CPDisplayPatternValueBinding              = @"displayPatternValue";
-CPDoubleClickArgumentBinding              = @"doubleClickArgument";
-CPDoubleClickTargetBinding                = @"doubleClickTarget";
 CPEditableBinding                         = @"editable";
 CPEnabledBinding                          = @"enabled";
 CPFontBinding                             = @"font";
@@ -866,7 +580,6 @@ CPSelectedTagBinding                      = @"selectedTag";
 CPSelectedValueBinding                    = @"selectedValue";
 CPSelectedValuesBinding                   = @"selectedValues";
 CPSelectionIndexesBinding                 = @"selectionIndexes";
-CPTargetBinding                           = @"target";
 CPTextColorBinding                        = @"textColor";
 CPTitleBinding                            = @"title";
 CPToolTipBinding                          = @"toolTip";
@@ -875,7 +588,7 @@ CPValueURLBinding                         = @"valueURL";
 CPValuePathBinding                        = @"valuePath";
 CPDataBinding                             = @"data";
 
-// Binding options constants
+//Binding options constants
 CPAllowsEditingMultipleValuesSelectionBindingOption = @"CPAllowsEditingMultipleValuesSelection";
 CPAllowsNullArgumentBindingOption                   = @"CPAllowsNullArgument";
 CPConditionallySetsEditableBindingOption            = @"CPConditionallySetsEditable";

AppKit/CPLevelIndicator.j

@@ -21,9 +21,6 @@
  */
 
 @import "CPControl.j"
-@import "CPWindow_Constants.j"
-
-@global CPApp
 
 CPTickMarkBelow                             = 0;
 CPTickMarkAbove                             = 1;
@@ -35,6 +32,14 @@ CPContinuousCapacityLevelIndicatorStyle     = 1;
 CPDiscreteCapacityLevelIndicatorStyle       = 2;
 CPRatingLevelIndicatorStyle                 = 3;
 
+var _CPLevelIndicatorBezelColor = nil,
+    _CPLevelIndicatorSegmentEmptyColor = nil,
+    _CPLevelIndicatorSegmentNormalColor = nil,
+    _CPLevelIndicatorSegmentWarningColor = nil,
+    _CPLevelIndicatorSegmentCriticalColor = nil,
+
+    _CPLevelIndicatorSpacing = 1;
+
 /*!
     @ingroup appkit
     @class CPLevelIndicator
@@ -57,21 +62,57 @@ CPRatingLevelIndicatorStyle                 = 3;
     BOOL                _isTracking;
 }
 
-+ (CPString)defaultThemeClass
++ (void)initialize
 {
-    return "level-indicator";
-}
+    if (self !== [CPLevelIndicator class])
+        return;
 
-+ (id)themeAttributes
-{
-    return @{
-            @"bezel-color": [CPNull null],
-            @"color-empty": [CPNull null],
-            @"color-normal": [CPNull null],
-            @"color-warning": [CPNull null],
-            @"color-critical": [CPNull null],
-            @"spacing": 1.0,
-        };
+    var bundle = [CPBundle bundleForClass:CPLevelIndicator];
+
+    _CPLevelIndicatorBezelColor = [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices:
+        [
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPLevelIndicator/level-indicator-bezel-left.png"] size:CGSizeMake(3.0, 18.0)],
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPLevelIndicator/level-indicator-bezel-center.png"] size:CGSizeMake(1.0, 18.0)],
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPLevelIndicator/level-indicator-bezel-right.png"] size:CGSizeMake(3.0, 18.0)]
+        ]
+        isVertical:NO
+    ]];
+
+    _CPLevelIndicatorSegmentEmptyColor = [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices:
+        [
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPLevelIndicator/level-indicator-segment-empty-left.png"] size:CGSizeMake(3.0, 17.0)],
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPLevelIndicator/level-indicator-segment-empty-center.png"] size:CGSizeMake(1.0, 17.0)],
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPLevelIndicator/level-indicator-segment-empty-right.png"] size:CGSizeMake(3.0, 17.0)]
+        ]
+        isVertical:NO
+    ]];
+
+    _CPLevelIndicatorSegmentNormalColor = [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices:
+        [
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPLevelIndicator/level-indicator-segment-normal-left.png"] size:CGSizeMake(3.0, 17.0)],
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPLevelIndicator/level-indicator-segment-normal-center.png"] size:CGSizeMake(1.0, 17.0)],
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPLevelIndicator/level-indicator-segment-normal-right.png"] size:CGSizeMake(3.0, 17.0)]
+        ]
+        isVertical:NO
+    ]];
+
+    _CPLevelIndicatorSegmentWarningColor = [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices:
+        [
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPLevelIndicator/level-indicator-segment-warning-left.png"] size:CGSizeMake(3.0, 17.0)],
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPLevelIndicator/level-indicator-segment-warning-center.png"] size:CGSizeMake(1.0, 17.0)],
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPLevelIndicator/level-indicator-segment-warning-right.png"] size:CGSizeMake(3.0, 17.0)]
+        ]
+        isVertical:NO
+    ]];
+
+    _CPLevelIndicatorSegmentCriticalColor = [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices:
+        [
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPLevelIndicator/level-indicator-segment-critical-left.png"] size:CGSizeMake(3.0, 17.0)],
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPLevelIndicator/level-indicator-segment-critical-center.png"] size:CGSizeMake(1.0, 17.0)],
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPLevelIndicator/level-indicator-segment-critical-right.png"] size:CGSizeMake(3.0, 17.0)]
+        ]
+        isVertical:NO
+    ]];
 }
 
 - (id)initWithFrame:(CGRect)aFrame
@@ -84,31 +125,37 @@ CPRatingLevelIndicatorStyle                 = 3;
         _maxValue = 2;
         _warningValue = 2;
         _criticalValue = 2;
+
+        [self _init];
     }
 
     return self;
 }
 
+- (void)_init
+{
+}
+
 - (void)layoutSubviews
 {
     var bezelView = [self layoutEphemeralSubviewNamed:"bezel"
                                            positioned:CPWindowBelow
                       relativeToEphemeralSubviewNamed:nil];
     // TODO Make themable.
-    [bezelView setBackgroundColor:[self valueForThemeAttribute:@"bezel-color"]];
+    [bezelView setBackgroundColor:_CPLevelIndicatorBezelColor];
 
     var segmentCount = _maxValue - _minValue;
 
     if (segmentCount <= 0)
         return;
 
-    var filledColor = [self valueForThemeAttribute:@"color-normal"],
+    var filledColor = _CPLevelIndicatorSegmentNormalColor,
         value = [self doubleValue];
 
     if (value <= _criticalValue)
-        filledColor = [self valueForThemeAttribute:@"color-critical"];
+        filledColor = _CPLevelIndicatorSegmentCriticalColor;
     else if (value <= _warningValue)
-        filledColor = [self valueForThemeAttribute:@"color-warning"];
+        filledColor = _CPLevelIndicatorSegmentWarningColor;
 
     for (var i = 0; i < segmentCount; i++)
     {
@@ -116,7 +163,7 @@ CPRatingLevelIndicatorStyle                 = 3;
                                                positioned:CPWindowAbove
                           relativeToEphemeralSubviewNamed:bezelView];
 
-        [segmentView setBackgroundColor:(_minValue + i) < value ? filledColor : [self valueForThemeAttribute:@"color-empty"]];
+        [segmentView setBackgroundColor:(_minValue + i) < value ? filledColor : _CPLevelIndicatorSegmentEmptyColor];
     }
 }
 
@@ -147,12 +194,11 @@ CPRatingLevelIndicatorStyle                 = 3;
             return _CGRectMakeZero();
 
         var basicSegmentWidth = bounds.size.width / segmentCount,
-            segmentFrame = CGRectCreateCopy([self bounds]),
-            spacing = [self valueForThemeAttribute:@"spacing"];
+            segmentFrame = CGRectCreateCopy([self bounds]);
 
         segmentFrame.origin.y = (_CGRectGetHeight(bounds) - bezelHeight) / 2.0;
         segmentFrame.origin.x =  FLOOR(segment * basicSegmentWidth);
-        segmentFrame.size.width = (segment == segmentCount - 1) ? bounds.size.width - segmentFrame.origin.x : FLOOR(((segment + 1) * basicSegmentWidth)) - FLOOR((segment * basicSegmentWidth)) - spacing;
+        segmentFrame.size.width = (segment == segmentCount - 1) ? bounds.size.width - segmentFrame.origin.x : FLOOR(((segment + 1) * basicSegmentWidth)) - FLOOR((segment * basicSegmentWidth)) - _CPLevelIndicatorSpacing;
         segmentFrame.size.height = segmentHeight;
 
         return segmentFrame;
@@ -180,7 +226,7 @@ CPRatingLevelIndicatorStyle                 = 3;
     return _isEditable;
 }
 
-- (CPView)hitTest:(CGPoint)aPoint
+- (CPView)hitTest:(CPPoint)aPoint
 {
     // Don't swallow clicks when displayed in a table.
     if (![self isEditable])
@@ -342,6 +388,8 @@ var CPLevelIndicatorStyleKey                    = "CPLevelIndicatorStyleKey",
 
         _isEditable = [aCoder decodeBoolForKey:CPLevelIndicatorIsEditableKey];
 
+        [self _init];
+
         [self setNeedsLayout];
         [self setNeedsDisplay:YES];
     }

AppKit/CPMenu/CPMenu.j

@@ -25,10 +25,12 @@
 @import <Foundation/CPNotificationCenter.j>
 @import <Foundation/CPString.j>
 
-@import "CPKeyValueBinding.j"
+@import "_CPMenuManager.j"
+@import "CPApplication.j"
+@import "CPClipView.j"
 @import "CPMenuItem.j"
+@import "CPPanel.j"
 
-@global CPApp
 
 CPMenuDidAddItemNotification        = @"CPMenuDidAddItemNotification";
 CPMenuDidChangeItemNotification     = @"CPMenuDidChangeItemNotification";
@@ -36,8 +38,12 @@ CPMenuDidRemoveItemNotification     = @"CPMenuDidRemoveItemNotification";
 
 CPMenuDidEndTrackingNotification    = @"CPMenuDidEndTrackingNotification";
 
+var MENUBAR_HEIGHT = 28.0;
+
 var _CPMenuBarVisible               = NO,
     _CPMenuBarTitle                 = @"",
+    _CPMenuBarIconImage             = nil,
+    _CPMenuBarIconImageAlphaValue   = 1.0,
     _CPMenuBarAttributes            = nil,
     _CPMenuBarSharedWindow          = nil;
 
@@ -77,7 +83,7 @@ var _CPMenuBarVisible               = NO,
     if (self !== [CPMenu class])
         return;
 
-    [[self class] setMenuBarAttributes:@{}];
+    [[self class] setMenuBarAttributes:[CPDictionary dictionary]];
 }
 
 + (BOOL)menuBarVisible
@@ -103,8 +109,8 @@ var _CPMenuBarVisible               = NO,
         [_CPMenuBarSharedWindow setMenu:[CPApp mainMenu]];
 
         [_CPMenuBarSharedWindow setTitle:_CPMenuBarTitle];
-        [_CPMenuBarSharedWindow setIconImage:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-icon-image" forClass:_CPMenuView]];
-        [_CPMenuBarSharedWindow setIconImageAlphaValue:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-icon-image-alpha-value" forClass:_CPMenuView]];
+        [_CPMenuBarSharedWindow setIconImage:_CPMenuBarIconImage];
+        [_CPMenuBarSharedWindow setIconImageAlphaValue:_CPMenuBarIconImageAlphaValue];
 
         [_CPMenuBarSharedWindow setColor:[_CPMenuBarAttributes objectForKey:@"CPMenuBarBackgroundColor"]];
         [_CPMenuBarSharedWindow setTextColor:[_CPMenuBarAttributes objectForKey:@"CPMenuBarTextColor"]];
@@ -148,13 +154,6 @@ var _CPMenuBarVisible               = NO,
     return _CPMenuBarImage;
 }
 
-+ (void)_setOrRemoveMenuBarAttribute:(id)aValue forKey:(id)aKey
-{
-    if (aValue === nil)
-        [_CPMenuBarAttributes removeObjectForKey:aKey];
-    else
-        [_CPMenuBarAttributes setObject:aValue forKey:aKey];
-}
 
 + (void)setMenuBarAttributes:(CPDictionary)attributes
 {
@@ -179,8 +178,8 @@ var _CPMenuBarVisible               = NO,
 
     else if (!textColor && !titleColor)
     {
-        [self _setOrRemoveMenuBarAttribute:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-text-color" forClass:_CPMenuView] forKey:@"CPMenuBarTextColor"];
-        [self _setOrRemoveMenuBarAttribute:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-title-color" forClass:_CPMenuView] forKey:@"CPMenuBarTitleColor"];
+        [_CPMenuBarAttributes setObject:[CPColor colorWithRed:0.051 green:0.2 blue:0.275 alpha:1.0] forKey:@"CPMenuBarTextColor"];
+        [_CPMenuBarAttributes setObject:[CPColor colorWithRed:0.051 green:0.2 blue:0.275 alpha:1.0] forKey:@"CPMenuBarTitleColor"];
     }
 
     if (!textShadowColor && titleShadowColor)
@@ -191,18 +190,18 @@ var _CPMenuBarVisible               = NO,
 
     else if (!textShadowColor && !titleShadowColor)
     {
-        [self _setOrRemoveMenuBarAttribute:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-text-shadow-color" forClass:_CPMenuView] forKey:@"CPMenuBarTextShadowColor"];
-        [self _setOrRemoveMenuBarAttribute:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-title-shadow-color" forClass:_CPMenuView] forKey:@"CPMenuBarTitleShadowColor"];
+        [_CPMenuBarAttributes setObject:[CPColor whiteColor] forKey:@"CPMenuBarTextShadowColor"];
+        [_CPMenuBarAttributes setObject:[CPColor whiteColor] forKey:@"CPMenuBarTitleShadowColor"];
     }
 
     if (!highlightColor)
-        [self _setOrRemoveMenuBarAttribute:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-highlight-color" forClass:_CPMenuView] forKey:@"CPMenuBarHighlightColor"];
+        [_CPMenuBarAttributes setObject:[CPColor colorWithCalibratedRed:94.0 / 255.0 green:130.0 / 255.0 blue:186.0 / 255.0 alpha:1.0] forKey:@"CPMenuBarHighlightColor"];
 
     if (!highlightTextColor)
-        [self _setOrRemoveMenuBarAttribute:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-highlight-text-color" forClass:_CPMenuView] forKey:@"CPMenuBarHighlightTextColor"];
+        [_CPMenuBarAttributes setObject:[CPColor whiteColor] forKey:@"CPMenuBarHighlightTextColor"];
 
     if (!highlightTextShadowColor)
-        [self _setOrRemoveMenuBarAttribute:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-highlight-text-shadow-color" forClass:_CPMenuView] forKey:@"CPMenuBarHighlightTextShadowColor"];
+        [_CPMenuBarAttributes setObject:[CPColor blackColor] forKey:@"CPMenuBarHighlightTextShadowColor"];
 
     if (_CPMenuBarSharedWindow)
     {
@@ -231,14 +230,14 @@ var _CPMenuBarVisible               = NO,
 - (float)menuBarHeight
 {
     if (self === [CPApp mainMenu])
-        return [CPMenu menuBarHeight];
+        return MENUBAR_HEIGHT;
 
     return 0.0;
 }
 
 + (float)menuBarHeight
 {
-    return [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-height" forClass:_CPMenuView];
+    return MENUBAR_HEIGHT;
 }
 
 // Creating a CPMenu Object
@@ -367,12 +366,7 @@ var _CPMenuBarVisible               = NO,
 */
 - (void)itemChanged:(CPMenuItem)aMenuItem
 {
-    /*
-        During cib unarchiving, menu items will have a reference to their menu,
-        but of course the items are still being unarchived and the menu's _items
-        have not yet been instantiated. In that case we will not do anything here.
-    */
-    if ([aMenuItem menu] !== self || !_items)
+    if ([aMenuItem menu] !== self)
         return;
 
     [aMenuItem setValue:[aMenuItem valueForKey:@"changeCount"] + 1 forKey:@"changeCount"];
@@ -380,7 +374,7 @@ var _CPMenuBarVisible               = NO,
     [[CPNotificationCenter defaultCenter]
         postNotificationName:CPMenuDidChangeItemNotification
                       object:self
-                    userInfo:@{ @"CPMenuItemIndex": [_items indexOfObjectIdenticalTo:aMenuItem] }];
+                    userInfo:[CPDictionary dictionaryWithObject:[_items indexOfObjectIdenticalTo:aMenuItem] forKey:@"CPMenuItemIndex"]];
 }
 
 // Finding Menu Items
@@ -613,9 +607,8 @@ var _CPMenuBarVisible               = NO,
 
 /*!
     Enables or disables the receiver’s menu items.
-    If the item has no target, an action binding is checked. If the target does not implement
-    the menu item's action method or the binding's selector, the item is disabled.
-    If the target responds to selector validateMenuItem: or validateUserInterfaceItem: (in that order) the return value is used.
+    If the target does not implement the menu item's action method the item is disabled.
+    If the target responsds to selector validateMenuItem: or validateUserInterfaceItem: (in that order) the return value is used.
 */
 - (void)update
 {
@@ -623,7 +616,6 @@ var _CPMenuBarVisible               = NO,
         return;
 
     var items = [self itemArray];
-
     for (var i = 0; i < [items count]; i++)
     {
         var item = [items objectAtIndex:i];
@@ -633,31 +625,7 @@ var _CPMenuBarVisible               = NO,
 
         var validator = [CPApp targetForAction:[item action] to:[item target] from:item];
 
-        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];
-            else
-            {
-                // Check to see if there is a target binding with an invalid selector
-                var info = [CPBinder infoForBinding:CPTargetBinding forObject:item];
-
-                if (info)
-                {
-                    var object = [info objectForKey:CPObservedObjectKey],
-                        keyPath = [info objectForKey:CPObservedKeyPathKey],
-                        options = [info objectForKey:CPOptionsKey],
-                        target = [object valueForKeyPath:keyPath],
-                        selector = [options valueForKey:CPSelectorNameBindingOption];
-
-                    if (target && selector && ![target respondsToSelector:CPSelectorFromString(selector)])
-                        [item setEnabled:NO];
-                }
-            }
-        }
-        else if (![validator respondsToSelector:[item action]])
+        if (!validator || ![validator respondsToSelector:[item action]])
             [item setEnabled:NO];
         else if ([validator respondsToSelector:@selector(validateMenuItem:)])
             [item setEnabled:[validator validateMenuItem:item]];
@@ -707,13 +675,7 @@ var _CPMenuBarVisible               = NO,
     // highlightedItem is always enabled. Do there exist edge cases: disabling on closing a menu,
     // etc.? Requires further investigation and tests.
     if (highlightedItem && [highlightedItem isEnabled])
-    {
-        // Perform any action binding
-        var binding = [CPBinder getBinding:CPTargetBinding forObject:highlightedItem];
-        [binding invokeAction];
-
         [CPApp sendAction:[highlightedItem action] to:[highlightedItem target] from:highlightedItem];
-    }
 }
 
 //
@@ -1148,7 +1110,7 @@ var _CPMenuBarVisible               = NO,
     [[CPNotificationCenter defaultCenter]
         postNotificationName:CPMenuDidAddItemNotification
                       object:self
-                    userInfo:@{ @"CPMenuItemIndex": anIndex }];
+                    userInfo:[CPDictionary dictionaryWithObject:anIndex forKey:@"CPMenuItemIndex"]];
 }
 
 - (void)removeObjectFromItemsAtIndex:(CPUInteger)anIndex
@@ -1162,7 +1124,7 @@ var _CPMenuBarVisible               = NO,
     [[CPNotificationCenter defaultCenter]
         postNotificationName:CPMenuDidRemoveItemNotification
                       object:self
-                    userInfo:@{ @"CPMenuItemIndex": anIndex }];
+                    userInfo:[CPDictionary dictionaryWithObject:anIndex forKey:@"CPMenuItemIndex"]];
 }
 
 @end

AppKit/CPMenu/_CPMenuBarWindow.j

@@ -1,33 +1,14 @@
-/*
- * _CPMenuBarWindow.j
- * AppKit
- *
- * Created by Francisco Tolmasky.
- * Copyright 2009, 280 North, Inc.
- *
- * 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 "CPPanel.j"
-@import "_CPMenuManager.j"
+@import "_CPMenuWindow.j"
 
-@class _CPMenuView
 
-@global CPMenuDidAddItemNotification
-@global CPMenuDidChangeItemNotification
-@global CPMenuDidRemoveItemNotification
+var MENUBAR_HEIGHT          = 28.0,
+    MENUBAR_MARGIN          = 10.0,
+    MENUBAR_LEFT_MARGIN     = 10.0,
+    MENUBAR_RIGHT_MARGIN    = 10.0;
+
+var _CPMenuBarWindowBackgroundColor = nil,
+    _CPMenuBarWindowFont            = nil;
 
 @implementation _CPMenuBarWindow : CPPanel
 {
@@ -51,9 +32,19 @@
     CPColor     _highlightTextShadowColor;
 }
 
++ (void)initialize
+{
+    if (self !== [_CPMenuBarWindow class])
+        return;
+
+    var bundle = [CPBundle bundleForClass:self];
+
+    _CPMenuBarWindowFont = [CPFont boldSystemFontOfSize:[CPFont systemFontSize]];
+}
+
 + (CPFont)font
 {
-    return [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-window-font" forClass:_CPMenuView];
+    return _CPMenuBarWindowFont;
 }
 
 - (id)init
@@ -61,7 +52,7 @@
     // This only shows up in browser land, so don't bother calculating metrics in desktop.
     var contentRect = [[CPPlatformWindow primaryPlatformWindow] contentBounds];
 
-    contentRect.size.height = [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-window-height" forClass:_CPMenuView];
+    contentRect.size.height = MENUBAR_HEIGHT;
 
     self = [super initWithContentRect:contentRect styleMask:CPBorderlessWindowMask];
 
@@ -128,7 +119,12 @@
 - (void)setColor:(CPColor)aColor
 {
     if (!aColor)
-        [[self contentView] setBackgroundColor:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-window-background-color" forClass:_CPMenuView]];
+    {
+        if (!_CPMenuBarWindowBackgroundColor)
+            _CPMenuBarWindowBackgroundColor = [CPColor colorWithPatternImage:[[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:[_CPMenuBarWindow class]] pathForResource:@"_CPMenuBarWindow/_CPMenuBarWindowBackground.png"] size:CGSizeMake(1.0, 28.0)]];
+
+        [[self contentView] setBackgroundColor:_CPMenuBarWindowBackgroundColor];
+    }
     else
         [[self contentView] setBackgroundColor:aColor];
 }
@@ -320,11 +316,6 @@
     [self tile];
 }
 
-- (BOOL)acceptsFirstMouse:(CPEvent)anEvent
-{
-    return YES;
-}
-
 - (void)mouseDown:(CPEvent)anEvent
 {
     var constraintRect = CGRectInset([[self platformWindow] visibleFrame], 5.0, 0.0);
@@ -353,7 +344,7 @@
         index = 0,
         count = items.length,
 
-        x = [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-window-left-margin" forClass:_CPMenuView],
+        x = MENUBAR_LEFT_MARGIN,
         y = 0.0,
         isLeftAligned = YES;
 
@@ -363,7 +354,7 @@
 
         if ([item isSeparatorItem])
         {
-            x = CGRectGetWidth([self frame]) - [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-window-right-margin" forClass:_CPMenuView];
+            x = CGRectGetWidth([self frame]) - MENUBAR_RIGHT_MARGIN;
             isLeftAligned = NO;
 
             continue;
@@ -377,13 +368,13 @@
 
         if (isLeftAligned)
         {
-            [menuItemView setFrame:CGRectMake(x, 0.0, CGRectGetWidth(frame), [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-window-height" forClass:_CPMenuView])];
+            [menuItemView setFrame:CGRectMake(x, 0.0, CGRectGetWidth(frame), MENUBAR_HEIGHT)];
 
             x += CGRectGetWidth([menuItemView frame]);
         }
         else
         {
-            [menuItemView setFrame:CGRectMake(x - CGRectGetWidth(frame), 0.0, CGRectGetWidth(frame), [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-window-height" forClass:_CPMenuView])];
+            [menuItemView setFrame:CGRectMake(x - CGRectGetWidth(frame), 0.0, CGRectGetWidth(frame), MENUBAR_HEIGHT)];
 
             x = CGRectGetMinX([menuItemView frame]);
         }
@@ -461,3 +452,102 @@
 }
 
 @end
+
+@implementation _CPMenuBarView : _CPMenuView
+{
+}
+
+- (CGRect)rectForItemAtIndex:(int)anIndex
+{
+    return [_menuItemViews[anIndex === CPNotFound ? 0 : anIndex] frame];
+}
+
+- (int)itemIndexAtPoint:(CGPoint)aPoint
+{
+    var bounds = [self bounds];
+
+    if (!CGRectContainsPoint(bounds, aPoint))
+        return CPNotFound;
+
+    var x = aPoint.x,
+        low = 0,
+        high = _visibleMenuItemInfos.length - 1;
+
+    while (low <= high)
+    {
+        var middle = FLOOR(low + (high - low) / 2),
+            info = _visibleMenuItemInfos[middle],
+            frame = [info.view frame];
+
+        if (x < CGRectGetMinX(frame))
+            high = middle - 1;
+
+        else if (x > CGRectGetMaxX(frame))
+            low = middle + 1;
+
+        else
+            return info.index;
+   }
+
+   return CPNotFound;
+}
+
+- (void)tile
+{
+    var items = [_menu itemArray],
+        index = 0,
+        count = items.length,
+
+        x = MENUBAR_LEFT_MARGIN,
+        y = 0.0,
+        isLeftAligned = YES;
+
+    for (; index < count; ++index)
+    {
+        var item = items[index];
+
+        if ([item isSeparatorItem])
+        {
+            x = CGRectGetWidth([self frame]) - MENUBAR_RIGHT_MARGIN;
+            isLeftAligned = NO;
+
+            continue;
+        }
+
+         if ([item isHidden])
+            continue;
+
+        var menuItemView = [item _menuItemView],
+            frame = [menuItemView frame];
+
+        if (isLeftAligned)
+        {
+            [menuItemView setFrameOrigin:CGPointMake(x, (MENUBAR_HEIGHT - 1.0 - CGRectGetHeight(frame)) / 2.0)];
+
+            x += CGRectGetWidth([menuItemView frame]) + MENUBAR_MARGIN;
+        }
+        else
+        {
+            [menuItemView setFrameOrigin:CGPointMake(x - CGRectGetWidth(frame), (MENUBAR_HEIGHT - 1.0 - CGRectGetHeight(frame)) / 2.0)];
+
+            x = CGRectGetMinX([menuItemView frame]) - MENUBAR_MARGIN;
+        }
+    }
+
+    var bounds = [[self contentView] bounds],
+        titleFrame = [_titleField frame];
+
+    if ([_iconImageView isHidden])
+        [_titleField setFrameOrigin:CGPointMake((CGRectGetWidth(bounds) - CGRectGetWidth(titleFrame)) / 2.0, (CGRectGetHeight(bounds) - CGRectGetHeight(titleFrame)) / 2.0)];
+    else
+    {
+        var iconFrame = [_iconImageView frame],
+            iconWidth = CGRectGetWidth(iconFrame),
+            totalWidth = iconWidth + CGRectGetWidth(titleFrame);
+
+        [_iconImageView setFrameOrigin:CGPointMake((CGRectGetWidth(bounds) - totalWidth) / 2.0, (CGRectGetHeight(bounds) - CGRectGetHeight(iconFrame)) / 2.0)];
+        [_titleField setFrameOrigin:CGPointMake((CGRectGetWidth(bounds) - totalWidth) / 2.0 + iconWidth, (CGRectGetHeight(bounds) - CGRectGetHeight(titleFrame)) / 2.0)];
+    }
+}
+
+@end

AppKit/CPMenu/_CPMenuManager.j

@@ -1,45 +1,11 @@
-/*
- * _CPMenuManager.j
- * AppKit
- *
- * Created by Francisco Tolmasky.
- * Copyright 2009, 280 North, Inc.
- *
- * 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 <Foundation/CPObject.j>
-@import <Foundation/CPNotificationCenter.j>
 
-@import "CPEvent.j"
-@import "CPKeyBinding.j"
-
-@class CPWindow
-@class _CPMenuWindow
-
-
-@global CPApp
-@global CPMenuDidEndTrackingNotification
-@global _CPMenuWindowMenuBarBackgroundStyle
-@global _CPMenuWindowPopUpBackgroundStyle
 
 _CPMenuManagerScrollingStateUp      = -1;
 _CPMenuManagerScrollingStateDown    = 1;
 _CPMenuManagerScrollingStateNone    = 0;
 
-var STICKY_TIME_INTERVAL            = 0.4,
+var STICKY_TIME_INTERVAL            = 0.5,
     SharedMenuManager               = nil;
 
 @implementation _CPMenuManager: CPObject
@@ -60,8 +26,6 @@ var STICKY_TIME_INTERVAL            = 0.4,
 
     CPMenuItem          _previousActiveItem;
     int                 _showTimerID;
-
-    int                 _menuBarButtonItemIndex;
 }
 
 + (_CPMenuManager)sharedMenuManager
@@ -121,7 +85,7 @@ var STICKY_TIME_INTERVAL            = 0.4,
             activeItem = activeItemIndex !== CPNotFound ? [menu itemAtIndex:activeItemIndex] : nil;
 
         _menuBarButtonItemIndex = activeItemIndex;
-//        _menuBarButtonMenuContainer = aMenuContainer;
+        _menuBarButtonMenuContainer = aMenuContainer;
 
         if ([activeItem _isMenuBarButton])
             return [self trackMenuBarButtonEvent:anEvent];
@@ -132,11 +96,6 @@ var STICKY_TIME_INTERVAL            = 0.4,
     [self trackEvent:anEvent];
 }
 
-- (void)_trackAgain
-{
-    [CPApp setTarget:self selector:@selector(trackEvent:) forNextEventMatchingMask:CPKeyDownMask | CPPeriodicMask | CPMouseMovedMask | CPLeftMouseDraggedMask | CPLeftMouseDownMask | CPLeftMouseUpMask | CPRightMouseUpMask | CPAppKitDefinedMask | CPScrollWheelMask untilDate:nil inMode:nil dequeue:YES];
-}
-
 - (void)trackEvent:(CPEvent)anEvent
 {
     var type = [anEvent type],
@@ -146,6 +105,8 @@ var STICKY_TIME_INTERVAL            = 0.4,
     if (type === CPAppKitDefined)
         return [self completeTracking];
 
+    [CPApp setTarget:self selector:@selector(trackEvent:) forNextEventMatchingMask:CPKeyDownMask | CPPeriodicMask | CPMouseMovedMask | CPLeftMouseDraggedMask | CPLeftMouseUpMask | CPRightMouseUpMask | CPAppKitDefinedMask | CPScrollWheelMask untilDate:nil inMode:nil dequeue:YES];
+
     if (type === CPKeyDown)
     {
         var menu = trackingMenu,
@@ -161,50 +122,9 @@ var STICKY_TIME_INTERVAL            = 0.4,
         if ([menu numberOfItems])
             [self interpretKeyEvent:anEvent forMenu:menu];
 
-        [self _trackAgain];
         return;
     }
 
-    // Periodic events don't have a valid location.
-    var globalLocation = type === CPPeriodic ? _lastGlobalLocation : [anEvent globalLocation];
-
-    if (!globalLocation)
-    {
-        [self _trackAgain];
-        return;
-    }
-
-    // Find which menu window the mouse is currently on top of
-    var activeMenuContainer = [self menuContainerForPoint:globalLocation],
-        activeMenu = [activeMenuContainer menu],
-        menuLocation = [activeMenuContainer convertGlobalToBase:globalLocation],
-
-        // Find out the item the mouse is currently on top of
-        activeItemIndex = activeMenuContainer ? [activeMenuContainer itemIndexAtPoint:menuLocation] : CPNotFound,
-        activeItem = activeItemIndex !== CPNotFound ? [activeMenu itemAtIndex:activeItemIndex] : nil;
-
-    // Click outside the menu structure?
-    if (type === CPLeftMouseDown && (!activeMenuContainer || !CGRectContainsPoint([activeMenuContainer globalFrame], globalLocation)))
-    {
-        [self completeTracking];
-
-        /*
-        You can close and interact with a control in a single click. E.g. you can have a menu open,
-        click on a button outside of it and have the menu immediately close and the button activate,
-        without having to click once to close the menu and once to activate the button.
-
-        Since we normally dequeue the event after tracking it, we'll have to put it back on the stack
-        in this special case. Note that it's important the event is executed /right now/, since certain
-        controls such as HTML upload buttons need a native click event at the top of the stack trace
-        to activate - it's not something we can fake later.
-        */
-        [CPApp sendEvent:anEvent];
-
-        return;
-    }
-
-    [self _trackAgain];
-
     if (_keyBuffer)
     {
         if (([anEvent timestamp] - _startTime) > (STICKY_TIME_INTERVAL + [activeMenu numberOfItems] / 2))
@@ -214,6 +134,21 @@ var STICKY_TIME_INTERVAL            = 0.4,
             return;
     }
 
+    // Periodic events don't have a valid location.
+    var globalLocation = type === CPPeriodic ? _lastGlobalLocation : [anEvent globalLocation];
+
+    if (!globalLocation)
+        return;
+
+    // Find which menu window the mouse is currently on top of
+    var activeMenuContainer = [self menuContainerForPoint:globalLocation],
+        activeMenu = [activeMenuContainer menu],
+        menuLocation = [activeMenuContainer convertGlobalToBase:globalLocation],
+
+        // Find out the item the mouse is currently on top of
+        activeItemIndex = activeMenuContainer ? [activeMenuContainer itemIndexAtPoint:menuLocation] : CPNotFound,
+        activeItem = activeItemIndex !== CPNotFound ? [activeMenu itemAtIndex:activeItemIndex] : nil;
+
     // unhighlight when mouse is moved off the menu
     if (_lastGlobalLocation && CGRectContainsPoint([activeMenuContainer globalFrame], _lastGlobalLocation)
                             && !CGRectContainsPoint([activeMenuContainer globalFrame], globalLocation))
@@ -281,7 +216,7 @@ var STICKY_TIME_INTERVAL            = 0.4,
             _lastMouseOverMenuView = nil;
         }
 
-        if (activeItemIndex !== CPNotFound)
+        if (activeItemIndex != CPNotFound)
             [activeMenu _highlightItemAtIndex:activeItemIndex];
 
         if (type === CPMouseMoved || type === CPLeftMouseDragged || type === CPLeftMouseDown || type === CPPeriodic)
@@ -621,7 +556,7 @@ var STICKY_TIME_INTERVAL            = 0.4,
         return;
     }
 
-    var next = current + (last - first);
+    next = current + (last - first);
 
     if (next < [menu numberOfItems])
         [menu _highlightItemAtIndex:next];
@@ -649,7 +584,7 @@ var STICKY_TIME_INTERVAL            = 0.4,
         return;
     }
 
-    var next = current - (last - first);
+    next = current - (last - first);
 
     if (next < 0)
         [menu _highlightItemAtIndex:0];
@@ -730,8 +665,6 @@ var STICKY_TIME_INTERVAL            = 0.4,
         if ([item isSeparatorItem] || [item isHidden] || ![item isEnabled])
             [self moveDown:menu];
     }
-    else if (menu == [CPApp mainMenu])
-         [menu _highlightItemAtIndex:0];
 }
 
 - (void)moveUp:(CPMenu)menu
@@ -740,12 +673,10 @@ var STICKY_TIME_INTERVAL            = 0.4,
 
     if (index < 0)
     {
-        if (index != CPNotFound || menu == [CPApp mainMenu])
+        if (index != CPNotFound)
             [menu _highlightItemAtIndex:[menu numberOfItems] - 1];
-
         return;
     }
-
     [menu _highlightItemAtIndex:index];
 
     var item = [menu highlightedItem];

AppKit/CPMenu/_CPMenuWindow.j

@@ -1,29 +1,5 @@
-/*
- * _CPMenuWindow.j
- * AppKit
- *
- * Created by Francisco Tolmasky.
- * Copyright 2009, 280 North, Inc.
- *
- * 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 "CPClipView.j"
-@import "CPImageView.j"
 @import "CPWindow.j"
-@import "_CPMenuManager.j"
+
 
 var _CPMenuWindowPool                       = [],
     _CPMenuWindowPoolCapacity               = 5,
@@ -34,6 +10,15 @@ _CPMenuWindowMenuBarBackgroundStyle         = 0;
 _CPMenuWindowPopUpBackgroundStyle           = 1;
 _CPMenuWindowAttachedMenuBackgroundStyle    = 2;
 
+var STICKY_TIME_INTERVAL        = 500,
+
+    TOP_MARGIN                  = 5.0,
+    LEFT_MARGIN                 = 1.0,
+    RIGHT_MARGIN                = 1.0,
+    BOTTOM_MARGIN               = 5.0,
+
+    SCROLL_INDICATOR_HEIGHT     = 16.0;
+
 /*
     @ignore
 */
@@ -78,6 +63,17 @@ _CPMenuWindowAttachedMenuBackgroundStyle    = 2;
     _CPMenuWindowPool.push(aMenuWindow);
 }
 
++ (void)initialize
+{
+    if (self !== [_CPMenuWindow class])
+        return;
+
+    var bundle = [CPBundle bundleForClass:self];
+
+    _CPMenuWindowMoreAboveImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindowMoreAbove.png"] size:CGSizeMake(38.0, 18.0)];
+    _CPMenuWindowMoreBelowImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindowMoreBelow.png"] size:CGSizeMake(38.0, 18.0)];
+}
+
 - (id)initWithContentRect:(CGRect)aRect styleMask:(unsigned)aStyleMask
 {
     _constraintRect = _CGRectMakeZero();
@@ -96,22 +92,22 @@ _CPMenuWindowAttachedMenuBackgroundStyle    = 2;
 
         _menuView = [[_CPMenuView alloc] initWithFrame:CGRectMakeZero()];
 
-        _menuClipView = [[CPClipView alloc] initWithFrame:CGRectMake([_menuView valueForThemeAttribute:@"menu-window-margin-inset"].left, [_menuView valueForThemeAttribute:@"menu-window-margin-inset"].top, 0.0, 0.0)];
+        _menuClipView = [[CPClipView alloc] initWithFrame:CGRectMake(LEFT_MARGIN, TOP_MARGIN, 0.0, 0.0)];
         [_menuClipView setDocumentView:_menuView];
 
         [contentView addSubview:_menuClipView];
 
         _moreAboveView = [[CPImageView alloc] initWithFrame:CGRectMakeZero()];
 
-        [_moreAboveView setImage:[_menuView valueForThemeAttribute:@"menu-window-more-above-image"]];
-        [_moreAboveView setFrameSize:[[_menuView valueForThemeAttribute:@"menu-window-more-above-image"] size]];
+        [_moreAboveView setImage:_CPMenuWindowMoreAboveImage];
+        [_moreAboveView setFrameSize:[_CPMenuWindowMoreAboveImage size]];
 
         [contentView addSubview:_moreAboveView];
 
         _moreBelowView = [[CPImageView alloc] initWithFrame:CGRectMakeZero()];
 
-        [_moreBelowView setImage:[_menuView valueForThemeAttribute:@"menu-window-more-below-image"]];
-        [_moreBelowView setFrameSize:[[_menuView valueForThemeAttribute:@"menu-window-more-below-image"] size]];
+        [_moreBelowView setImage:_CPMenuWindowMoreBelowImage];
+        [_moreBelowView setFrameSize:[_CPMenuWindowMoreBelowImage size]];
 
         [contentView addSubview:_moreBelowView];
     }
@@ -121,7 +117,7 @@ _CPMenuWindowAttachedMenuBackgroundStyle    = 2;
 
 + (float)_standardLeftMargin
 {
-    return [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-window-margin-inset" forClass:_CPMenuView].left;
+    return LEFT_MARGIN;
 }
 
 - (void)setFont:(CPFont)aFont
@@ -143,10 +139,36 @@ _CPMenuWindowAttachedMenuBackgroundStyle    = 2;
         var bundle = [CPBundle bundleForClass:[self class]];
 
         if (aBackgroundStyle == _CPMenuWindowPopUpBackgroundStyle)
-            color = [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-window-pop-up-background-style-color" forClass:_CPMenuView];
+            color = [CPColor colorWithPatternImage:[[CPNinePartImage alloc] initWithImageSlices:
+                [
+                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindowRounded0.png"] size:CGSizeMake(4.0, 4.0)],
+                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow1.png"] size:CGSizeMake(1.0, 4.0)],
+                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindowRounded2.png"] size:CGSizeMake(4.0, 4.0)],
+
+                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow3.png"] size:CGSizeMake(4.0, 1.0)],
+                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow4.png"] size:CGSizeMake(1.0, 1.0)],
+                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow5.png"] size:CGSizeMake(4.0, 1.0)],
+
+                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindowRounded6.png"] size:CGSizeMake(4.0, 4.0)],
+                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow7.png"] size:CGSizeMake(1.0, 4.0)],
+                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindowRounded8.png"] size:CGSizeMake(4.0, 4.0)]
+                ]]];
 
         else if (aBackgroundStyle == _CPMenuWindowMenuBarBackgroundStyle)
-            color = [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-window-menu-bar-background-style-color" forClass:_CPMenuView];
+            color = [CPColor colorWithPatternImage:[[CPNinePartImage alloc] initWithImageSlices:
+                [
+                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow3.png"] size:CGSizeMake(4.0, 0.0)],
+                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow4.png"] size:CGSizeMake(1.0, 0.0)],
+                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow5.png"] size:CGSizeMake(4.0, 0.0)],
+
+                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow3.png"] size:CGSizeMake(4.0, 1.0)],
+                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow4.png"] size:CGSizeMake(1.0, 1.0)],
+                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow5.png"] size:CGSizeMake(4.0, 1.0)],
+
+                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindowRounded6.png"] size:CGSizeMake(4.0, 4.0)],
+                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow7.png"] size:CGSizeMake(1.0, 4.0)],
+                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindowRounded8.png"] size:CGSizeMake(4.0, 4.0)]
+                ]]];
 
         _CPMenuWindowBackgroundColors[aBackgroundStyle] = color;
     }
@@ -164,13 +186,12 @@ _CPMenuWindowAttachedMenuBackgroundStyle    = 2;
     [aMenu _setMenuWindow:self];
     [_menuView setMenu:aMenu];
 
-    var menuViewSize = [_menuView frame].size,
-        marginInset = [_menuView valueForThemeAttribute:@"menu-window-margin-inset"];
+    var menuViewSize = [_menuView frame].size;
 
-    [self setFrameSize:CGSizeMake(marginInset.left + menuViewSize.width + marginInset.right, marginInset.top + menuViewSize.height + marginInset.bottom)];
+    [self setFrameSize:CGSizeMake(LEFT_MARGIN + menuViewSize.width + RIGHT_MARGIN, TOP_MARGIN + menuViewSize.height + BOTTOM_MARGIN)];
 
     [_menuView scrollPoint:CGPointMake(0.0, 0.0)];
-    [_menuClipView setFrame:CGRectMake(marginInset.left, marginInset.top, menuViewSize.width, menuViewSize.height)];
+    [_menuClipView setFrame:CGRectMake(LEFT_MARGIN, TOP_MARGIN, menuViewSize.width, menuViewSize.height)];
 }
 
 - (void)setMinWidth:(float)aWidth
@@ -228,9 +249,7 @@ _CPMenuWindowAttachedMenuBackgroundStyle    = 2;
     // FIXME: This gets called far too often.
     _unconstrainedFrame = _CGRectMakeCopy(aFrame);
 
-    var constrainedFrame = CGRectIntersection(_unconstrainedFrame, _constraintRect),
-        marginInset = [_menuView valueForThemeAttribute:@"menu-window-margin-inset"],
-        scrollIndicatorHeight = [_menuView valueForThemeAttribute:@"menu-window-scroll-indicator-height"];
+    var constrainedFrame = CGRectIntersection(_unconstrainedFrame, _constraintRect);
 
     // We don't want to simply intersect the visible frame and the unconstrained frame.
     // We should be allowing as much of the width to fit as possible (pushing back and forward).
@@ -249,41 +268,41 @@ _CPMenuWindowAttachedMenuBackgroundStyle    = 2;
     [super setFrame:constrainedFrame display:shouldDisplay animate:shouldAnimate];
 
     // This needs to happen before changing the frame.
-    var menuViewOrigin = CGPointMake(CGRectGetMinX(aFrame) + marginInset.left, CGRectGetMinY(aFrame) + marginInset.top),
-        moreAbove = menuViewOrigin.y < CGRectGetMinY(constrainedFrame) + marginInset.top,
-        moreBelow = menuViewOrigin.y + CGRectGetHeight([_menuView frame]) > CGRectGetMaxY(constrainedFrame) - marginInset.bottom,
+    var menuViewOrigin = CGPointMake(CGRectGetMinX(aFrame) + LEFT_MARGIN, CGRectGetMinY(aFrame) + TOP_MARGIN),
+        moreAbove = menuViewOrigin.y < CGRectGetMinY(constrainedFrame) + TOP_MARGIN,
+        moreBelow = menuViewOrigin.y + CGRectGetHeight([_menuView frame]) > CGRectGetMaxY(constrainedFrame) - BOTTOM_MARGIN,
 
-        topMargin = marginInset.top,
-        bottomMargin = marginInset.bottom,
+        topMargin = TOP_MARGIN,
+        bottomMargin = BOTTOM_MARGIN,
 
         contentView = [self contentView],
         bounds = [contentView bounds];
 
     if (moreAbove)
     {
-        topMargin += scrollIndicatorHeight;
+        topMargin += SCROLL_INDICATOR_HEIGHT;
 
         var frame = [_moreAboveView frame];
 
-        [_moreAboveView setFrameOrigin:CGPointMake((CGRectGetWidth(bounds) - CGRectGetWidth(frame)) / 2.0, (marginInset.top + scrollIndicatorHeight - CGRectGetHeight(frame)) / 2.0)];
+        [_moreAboveView setFrameOrigin:CGPointMake((CGRectGetWidth(bounds) - CGRectGetWidth(frame)) / 2.0, (TOP_MARGIN + SCROLL_INDICATOR_HEIGHT - CGRectGetHeight(frame)) / 2.0)];
     }
 
     [_moreAboveView setHidden:!moreAbove];
 
     if (moreBelow)
     {
-        bottomMargin += scrollIndicatorHeight;
+        bottomMargin += SCROLL_INDICATOR_HEIGHT;
 
-        [_moreBelowView setFrameOrigin:CGPointMake((CGRectGetWidth(bounds) - CGRectGetWidth([_moreBelowView frame])) / 2.0, CGRectGetHeight(bounds) - scrollIndicatorHeight - marginInset.bottom)];
+        [_moreBelowView setFrameOrigin:CGPointMake((CGRectGetWidth(bounds) - CGRectGetWidth([_moreBelowView frame])) / 2.0, CGRectGetHeight(bounds) - SCROLL_INDICATOR_HEIGHT - BOTTOM_MARGIN)];
     }
 
     [_moreBelowView setHidden:!moreBelow];
 
     var clipFrame = CGRectMakeZero();
 
-    clipFrame.origin.x = marginInset.left;
+    clipFrame.origin.x = LEFT_MARGIN;
     clipFrame.origin.y = topMargin;
-    clipFrame.size.width = CGRectGetWidth(constrainedFrame) - marginInset.left - marginInset.right;
+    clipFrame.size.width = CGRectGetWidth(constrainedFrame) - LEFT_MARGIN - RIGHT_MARGIN;
     clipFrame.size.height = CGRectGetHeight(constrainedFrame) - topMargin - bottomMargin;
 
     [_menuClipView setFrame:clipFrame];
@@ -379,15 +398,15 @@ _CPMenuWindowAttachedMenuBackgroundStyle    = 2;
 - (_CPManagerScrollingState)scrollingStateForPoint:(CGPoint)aGlobalLocation
 {
     var frame = [self frame];
-    if (!CGRectContainsPoint(frame,aGlobalLocation) || ![self canScroll])
+    if (!CPRectContainsPoint(frame,aGlobalLocation) || ![self canScroll])
         return _CPMenuManagerScrollingStateNone;
 
     // If we're at or above of the top scroll indicator...
-    if (aGlobalLocation.y < CGRectGetMinY(frame) + [_menuView valueForThemeAttribute:@"menu-window-margin-inset"].top + [_menuView valueForThemeAttribute:@"menu-window-scroll-indicator-height"] &&  ![_moreAboveView isHidden])
+    if (aGlobalLocation.y < CGRectGetMinY(frame) + TOP_MARGIN + SCROLL_INDICATOR_HEIGHT &&  ![_moreAboveView isHidden])
         return _CPMenuManagerScrollingStateUp;
 
     // If we're at or below the bottom scroll indicator...
-    if (aGlobalLocation.y > CGRectGetMaxY(frame) - [_menuView valueForThemeAttribute:@"menu-window-margin-inset"].bottom - [_menuView valueForThemeAttribute:@"menu-window-scroll-indicator-height"] &&  ![_moreBelowView isHidden])
+    if (aGlobalLocation.y > CGRectGetMaxY(frame) - BOTTOM_MARGIN - SCROLL_INDICATOR_HEIGHT &&  ![_moreBelowView isHidden])
         return _CPMenuManagerScrollingStateDown;
 
     return _CPMenuManagerScrollingStateNone;
@@ -395,7 +414,7 @@ _CPMenuWindowAttachedMenuBackgroundStyle    = 2;
 
 - (float)deltaYForItemAtIndex:(int)anIndex
 {
-    return [_menuView valueForThemeAttribute:@"menu-window-margin-inset"].top + CGRectGetMinY([_menuView rectForItemAtIndex:anIndex]);
+    return TOP_MARGIN + CGRectGetMinY([_menuView rectForItemAtIndex:anIndex]);
 }
 
 - (CGPoint)rectForItemAtIndex:(int)anIndex
@@ -426,44 +445,6 @@ _CPMenuWindowAttachedMenuBackgroundStyle    = 2;
     CPFont  _font @accessors(property=font);
 }
 
-
-+ (CPString)defaultThemeClass
-{
-    return "menu-view";
-}
-
-+ (id)themeAttributes
-{
-    return @{
-            @"menu-window-more-above-image": [CPNull null],
-            @"menu-window-more-below-image": [CPNull null],
-            @"menu-window-pop-up-background-style-color": [CPNull null],
-            @"menu-window-menu-bar-background-style-color": [CPNull null],
-            @"menu-window-margin-inset": CGInsetMake(5.0, 1.0, 1.0, 5.0),
-            @"menu-window-scroll-indicator-height": 16.0,
-            @"menu-bar-window-background-color": [CPNull null],
-            @"menu-bar-window-background-selected-color": [CPNull null],
-            @"menu-bar-window-font": [CPNull null],
-            @"menu-bar-window-height": 30.0,
-            @"menu-bar-window-margin": 10.0,
-            @"menu-bar-window-left-margin": 10.0,
-            @"menu-bar-window-right-margin": 10.0,
-            @"menu-bar-text-color": [CPNull null],
-            @"menu-bar-title-color": [CPNull null],
-            @"menu-bar-text-shadow-color": [CPNull null],
-            @"menu-bar-title-shadow-color": [CPNull null],
-            @"menu-bar-highlight-color": [CPNull null],
-            @"menu-bar-highlight-text-color": [CPNull null],
-            @"menu-bar-highlight-text-shadow-color": [CPNull null],
-            @"menu-bar-height": 28.0,
-            @"menu-bar-icon-image": [CPNull null],
-            @"menu-bar-icon-image-alpha-value": 1.0,
-            @"menu-general-icon-new": [CPNull null],
-            @"menu-general-icon-save": [CPNull null],
-            @"menu-general-icon-open": [CPNull null],
-        };
-}
-
 - (unsigned)numberOfUnhiddenItems
 {
     return _visibleMenuItemInfos.length;

AppKit/CPMenuItem/CPMenuItem.j

@@ -25,33 +25,29 @@
 @import <Foundation/CPString.j>
 
 @import "CPImage.j"
-@import "CPText.j"
+@import "CPMenu.j"
 @import "CPView.j"
 @import "_CPMenuItemView.j"
 
-@class CPMenu
 
-@global CPApp
-
-var CPMenuItemStringRepresentationDictionary = @{
-        CPEscapeFunctionKey:        "\u238B",
-        CPTabCharacter:             "\u21E5",
-        CPBackTabCharacter:         "\u21E4",
-        CPSpaceFunctionKey:         "\u2423",
-        CPCarriageReturnCharacter:  "\u23CE",
-        CPBackspaceCharacter:       "\u232B",
-        CPDeleteFunctionKey:        "\u232B",
-        CPDeleteCharacter:          "\u2326",
-        CPHomeFunctionKey:          "\u21F1",
-        CPEndFunctionKey:           "\u21F2",
-        CPPageUpFunctionKey:        "\u21DE",
-        CPPageDownFunctionKey:      "\u21DF",
-        CPUpArrowFunctionKey:       "\u2191",
-        CPDownArrowFunctionKey:     "\u2193",
-        CPLeftArrowFunctionKey:     "\u2190",
-        CPRightArrowFunctionKey:    "\u2192",
-        CPClearDisplayFunctionKey:  "\u2327",
-    };
+var CPMenuItemStringRepresentationDictionary = [CPDictionary dictionary];
+[CPMenuItemStringRepresentationDictionary setObject:"\u238B" forKey:CPEscapeFunctionKey];
+[CPMenuItemStringRepresentationDictionary setObject:"\u21E5" forKey:CPTabCharacter];
+[CPMenuItemStringRepresentationDictionary setObject:"\u21E4" forKey:CPBackTabCharacter];
+[CPMenuItemStringRepresentationDictionary setObject:"\u2423" forKey:CPSpaceFunctionKey];
+[CPMenuItemStringRepresentationDictionary setObject:"\u23CE" forKey:CPCarriageReturnCharacter];
+[CPMenuItemStringRepresentationDictionary setObject:"\u232B" forKey:CPBackspaceCharacter];
+[CPMenuItemStringRepresentationDictionary setObject:"\u232B" forKey:CPDeleteFunctionKey];
+[CPMenuItemStringRepresentationDictionary setObject:"\u2326" forKey:CPDeleteCharacter];
+[CPMenuItemStringRepresentationDictionary setObject:"\u21F1" forKey:CPHomeFunctionKey];
+[CPMenuItemStringRepresentationDictionary setObject:"\u21F2" forKey:CPEndFunctionKey];
+[CPMenuItemStringRepresentationDictionary setObject:"\u21DE" forKey:CPPageUpFunctionKey];
+[CPMenuItemStringRepresentationDictionary setObject:"\u21DF" forKey:CPPageDownFunctionKey];
+[CPMenuItemStringRepresentationDictionary setObject:"\u2191" forKey:CPUpArrowFunctionKey];
+[CPMenuItemStringRepresentationDictionary setObject:"\u2193" forKey:CPDownArrowFunctionKey];
+[CPMenuItemStringRepresentationDictionary setObject:"\u2190" forKey:CPLeftArrowFunctionKey];
+[CPMenuItemStringRepresentationDictionary setObject:"\u2192" forKey:CPRightArrowFunctionKey];
+[CPMenuItemStringRepresentationDictionary setObject:"\u2327" forKey:CPClearDisplayFunctionKey];
 
 /*!
     @ingroup appkit
@@ -105,16 +101,6 @@ var CPMenuItemStringRepresentationDictionary = @{
     _CPMenuItemView _menuItemView;
 }
 
-+ (Class)_binderClassForBinding:(CPString)aBinding
-{
-    if ([aBinding hasPrefix:CPEnabledBinding])
-        return [CPMultipleValueAndBinding class];
-    else if (aBinding === CPTargetBinding || [aBinding hasPrefix:CPArgumentBinding])
-        return [CPActionBinding class];
-
-    return [super _binderClassForBinding:aBinding];
-}
-
 - (id)init
 {
     return [self initWithTitle:@"" action:nil keyEquivalent:nil];

AppKit/CPMenuItem/_CPMenuItemMenuBarView.j

@@ -1,30 +1,17 @@
-/*
- * _CPMenuItemMenuBarView.j
- * AppKit
- *
- * Created by Francisco Tolmasky.
- * Copyright 2009, 280 North, Inc.
- *
- * 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 "CPView.j"
 
-@import "CPControl.j"
-@import "_CPImageAndTextView.j"
 
-@class _CPMenuBarWindow
-@class _CPMenuView
+var HORIZONTAL_MARGIN           = 8.0,
+    SUBMENU_INDICATOR_MARGIN    = 3.0,
+    VERTICAL_MARGIN             = 4.0;
+
+var SelectionColor                              = nil,
+    SUBMENU_INDICATOR_COLOR                     = nil,
+    _CPMenuItemSelectionColor                   = nil,
+    _CPMenuItemTextShadowColor                  = nil,
+
+    _CPMenuItemDefaultStateImages               = [],
+    _CPMenuItemDefaultStateHighlightedImages    = [];
 
 @implementation _CPMenuItemMenuBarView : CPView
 {
@@ -37,22 +24,31 @@
     BOOL                    _isDirty;
 
     _CPImageAndTextView     _imageAndTextView;
+    CPView                  _submenuIndicatorView;
 }
 
-+ (CPString)defaultThemeClass
++ (void)initialize
 {
-    return "menu-item-bar-view";
-}
+    if (self !== [_CPMenuItemMenuBarView class])
+        return;
 
-+ (id)themeAttributes
-{
-    return @{
-            @"menu-item-selection-color": [CPNull null],
-            @"menu-item-text-shadow-color": [CPNull null],
-            @"horizontal-margin": 12.0,
-            @"submenu-indicator-margin": 3.0,
-            @"vertical-margin": 4.0,
-        };
+    var bundle = [CPBundle bundleForClass:self];
+
+    SelectionColor = [CPColor colorWithPatternImage:[[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuBarWindow/_CPMenuBarWindowBackgroundSelected.png"] size:CGSizeMake(1.0, 28.0)]];
+
+    SUBMENU_INDICATOR_COLOR = [CPColor grayColor];
+
+    _CPMenuItemSelectionColor =  [CPColor colorWithCalibratedRed:95.0 / 255.0 green:131.0 / 255.0 blue:185.0 / 255.0 alpha:1.0];
+    _CPMenuItemTextShadowColor = [CPColor colorWithCalibratedRed:26.0 / 255.0 green: 73.0 / 255.0 blue:109.0 / 255.0 alpha:1.0];
+
+    _CPMenuItemDefaultStateImages[CPOffState]               = nil;
+    _CPMenuItemDefaultStateHighlightedImages[CPOffState]    = nil;
+
+    _CPMenuItemDefaultStateImages[CPOnState]               = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPMenuItem/CPMenuItemOnState.png"] size:CGSizeMake(14.0, 14.0)];
+    _CPMenuItemDefaultStateHighlightedImages[CPOnState]    = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPMenuItem/CPMenuItemOnStateHighlighted.png"] size:CGSizeMake(14.0, 14.0)];
+
+    _CPMenuItemDefaultStateImages[CPMixedState]             = nil;
+    _CPMenuItemDefaultStateHighlightedImages[CPMixedState]  = nil;
 }
 
 + (id)view
@@ -66,7 +62,7 @@
 
     if (self)
     {
-        _imageAndTextView = [[_CPImageAndTextView alloc] initWithFrame:CGRectMake([self valueForThemeAttribute:@"horizontal-margin"], 0.0, 0.0, 0.0)];
+        _imageAndTextView = [[_CPImageAndTextView alloc] initWithFrame:CGRectMake(HORIZONTAL_MARGIN, 0.0, 0.0, 0.0)];
 
         [_imageAndTextView setImagePosition:CPImageLeft];
         [_imageAndTextView setImageOffset:3.0];
@@ -75,6 +71,12 @@
 
         [self addSubview:_imageAndTextView];
 
+        _submenuIndicatorView = [[_CPMenuItemMenuBarSubmenuIndicatorView alloc] initWithFrame:CGRectMake(0.0, 0.0, 9.0, 6.0)];
+
+        [_submenuIndicatorView setAutoresizingMask:CPViewMinYMargin | CPViewMaxYMargin];
+
+        [self addSubview:_submenuIndicatorView];
+
         [self setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
     }
 
@@ -92,14 +94,14 @@
 - (CPColor)textShadowColor
 {
     if (![_menuItem isEnabled])
-        return [CPColor clearColor];
+        return [CPColor colorWithWhite:0.8 alpha:0.8];
 
     return _textShadowColor || [CPColor colorWithWhite:1.0 alpha:0.8];
 }
 
 - (void)update
 {
-    var x = [self valueForThemeAttribute:@"horizontal-margin"],
+    var x = HORIZONTAL_MARGIN,
         height = 0.0;
 
     [_imageAndTextView setFont:[_menuItem font] || [_CPMenuBarWindow font]];
@@ -115,13 +117,39 @@
 
     imageAndTextViewFrame.origin.x = x;
     x += CGRectGetWidth(imageAndTextViewFrame);
-    height = MAX(height, CGRectGetHeight(imageAndTextViewFrame)) + 2.0 * [self valueForThemeAttribute:@"vertical-margin"];
+    height = MAX(height, CGRectGetHeight(imageAndTextViewFrame));
+
+    var hasSubmenuIndicator = [_menuItem hasSubmenu] && [_menuItem action];
+
+    if (hasSubmenuIndicator)
+    {
+        [_submenuIndicatorView setHidden:NO];
+        [_submenuIndicatorView setColor:[self textColor]];
+        [_submenuIndicatorView setShadowColor:[self textShadowColor]];
+
+        var submenuViewFrame = [_submenuIndicatorView frame];
+
+        submenuViewFrame.origin.x = x + SUBMENU_INDICATOR_MARGIN;
+
+        x = CGRectGetMaxX(submenuViewFrame);
+        height = MAX(height, CGRectGetHeight(submenuViewFrame));
+    }
+    else
+        [_submenuIndicatorView setHidden:YES];
+
+    height += 2.0 * VERTICAL_MARGIN;
 
     imageAndTextViewFrame.origin.y = FLOOR((height - CGRectGetHeight(imageAndTextViewFrame)) / 2.0);
     [_imageAndTextView setFrame:imageAndTextViewFrame];
 
+    if (hasSubmenuIndicator)
+    {
+        submenuViewFrame.origin.y = FLOOR((height - CGRectGetHeight(submenuViewFrame)) / 2.0) + 1.0;
+        [_submenuIndicatorView setFrame:submenuViewFrame];
+    }
+
     [self setAutoresizesSubviews:NO];
-    [self setFrameSize:CGSizeMake(x + [self valueForThemeAttribute:@"horizontal-margin"], height)];
+    [self setFrameSize:CGSizeMake(x + HORIZONTAL_MARGIN, height)];
     [self setAutoresizesSubviews:YES];
 }
 
@@ -134,11 +162,14 @@
     if (shouldHighlight)
     {
         if (![_menuItem _isMenuBarButton])
-            [self setBackgroundColor:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-window-background-selected-color" forClass:_CPMenuView]];
+            [self setBackgroundColor:SelectionColor];
 
         [_imageAndTextView setImage:[_menuItem alternateImage] || [_menuItem image]];
         [_imageAndTextView setTextColor:[CPColor whiteColor]];
-        [_imageAndTextView setTextShadowColor:[self valueForThemeAttribute:@"menu-item-text-shadow-color"]];
+        [_imageAndTextView setTextShadowColor:_CPMenuItemTextShadowColor];
+
+        [_submenuIndicatorView setColor:[CPColor whiteColor]];
+        [_submenuIndicatorView setShadowColor:[CPColor colorWithWhite:0.1 alpha:0.7]];
     }
     else
     {
@@ -147,7 +178,60 @@
         [_imageAndTextView setImage:[_menuItem image]];
         [_imageAndTextView setTextColor:[self textColor]];
         [_imageAndTextView setTextShadowColor:[self textShadowColor]];
+
+        [_submenuIndicatorView setColor:[self textColor]];
+        [_submenuIndicatorView setShadowColor:[self textShadowColor]];
     }
 }
 
 @end
+
+@implementation _CPMenuItemMenuBarSubmenuIndicatorView : CPView
+{
+    CPColor _color;
+    CPColor _shadowColor;
+}
+
+- (void)setColor:(CPColor)aColor
+{
+    if (_color === aColor)
+        return;
+
+    _color = aColor;
+
+    [self setNeedsDisplay:YES];
+}
+
+- (void)setShadowColor:(CPColor)aColor
+{
+    if (_shadowColor === aColor)
+        return;
+
+    _shadowColor = aColor;
+
+    [self setNeedsDisplay:YES];
+}
+
+- (void)drawRect:(CGRect)aRect
+{
+    var context = [[CPGraphicsContext currentContext] graphicsPort],
+        bounds = [self bounds];
+
+    bounds.size.height -= 1.0;
+    bounds.size.width -= 2.0;
+    bounds.origin.x += 1.0;
+
+    CGContextBeginPath(context);
+
+    CGContextMoveToPoint(context, CGRectGetMinX(bounds), CGRectGetMinY(bounds));
+    CGContextAddLineToPoint(context, CGRectGetMaxX(bounds), CGRectGetMinY(bounds));
+    CGContextAddLineToPoint(context, CGRectGetMidX(bounds), CGRectGetMaxY(bounds));
+
+    CGContextClosePath(context);
+
+    CGContextSetShadowWithColor(context, CGSizeMake(0.0, 1.0), 1.1, _shadowColor || [CPColor whiteColor]);
+    CGContextSetFillColor(context, _color || [CPColor blackColor]);
+    CGContextFillPath(context);
+}
+
+@end

AppKit/CPMenuItem/_CPMenuItemSeparatorView.j

@@ -1,29 +1,6 @@
-/*
- * _CPMenuItemSeparatorView.j
- * AppKit
- *
- * Created by Francisco Tolmasky.
- * Copyright 2009, 280 North, Inc.
- *
- * 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 "CPView.j"
 
-@class _CPMenuItemStandardView
-
 
 @implementation _CPMenuItemSeparatorView : CPView
 {
@@ -54,8 +31,8 @@
     CGContextMoveToPoint(context, CGRectGetMinX(bounds), FLOOR(CGRectGetMidY(bounds)) - 0.5);
     CGContextAddLineToPoint(context, CGRectGetMaxX(bounds), FLOOR(CGRectGetMidY(bounds)) - 0.5);
 
-    CGContextSetStrokeColor(context, [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-item-separator-color" forClass:_CPMenuItemStandardView]);
+    CGContextSetStrokeColor(context, [CPColor lightGrayColor]);
     CGContextStrokePath(context);
 }
 
-@end
+@end

AppKit/CPMenuItem/_CPMenuItemStandardView.j

@@ -1,38 +1,32 @@
-/*
- * _CPMenuItemStandardView.j
- * AppKit
- *
- * Created by Francisco Tolmasky.
- * Copyright 2009, 280 North, Inc.
- *
- * 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 "CPControl.j"
-@import "CPImageView.j"
-@import "_CPImageAndTextView.j"
+
+
+var LEFT_MARGIN                 = 3.0,
+    RIGHT_MARGIN                = 14.0 + 3.0,
+    STATE_COLUMN_WIDTH          = 14.0,
+    INDENTATION_WIDTH           = 17.0,
+    VERTICAL_MARGIN             = 4.0,
+
+    RIGHT_COLUMNS_MARGIN        = 30.0,
+    KEY_EQUIVALENT_MARGIN       = 10.0;
+
+var SUBMENU_INDICATOR_COLOR                     = nil,
+    _CPMenuItemSelectionColor                   = nil,
+    _CPMenuItemTextShadowColor                  = nil,
+
+    _CPMenuItemDefaultStateImages               = [],
+    _CPMenuItemDefaultStateHighlightedImages    = [];
 
 @implementation _CPMenuItemStandardView : CPView
 {
     CPMenuItem              _menuItem @accessors(property=menuItem);
 
     CPFont                  _font;
+    CPColor                 _textColor;
+    CPColor                 _textShadowColor;
 
     CGSize                  _minSize @accessors(readonly, property=minSize);
     BOOL                    _isDirty;
-    BOOL                    _highlighted;
 
     CPImageView             _stateView;
     _CPImageAndTextView     _imageAndTextView;
@@ -40,32 +34,26 @@
     CPView                  _submenuIndicatorView;
 }
 
-+ (CPString)defaultThemeClass
++ (void)initialize
 {
-    return "menu-item-standard-view";
-}
+    if (self !== [_CPMenuItemStandardView class])
+        return;
 
-+ (id)themeAttributes
-{
-    return @{
-            @"submenu-indicator-color": [CPNull null],
-            @"menu-item-selection-color": [CPNull null],
-            @"menu-item-text-shadow-color": [CPNull null],
-            @"menu-item-text-color": [CPNull null],
-            @"menu-item-default-off-state-image": [CPNull null],
-            @"menu-item-default-off-state-highlighted-image": [CPNull null],
-            @"menu-item-default-on-state-image": [CPNull null],
-            @"menu-item-default-on-state-highlighted-image": [CPNull null],
-            @"menu-item-default-mixed-state-image": [CPNull null],
-            @"menu-item-default-mixed-state-highlighted-image": [CPNull null],
-            @"menu-item-separator-color": [CPNull null],
-            @"left-margin": 3.0,
-            @"right-margin": 17.0,
-            @"state-column-width": 14.0,
-            @"indentation-width": 17.0,
-            @"vertical-margin": 4.0,
-            @"right-columns-margin": 30.0,
-        };
+    SUBMENU_INDICATOR_COLOR = [CPColor grayColor];
+
+    _CPMenuItemSelectionColor =  [CPColor colorWithCalibratedRed:95.0 / 255.0 green:131.0 / 255.0 blue:185.0 / 255.0 alpha:1.0];
+    _CPMenuItemTextShadowColor = [CPColor colorWithCalibratedRed:26.0 / 255.0 green: 73.0 / 255.0 blue:109.0 / 255.0 alpha:1.0];
+
+    var bundle = [CPBundle bundleForClass:self];
+
+    _CPMenuItemDefaultStateImages[CPOffState]               = nil;
+    _CPMenuItemDefaultStateHighlightedImages[CPOffState]    = nil;
+
+    _CPMenuItemDefaultStateImages[CPOnState]               = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPMenuItem/CPMenuItemOnState.png"] size:CGSizeMake(14.0, 14.0)];
+    _CPMenuItemDefaultStateHighlightedImages[CPOnState]    = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPMenuItem/CPMenuItemOnStateHighlighted.png"] size:CGSizeMake(14.0, 14.0)];
+
+    _CPMenuItemDefaultStateImages[CPMixedState]             = nil;
+    _CPMenuItemDefaultStateHighlightedImages[CPMixedState]  = nil;
 }
 
 + (id)view
@@ -75,7 +63,7 @@
 
 + (float)_standardLeftMargin
 {
-    return [[CPTheme defaultTheme] valueForAttributeWithName:@"left-margin" forClass:[self class]] + [[CPTheme defaultTheme] valueForAttributeWithName:@"state-column-width" forClass:[self class]];
+    return LEFT_MARGIN + STATE_COLUMN_WIDTH;
 }
 
 - (id)initWithFrame:(CGRect)aFrame
@@ -107,7 +95,7 @@
 
         _submenuIndicatorView = [[_CPMenuItemSubmenuIndicatorView alloc] initWithFrame:CGRectMake(0.0, 0.0, 8.0, 10.0)];
 
-        [_submenuIndicatorView setColor:[self valueForThemeAttribute:@"submenu-indicator-color"]];
+        [_submenuIndicatorView setColor:SUBMENU_INDICATOR_COLOR];
         [_submenuIndicatorView setAutoresizingMask:CPViewMinXMargin];
 
         [self addSubview:_submenuIndicatorView];
@@ -123,10 +111,7 @@
     if (![_menuItem isEnabled])
         return [CPColor lightGrayColor];
 
-    if (_highlighted)
-        return [CPColor whiteColor];
-
-    return [self valueForThemeAttribute:@"menu-item-text-color"];
+    return _textColor || [CPColor colorWithCalibratedRed:70.0 / 255.0 green:69.0 / 255.0 blue:69.0 / 255.0 alpha:1.0];
 }
 
 - (CPColor)textShadowColor
@@ -134,10 +119,7 @@
     if (![_menuItem isEnabled])
         return nil;
 
-    if (_highlighted)
-        return nil;
-
-    return [self valueForThemeAttribute:@"menu-item-text-shadow-color"];
+    return _textShadowColor || [CPColor colorWithWhite:1.0 alpha:0.8];
 }
 
 - (void)setFont:(CPFont)aFont
@@ -147,34 +129,16 @@
 
 - (void)update
 {
-    var x = [self valueForThemeAttribute:@"left-margin"] + [_menuItem indentationLevel] * [self valueForThemeAttribute:@"indentation-width"],
+    var x = LEFT_MARGIN + [_menuItem indentationLevel] * INDENTATION_WIDTH,
         height = 0.0,
         hasStateColumn = [[_menuItem menu] showsStateColumn];
 
     if (hasStateColumn)
     {
         [_stateView setHidden:NO];
-        //[_stateView setImage:_CPMenuItemDefaultStateImages[[_menuItem state]] || nil];
+        [_stateView setImage:_CPMenuItemDefaultStateImages[[_menuItem state]] || nil];
 
-        switch ([_menuItem state])
-        {
-            case CPOnState:
-                [_stateView setImage:[self valueForThemeAttribute:@"menu-item-default-on-state-image"]];
-                break;
-
-            case CPOffState:
-                [_stateView setImage:[self valueForThemeAttribute:@"menu-item-default-off-state-image"]];
-                break;
-
-            case CPMixedState:
-                [_stateView setImage:[self valueForThemeAttribute:@"menu-item-default-mixed-state-image"]];
-                break;
-
-            default:
-                break;
-        }
-
-        x += [self valueForThemeAttribute:@"state-column-width"];
+        x += STATE_COLUMN_WIDTH;
     }
     else
         [_stateView setHidden:YES];
@@ -198,7 +162,7 @@
         hasSubmenu = [_menuItem hasSubmenu];
 
     if (hasKeyEquivalent || hasSubmenu)
-        x += [self valueForThemeAttribute:@"right-columns-margin"];
+        x += RIGHT_COLUMNS_MARGIN;
 
     if (hasKeyEquivalent)
     {
@@ -209,7 +173,7 @@
         [_keyEquivalentView setTextColor:[self textColor]];
         [_keyEquivalentView setTextShadowColor:[self textShadowColor]];
         [_keyEquivalentView setTextShadowOffset:CGSizeMake(0, 1)];
-        [_keyEquivalentView setFrameOrigin:CGPointMake(x, [self valueForThemeAttribute:@"vertical-margin"])];
+        [_keyEquivalentView setFrameOrigin:CGPointMake(x, VERTICAL_MARGIN)];
         [_keyEquivalentView sizeToFit];
 
         var keyEquivalentViewFrame = [_keyEquivalentView frame];
@@ -219,7 +183,7 @@
         height = MAX(height, CGRectGetHeight(keyEquivalentViewFrame));
 
         if (hasSubmenu)
-            x += [self valueForThemeAttribute:@"right-columns-margin"];
+            x += RIGHT_COLUMNS_MARGIN;
     }
     else
         [_keyEquivalentView setHidden:YES];
@@ -238,13 +202,13 @@
     else
         [_submenuIndicatorView setHidden:YES];
 
-    height += 2.0 * [self valueForThemeAttribute:@"vertical-margin"];
+    height += 2.0 * VERTICAL_MARGIN;
 
     imageAndTextViewFrame.origin.y = FLOOR((height - CGRectGetHeight(imageAndTextViewFrame)) / 2.0);
     [_imageAndTextView setFrame:imageAndTextViewFrame];
 
     if (hasStateColumn)
-        [_stateView setFrameSize:CGSizeMake([self valueForThemeAttribute:@"state-column-width"], height)];
+        [_stateView setFrameSize:CGSizeMake(STATE_COLUMN_WIDTH, height)];
 
     if (hasKeyEquivalent)
     {
@@ -258,7 +222,7 @@
         [_submenuIndicatorView setFrame:submenuViewFrame];
     }
 
-    _minSize = CGSizeMake(x + [self valueForThemeAttribute:@"right-margin"], height);
+    _minSize = CGSizeMake(x + RIGHT_MARGIN, height);
 
     [self setAutoresizesSubviews:NO];
     [self setFrameSize:_minSize];
@@ -271,68 +235,37 @@
     if (![_menuItem isEnabled])
         return;
 
-    _highlighted = shouldHighlight;
-
-    [_imageAndTextView setTextColor:[self textColor]];
-    [_keyEquivalentView setTextColor:[self textColor]];
-    [_imageAndTextView setTextShadowColor:[self textShadowColor]];
-    [_keyEquivalentView setTextShadowColor:[self textShadowColor]];
-
     if (shouldHighlight)
     {
-        [self setBackgroundColor:[self valueForThemeAttribute:@"menu-item-selection-color"]];
+        [self setBackgroundColor:_CPMenuItemSelectionColor];
+
         [_imageAndTextView setImage:[_menuItem alternateImage] || [_menuItem image]];
-        [_submenuIndicatorView setColor:[self textColor]];
+        [_imageAndTextView setTextColor:[CPColor whiteColor]];
+        [_keyEquivalentView setTextColor:[CPColor whiteColor]];
+        [_submenuIndicatorView setColor:[CPColor whiteColor]];
+
+        [_imageAndTextView setTextShadowColor:_CPMenuItemTextShadowColor];
+        [_keyEquivalentView setTextShadowColor:_CPMenuItemTextShadowColor];
     }
     else
     {
         [self setBackgroundColor:nil];
+
         [_imageAndTextView setImage:[_menuItem image]];
-        [_submenuIndicatorView setColor:[self valueForThemeAttribute:@"submenu-indicator-color"]];
+        [_imageAndTextView setTextColor:[self textColor]];
+        [_keyEquivalentView setTextColor:[self textColor]];
+        [_submenuIndicatorView setColor:SUBMENU_INDICATOR_COLOR];
+
+        [_imageAndTextView setTextShadowColor:[self textShadowColor]];
+        [_keyEquivalentView setTextShadowColor:[self textShadowColor]];
     }
 
     if ([[_menuItem menu] showsStateColumn])
     {
         if (shouldHighlight)
-        {
-            switch ([_menuItem state])
-            {
-                case CPOnState:
-                    [_stateView setImage:[self valueForThemeAttribute:@"menu-item-default-on-state-highlighted-image"]];
-                    break;
-
-                case CPOffState:
-                    [_stateView setImage:[self valueForThemeAttribute:@"menu-item-default-off-state-highlighted-image"]];
-                    break;
-
-                case CPMixedState:
-                    [_stateView setImage:[self valueForThemeAttribute:@"menu-item-default-mixed-state-highlighted-image"]];
-                    break;
-
-                default:
-                    break;
-            }
-        }
+            [_stateView setImage:_CPMenuItemDefaultStateHighlightedImages[[_menuItem state]] || nil];
         else
-        {
-            switch ([_menuItem state])
-            {
-                case CPOnState:
-                    [_stateView setImage:[self valueForThemeAttribute:@"menu-item-default-on-state-image"]];
-                    break;
-
-                case CPOffState:
-                    [_stateView setImage:[self valueForThemeAttribute:@"menu-item-default-off-state-image"]];
-                    break;
-
-                case CPMixedState:
-                    [_stateView setImage:[self valueForThemeAttribute:@"menu-item-default-mixed-state-image"]];
-                    break;
-
-                default:
-                    break;
-            }
-        }
+            [_stateView setImage:_CPMenuItemDefaultStateImages[[_menuItem state]] || nil];
     }
 }
 

AppKit/CPMenuItem/_CPMenuItemView.j

@@ -1,32 +1,22 @@
-/*
- * _CPMenuItemView.j
- * AppKit
- *
- * Created by Francisco Tolmasky.
- * Copyright 2009, 280 North, Inc.
- *
- * 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 "CPControl.j"
+@import <AppKit/CPControl.j>
 
 @import "_CPMenuItemSeparatorView.j"
 @import "_CPMenuItemStandardView.j"
 @import "_CPMenuItemMenuBarView.j"
 
-@global CPApp
+
+var LEFT_MARGIN                 = 3.0,
+    RIGHT_MARGIN                = 16.0,
+    STATE_COLUMN_WIDTH          = 14.0,
+    INDENTATION_WIDTH           = 17.0,
+    VERTICAL_MARGIN             = 4.0;
+
+var _CPMenuItemSelectionColor                   = nil,
+    _CPMenuItemTextShadowColor                  = nil,
+
+    _CPMenuItemDefaultStateImages               = [],
+    _CPMenuItemDefaultStateHighlightedImages    = [];
 
 /*
     @ignore
@@ -48,22 +38,31 @@
     CPView                  _submenuView;
 }
 
-+ (CPString)defaultThemeClass
++ (void)initialize
 {
-    return "menu-item-view";
+    if (self !== [_CPMenuItemView class])
+        return;
+
+    _CPMenuItemSelectionColor =  [CPColor colorWithCalibratedRed:95.0 / 255.0 green:131.0 / 255.0 blue:185.0 / 255.0 alpha:1.0];
+    _CPMenuItemTextShadowColor = [CPColor colorWithCalibratedRed:26.0 / 255.0 green: 73.0 / 255.0 blue:109.0 / 255.0 alpha:1.0];
+
+    var bundle = [CPBundle bundleForClass:self];
+
+    _CPMenuItemDefaultStateImages[CPOffState]               = nil;
+    _CPMenuItemDefaultStateHighlightedImages[CPOffState]    = nil;
+
+    _CPMenuItemDefaultStateImages[CPOnState]               = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPMenuItem/CPMenuItemOnState.png"] size:CGSizeMake(14.0, 14.0)];
+    _CPMenuItemDefaultStateHighlightedImages[CPOnState]    = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPMenuItem/CPMenuItemOnStateHighlighted.png"] size:CGSizeMake(14.0, 14.0)];
+
+    _CPMenuItemDefaultStateImages[CPMixedState]             = nil;
+    _CPMenuItemDefaultStateHighlightedImages[CPMixedState]  = nil;
 }
 
-+ (id)themeAttributes
++ (float)leftMargin
 {
-    return @{};
+    return LEFT_MARGIN + STATE_COLUMN_WIDTH;
 }
 
-// Not used in the Appkit
-// + (float)leftMargin
-// {
-//     return LEFT_MARGIN + STATE_COLUMN_WIDTH;
-// }
-
 - (id)initWithFrame:(CGRect)aFrame forMenuItem:(CPMenuItem)aMenuItem
 {
     self = [super initWithFrame:aFrame];
@@ -246,6 +245,8 @@
     CGContextMoveToPoint(context, 1.0, 4.0);
     CGContextAddLineToPoint(context, 9.0, 4.0);
     CGContextAddLineToPoint(context, 5.0, 8.0);
+    CGContextAddLineToPoint(context, 1.0, 4.0);
+
     CGContextClosePath(context);
 
     CGContextSetFillColor(context, _color);

AppKit/CPObjectController.j

@@ -22,10 +22,8 @@
 
 @import <Foundation/CPDictionary.j>
 @import <Foundation/CPCountedSet.j>
-@import <Foundation/_CPCollectionKVCOperators.j>
 
 @import "CPController.j"
-@import "CPKeyValueBinding.j"
 
 /*!
     @class
@@ -106,13 +104,11 @@
 {
     if (self = [super init])
     {
+        [self setContent:aContent];
         [self setEditable:YES];
         [self setObjectClass:[CPMutableDictionary class]];
 
         _observedKeys = [[CPCountedSet alloc] init];
-        _selection = [[CPControllerSelectionProxy alloc] initWithController:self];
-
-        [self setContent:aContent];
     }
 
     return self;
@@ -520,12 +516,8 @@ var CPObjectControllerContentKey                        = @"CPObjectControllerCo
 
 - (void)addObserver:(id)anObserver forKeyPath:(CPString)aKeyPath options:(CPKeyValueObservingOptions)options context:(id)context
 {
-    if (aKeyPath.charAt(0) === "@")
+    if (aKeyPath.indexOf("@") === 0)
     {
-        // Simple collection operators are scalar and can't be proxied
-        if ([_CPCollectionKVCOperator isSimpleCollectionOperator:aKeyPath])
-            return;
-
         var proxy = [[_CPObservationProxy alloc] initWithKeyPath:aKeyPath observer:anObserver object:self];
 
         proxy._options = options;
@@ -548,12 +540,8 @@ var CPObjectControllerContentKey                        = @"CPObjectControllerCo
 
 - (void)removeObserver:(id)anObserver forKeyPath:(CPString)aKeyPath
 {
-    if (aKeyPath.charAt(0) === "@")
+    if (aKeyPath.indexOf("@") === 0)
     {
-        // Simple collection operators are scalar and can't be proxied
-        if ([_CPCollectionKVCOperator isSimpleCollectionOperator:aKeyPath])
-            return;
-
         var proxy = [[_CPObservationProxy alloc] initWithKeyPath:aKeyPath observer:anObserver object:self],
             index = [_observationProxies indexOfObject:proxy];
 
@@ -578,7 +566,7 @@ var CPObjectControllerContentKey                        = @"CPObjectControllerCo
     {
         var proxy = [_observationProxies objectAtIndex:i],
             keyPath = [proxy keyPath],
-            operator = keyPath.charAt(0) === ".";
+            operator = keyPath.indexOf(".") === 0;
 
         if (operator)
             [self willChangeValueForKey:keyPath];
@@ -600,7 +588,7 @@ var CPObjectControllerContentKey                        = @"CPObjectControllerCo
     {
         var proxy = [_observationProxies objectAtIndex:i],
             keyPath = [proxy keyPath],
-            operator = keyPath.charAt(0) === ".";
+            operator = keyPath.indexOf(".") === 0;
 
         if (operator)
             [self willChangeValueForKey:keyPath];
@@ -637,7 +625,7 @@ var CPObjectControllerContentKey                        = @"CPObjectControllerCo
     {
         var proxy = [_observationProxies objectAtIndex:i],
             keyPath = [proxy keyPath],
-            operator = keyPath.charAt(0) === ".";
+            operator = keyPath.indexOf(".") === 0;
 
         if (operator)
             [self willChangeValueForKey:keyPath];
@@ -669,7 +657,7 @@ var CPObjectControllerContentKey                        = @"CPObjectControllerCo
 {
     if (self = [super init])
     {
-        _cachedValues = @{};
+        _cachedValues = [CPDictionary dictionary];
         _observationProxies = [CPArray array];
         _controller = aController;
         _observedObjectsByKeyPath = {};
@@ -711,18 +699,12 @@ var CPObjectControllerContentKey                        = @"CPObjectControllerCo
 
 - (id)valueForKeyPath:(CPString)theKeyPath
 {
-    var values = [[_controller selectedObjects] valueForKeyPath:theKeyPath];
+    var values = [[_controller selectedObjects] valueForKeyPath:theKeyPath],
+        value = [self _controllerMarkerForValues:values];
 
-    // Simple collection operators like @count return a scalar value, not an array or set
-    if ([values isKindOfClass:CPArray] || [values isKindOfClass:CPSet])
-    {
-        var value = [self _controllerMarkerForValues:values];
-        [_cachedValues setObject:value forKey:theKeyPath];
+    [_cachedValues setObject:value forKey:theKeyPath];
 
-        return value;
-    }
-    else
-        return values;
+    return value;
 }
 
 - (id)valueForKey:(CPString)theKeyPath
@@ -816,7 +798,7 @@ var CPObjectControllerContentKey                        = @"CPObjectControllerCo
 
     [_observationProxies removeObjectAtIndex:index];
 
-    _observedObjectsByKeyPath[aKeyPath] = nil;
+    _observedObjects = nil;
 }
 
 @end

AppKit/CPOpenPanel.j

@@ -47,9 +47,9 @@
         var options = { directoryURL: [self directoryURL],
                         canChooseFiles: [self canChooseFiles],
                         canChooseDirectories: [self canChooseDirectories],
-                        allowsMultipleSelection: [self allowsMultipleSelection] },
+                        allowsMultipleSelection: [self allowsMultipleSelection] };
 
-            result = window.cpOpenPanel(options);
+        var result = window.cpOpenPanel(options);
 
         _URLs = result.URLs;
 

AppKit/CPOutlineView.j

@@ -20,11 +20,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-@import "CPButton.j"
 @import "CPTableColumn.j"
 @import "CPTableView.j"
 
-@global CPApp
 
 CPOutlineViewColumnDidMoveNotification          = @"CPOutlineViewColumnDidMoveNotification";
 CPOutlineViewColumnDidResizeNotification        = @"CPOutlineViewColumnDidResizeNotification";
@@ -35,21 +33,20 @@ CPOutlineViewItemWillExpandNotification         = @"CPOutlineViewItemWillExpandN
 CPOutlineViewSelectionDidChangeNotification     = @"CPOutlineViewSelectionDidChangeNotification";
 CPOutlineViewSelectionIsChangingNotification    = @"CPOutlineViewSelectionIsChangingNotification";
 
-var CPOutlineViewDataSource_outlineView_objectValue_forTableColumn_byItem_                          = 1 << 1,
-    CPOutlineViewDataSource_outlineView_setObjectValue_forTableColumn_byItem_                       = 1 << 2,
-    CPOutlineViewDataSource_outlineView_shouldDeferDisplayingChildrenOfItem_                        = 1 << 3,
+var CPOutlineViewDataSource_outlineView_setObjectValue_forTableColumn_byItem_                       = 1 << 1,
+    CPOutlineViewDataSource_outlineView_shouldDeferDisplayingChildrenOfItem_                        = 1 << 2,
 
-    CPOutlineViewDataSource_outlineView_acceptDrop_item_childIndex_                                 = 1 << 4,
-    CPOutlineViewDataSource_outlineView_validateDrop_proposedItem_proposedChildIndex_               = 1 << 5,
-    CPOutlineViewDataSource_outlineView_validateDrop_proposedRow_proposedDropOperation_             = 1 << 6,
-    CPOutlineViewDataSource_outlineView_namesOfPromisedFilesDroppedAtDestination_forDraggedItems_   = 1 << 7,
+    CPOutlineViewDataSource_outlineView_acceptDrop_item_childIndex_                                 = 1 << 3,
+    CPOutlineViewDataSource_outlineView_validateDrop_proposedItem_proposedChildIndex_               = 1 << 4,
+    CPOutlineViewDataSource_outlineView_validateDrop_proposedRow_proposedDropOperation_             = 1 << 5,
+    CPOutlineViewDataSource_outlineView_namesOfPromisedFilesDroppedAtDestination_forDraggedItems_   = 1 << 6,
 
-    CPOutlineViewDataSource_outlineView_itemForPersistentObject_                                    = 1 << 8,
-    CPOutlineViewDataSource_outlineView_persistentObjectForItem_                                    = 1 << 9,
+    CPOutlineViewDataSource_outlineView_itemForPersistentObject_                                    = 1 << 7,
+    CPOutlineViewDataSource_outlineView_persistentObjectForItem_                                    = 1 << 8,
 
-    CPOutlineViewDataSource_outlineView_writeItems_toPasteboard_                                    = 1 << 10,
+    CPOutlineViewDataSource_outlineView_writeItems_toPasteboard_                                    = 1 << 9,
 
-    CPOutlineViewDataSource_outlineView_sortDescriptorsDidChange_                                   = 1 << 11;
+    CPOutlineViewDataSource_outlineView_sortDescriptorsDidChange_                                   = 1 << 10;
 
 var CPOutlineViewDelegate_outlineView_dataViewForTableColumn_item_                                  = 1 << 1,
     CPOutlineViewDelegate_outlineView_didClickTableColumn_                                          = 1 << 2,
@@ -231,12 +228,12 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
     if (![aDataSource respondsToSelector:@selector(outlineView:numberOfChildrenOfItem:)])
         [CPException raise:CPInternalInconsistencyException reason:"Data source must implement 'outlineView:numberOfChildrenOfItem:'"];
 
+    if (![aDataSource respondsToSelector:@selector(outlineView:objectValueForTableColumn:byItem:)])
+        [CPException raise:CPInternalInconsistencyException reason:"Data source must implement 'outlineView:objectValueForTableColumn:byItem:'"];
+
     _outlineViewDataSource = aDataSource;
     _implementedOutlineViewDataSourceMethods = 0;
 
-    if ([_outlineViewDataSource respondsToSelector:@selector(outlineView:objectValueForTableColumn:byItem:)])
-        _implementedOutlineViewDataSourceMethods |= CPOutlineViewDataSource_outlineView_objectValue_forTableColumn_byItem_;
-
     if ([_outlineViewDataSource respondsToSelector:@selector(outlineView:setObjectValue:forTableColumn:byItem:)])
         _implementedOutlineViewDataSourceMethods |= CPOutlineViewDataSource_outlineView_setObjectValue_forTableColumn_byItem_;
 
@@ -1055,12 +1052,11 @@ 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:(int)theColumnIndex event:(CPEvent)theDragEvent offset:(CPPointPointer)theDragViewOffset
 {
     var dragView = [[_CPColumnDragView alloc] initWithLineColor:[self gridColor]],
         tableColumn = [[self tableColumns] objectAtIndex:theColumnIndex],
-        defaultRowHeight = [self valueForThemeAttribute:@"default-row-height"],
-        bounds = _CGRectMake(0.0, 0.0, [tableColumn width], _CGRectGetHeight([self exposedRect]) + defaultRowHeight),
+        bounds = _CGRectMake(0.0, 0.0, [tableColumn width], _CGRectGetHeight([self exposedRect]) + 23.0),
         columnRect = [self rectOfColumn:theColumnIndex],
         headerView = [tableColumn headerView],
         row = [_exposedRows firstIndex];
@@ -1074,7 +1070,7 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
         dataViewFrame.origin.x = 0.0;
 
         // Offset by table header height - scroll position
-        dataViewFrame.origin.y = ( _CGRectGetMinY(dataViewFrame) - _CGRectGetMinY([self exposedRect]) ) + defaultRowHeight;
+        dataViewFrame.origin.y = ( _CGRectGetMinY(dataViewFrame) - _CGRectGetMinY([self exposedRect]) ) + 23.0;
         [dataView setFrame:dataViewFrame];
 
         [dataView setObjectValue:[self _objectValueForTableColumn:tableColumn row:row]];
@@ -1188,7 +1184,7 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
 /*!
     @ignore
 */
-- (id)_parentItemForUpperRow:(int)theUpperRowIndex andLowerRow:(int)theLowerRowIndex atMouseOffset:(CGPoint)theOffset
+- (id)_parentItemForUpperRow:(int)theUpperRowIndex andLowerRow:(int)theLowerRowIndex atMouseOffset:(CPPoint)theOffset
 {
     if (_shouldRetargetItem)
         return _retargetedItem;
@@ -1218,7 +1214,7 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
 /*!
     @ignore
 */
-- (CGRect)_rectForDropHighlightViewBetweenUpperRow:(int)theUpperRowIndex andLowerRow:(int)theLowerRowIndex offset:(CGPoint)theOffset
+- (CPRect)_rectForDropHighlightViewBetweenUpperRow:(int)theUpperRowIndex andLowerRow:(int)theLowerRowIndex offset:(CPPoint)theOffset
 {
     // Call super and the update x to reflect the current indentation level
     var rect = [super _rectForDropHighlightViewBetweenUpperRow:theUpperRowIndex andLowerRow:theLowerRowIndex offset:theOffset],
@@ -1442,7 +1438,7 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
     [[CPNotificationCenter defaultCenter]
         postNotificationName:CPOutlineViewItemWillExpandNotification
                       object:self
-                    userInfo:@{ "CPObject": item }];
+                    userInfo:[CPDictionary dictionaryWithObject:item forKey:"CPObject"]];
 }
 
 /*!
@@ -1453,7 +1449,7 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
     [[CPNotificationCenter defaultCenter]
         postNotificationName:CPOutlineViewItemDidExpandNotification
                       object:self
-                    userInfo:@{ "CPObject": item }];
+                    userInfo:[CPDictionary dictionaryWithObject:item forKey:"CPObject"]];
 }
 
 /*!
@@ -1464,7 +1460,7 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
     [[CPNotificationCenter defaultCenter]
         postNotificationName:CPOutlineViewItemWillCollapseNotification
                       object:self
-                    userInfo:@{ "CPObject": item }];
+                    userInfo:[CPDictionary dictionaryWithObject:item forKey:"CPObject"]];
 }
 
 /*!
@@ -1475,7 +1471,7 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
     [[CPNotificationCenter defaultCenter]
         postNotificationName:CPOutlineViewItemDidCollapseNotification
                       object:self
-                    userInfo:@{ "CPObject": item }];
+                    userInfo:[CPDictionary dictionaryWithObject:item forKey:"CPObject"]];
 }
 
 - (void)keyDown:(CPEvent)anEvent
@@ -1534,16 +1530,6 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
     [super keyDown:anEvent];
 }
 
-- (BOOL)_dataSourceRespondsToObjectValueForTableColumn
-{
-    return _implementedOutlineViewDataSourceMethods & CPOutlineViewDataSource_outlineView_objectValue_forTableColumn_byItem_;
-}
-
-- (BOOL)_delegateRespondsToDataViewForTableColumn
-{
-    return _implementedOutlineViewDelegateMethods & CPOutlineViewDelegate_outlineView_dataViewForTableColumn_item_;
-}
-
 @end
 
 // FIX ME: We're using with() here because Safari fails if we use anOutlineView._itemInfosForItems or whatever...
@@ -1741,7 +1727,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:(int)theRow offset:(CPPoint)theOffset
 {
     if (_outlineView._shouldRetargetChildIndex)
         return _outlineView._retargedChildIndex;
@@ -1765,7 +1751,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:(int)theRow offset:(CPPoint)theOffset
 {
     if (theDropOperation === CPTableViewDropAbove)
         return [_outlineView _parentItemForUpperRow:theRow - 1 andLowerRow:theRow atMouseOffset:theOffset]
@@ -1837,6 +1823,21 @@ var _loadItemInfoForItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anIt
     return self;
 }
 
+- (CPView)tableView:(CPTableView)theTableView dataViewForTableColumn:(CPTableColumn)theTableColumn row:(int)theRow
+{
+    var dataView = nil;
+
+    if ((_outlineView._implementedOutlineViewDelegateMethods & CPOutlineViewDelegate_outlineView_dataViewForTableColumn_item_))
+        dataView = [_outlineView._outlineViewDelegate outlineView:_outlineView
+                                       dataViewForTableColumn:theTableColumn
+                                                         item:[_outlineView itemAtRow:theRow]];
+
+    if (!dataView)
+        dataView = [theTableColumn dataViewForRow:theRow];
+
+    return dataView;
+}
+
 - (BOOL)tableView:(CPTableView)theTableView shouldSelectRow:(int)theRow
 {
     return SHOULD_SELECT_ITEM(_outlineView, [_outlineView itemAtRow:theRow]);
@@ -1893,17 +1894,6 @@ var _loadItemInfoForItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anIt
     return [_outlineView menu] || [[_outlineView class] defaultMenu];
 }
 
-- (CPView)tableView:(CPTableView)aTableView dataViewForTableColumn:(CPTableColumn)aTableColumn row:(int)aRow
-{
-    if ((_outlineView._implementedOutlineViewDelegateMethods & CPOutlineViewDelegate_outlineView_dataViewForTableColumn_item_))
-    {
-        var item = [_outlineView itemAtRow:aRow];
-        return [_outlineView._outlineViewDelegate outlineView:_outlineView dataViewForTableColumn:aTableColumn item:item]
-    }
-
-    return nil;
-}
-
 @end
 
 @implementation CPDisclosureButton : CPButton
@@ -1955,8 +1945,9 @@ var _loadItemInfoForItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anIt
     CGContextMoveToPoint(context, 0.0, 0.0);
     CGContextAddLineToPoint(context, 9.0, 0.0);
     CGContextAddLineToPoint(context, 4.5, 8.0);
-    CGContextClosePath(context);
+    CGContextAddLineToPoint(context, 0.0, 0.0);
 
+    CGContextClosePath(context);
     CGContextSetFillColor(context,
         colorForDisclosureTriangle([self hasThemeState:CPThemeStateSelected],
             [self hasThemeState:CPThemeStateHighlighted]));
@@ -1964,8 +1955,8 @@ var _loadItemInfoForItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anIt
 
     CGContextBeginPath(context);
     CGContextMoveToPoint(context, 0.0, 0.0);
-    CGContextAddLineToPoint(context, 4.5, 8.0);
 
+    CGContextAddLineToPoint(context, 4.5, 8.0);
     if (_angle === 0.0)
         CGContextAddLineToPoint(context, 9.0, 0.0);
 

AppKit/CPPanel.j

@@ -116,7 +116,7 @@ CPDocModalWindowMask    = 1 << 6;
 
 - (BOOL)canBecomeKeyWindow
 {
-    return YES;
+  return YES;
 }
 
 @end

AppKit/CPPasteboard.j

@@ -22,7 +22,6 @@
 
 @import <Foundation/CPObject.j>
 @import <Foundation/CPArray.j>
-@import <Foundation/CPData.j>
 @import <Foundation/CPDictionary.j>
 @import <Foundation/CPPropertyListSerialization.j>
 
@@ -79,7 +78,7 @@ var CPPasteboards = nil,
 
     [self setVersion:1.0];
 
-    CPPasteboards = @{};
+    CPPasteboards = [CPDictionary dictionary];
 
     if (typeof window.cpPasteboardWithName !== "undefined")
         supportsNativePasteboard = YES;
@@ -118,11 +117,11 @@ var CPPasteboards = nil,
 
     if (self)
     {
-//        _name = aName;
+        _name = aName;
         _types = [];
 
-        _owners = @{};
-        _provided = @{};
+        _owners = [CPDictionary dictionary];
+        _provided = [CPDictionary dictionary];
 
         _changeCount = 0;
 
@@ -188,8 +187,8 @@ var CPPasteboards = nil,
 {
     [_types setArray:types];
 
-    _owners = @{};
-    _provided = @{};
+    _owners = [CPDictionary dictionary];
+    _provided = [CPDictionary dictionary];
 
     var count = _types.length;
 
@@ -248,14 +247,14 @@ var CPPasteboards = nil,
 
 // Determining Types
 /*!
-    Checks the pasteboard's types for a match with the types listed in the specified array. The array should
+    Checks the pasteboard's types for a match with the types listen in the specified array. The array should
     be ordered by the requestor's most preferred data type first.
     @param anArray an array of requested types ordered by preference
     @return the highest match with the pasteboard's supported types or \c nil if no match was found
 */
 - (CPString)availableTypeFromArray:(CPArray)anArray
 {
-    return [anArray firstObjectCommonWithArray:[self types]];
+    return [[self types] firstObjectCommonWithArray:anArray];
 }
 
 /*!

AppKit/CPPopUpButton.j

@@ -20,7 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-@import "CGGeometry.j"
+@import <Foundation/CPGeometry.j>
+
 @import "CPButton.j"
 @import "CPKeyValueBinding.j"
 @import "CPMenu.j"
@@ -679,7 +680,7 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
     if ([self pullsDown])
     {
         var positionedItem = nil,
-            location = CGPointMake(0.0, CGRectGetMaxY(bounds) - 1);
+            location = CGPointMake(0.0, CGRectGetMaxY(bounds));
     }
     else
     {

AppKit/CPPopover.j

@@ -28,7 +28,7 @@
 @import "CPImageView.j"
 @import "CPResponder.j"
 @import "CPView.j"
-@import "_CPPopoverWindow.j"
+@import "_CPAttachedWindow.j"
 
 
 CPPopoverBehaviorApplicationDefined = 0;
@@ -45,7 +45,7 @@ var CPPopoverDelegate_popover_willShow_     = 1 << 0,
 /*! @ingroup appkit
     @class CPPopover
 
-    This class represent a widget that displays a popover
+    This class represent a widget that displays a attached
     view relative to another one.
 
     Delegate can implement:
@@ -67,7 +67,7 @@ var CPPopoverDelegate_popover_willShow_     = 1 << 0,
     int                         _appearance             @accessors(property=appearance);
     int                         _behavior               @accessors(getter=behavior);
 
-    _CPPopoverWindow            _popoverWindow;
+    _CPAttachedWindow           _attachedWindow;
     int                         _implementedDelegateMethods;
 }
 
@@ -103,10 +103,9 @@ var CPPopoverDelegate_popover_willShow_     = 1 << 0,
 */
 - (CGRect)positioningRect
 {
-    if (![_popoverWindow isVisible])
+    if (![_attachedWindow isVisible])
         return CGRectMakeZero();
-
-    return [_popoverWindow frame];
+    return [_attachedWindow frame];
 }
 
 /*! Sets the frame of the popover
@@ -114,10 +113,9 @@ var CPPopoverDelegate_popover_willShow_     = 1 << 0,
 */
 - (void)setPositioningRect:(CGRect)aRect
 {
-    if (![_popoverWindow isVisible])
+    if (![_attachedWindow isVisible])
         return;
-
-    [_popoverWindow setFrame:aRect];
+    [_attachedWindow setFrame:aRect];
 }
 
 /*!
@@ -127,9 +125,8 @@ var CPPopoverDelegate_popover_willShow_     = 1 << 0,
 */
 - (CGSize)contentSize
 {
-    if (![_popoverWindow isVisible])
+    if (![_attachedWindow isVisible])
         return CGRectMakeZero();
-
     return [[_contentViewController view] frameSize];
 }
 
@@ -138,7 +135,7 @@ var CPPopoverDelegate_popover_willShow_     = 1 << 0,
 
     @param aSize the desired size
 */
-- (void)setContentSize:(CGSize)aSize
+- (void)setContentSize:(CPSize)aSize
 {
     [[_contentViewController view] setFrameSize:aSize];
 }
@@ -150,7 +147,7 @@ var CPPopoverDelegate_popover_willShow_     = 1 << 0,
 */
 - (BOOL)isShown
 {
-    return [_popoverWindow isVisible];
+    return [_attachedWindow isVisible];
 }
 
 /*!
@@ -167,7 +164,7 @@ Set the behavior of the CPPopover. It can be:
         return;
 
     _behavior = aBehavior;
-    [_popoverWindow setStyleMask:[self styleMaskForBehavior]];
+    [_attachedWindow setStyleMask:[self styleMaskForBehavior]];
 }
 
 - (void)setDelegate:(id)aDelegate
@@ -213,24 +210,29 @@ Set the behavior of the CPPopover. It can be:
         [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 ([_attachedWindow isClosing])
         return;
 
     if (_implementedDelegateMethods & CPPopoverDelegate_popover_willShow_)
         [_delegate popoverWillShow:self];
 
-    if (!_popoverWindow)
+    if (!_attachedWindow)
     {
-        _popoverWindow = [[_CPPopoverWindow alloc] initWithContentRect:CGRectMakeZero() styleMask:[self styleMaskForBehavior]];
+        _attachedWindow = [[_CPAttachedWindow alloc] initWithContentRect:CGRectMakeZero() styleMask:[self styleMaskForBehavior]];
+
+        var parentWindow = [positioningView window];
+
+        if (![parentWindow isKindOfClass:_CPAttachedWindow])
+            [[CPNotificationCenter defaultCenter] addObserver:self selector:@selector(parentWindowWillClose:) name:CPWindowWillCloseNotification object:parentWindow];
     }
 
-    [_popoverWindow setAppearance:_appearance];
-    [_popoverWindow setAnimates:_animates];
-    [_popoverWindow setDelegate:self];
-    [_popoverWindow setMovableByWindowBackground:NO];
-    [_popoverWindow setFrame:[_popoverWindow frameRectForContentRect:[[_contentViewController view] frame]]];
-    [_popoverWindow setContentView:[_contentViewController view]];
-    [_popoverWindow positionRelativeToRect:positioningRect ofView:positioningView preferredEdge:preferredEdge];
+    [_attachedWindow setAppearance:_appearance];
+    [_attachedWindow setAnimates:_animates];
+    [_attachedWindow setDelegate:self];
+    [_attachedWindow setMovableByWindowBackground:NO];
+    [_attachedWindow setFrame:[_attachedWindow frameRectForContentRect:[[_contentViewController view] frame]]];
+    [_attachedWindow setContentView:[_contentViewController view]];
+    [_attachedWindow positionRelativeToRect:positioningRect ofView:positioningView preferredEdge:preferredEdge];
 
     if (!_animates && _implementedDelegateMethods & CPPopoverDelegate_popover_didShow_)
         [_delegate popoverDidShow:self];
@@ -254,16 +256,16 @@ Set the behavior of the CPPopover. It can be:
 */
 - (void)_close
 {
-    if ([_popoverWindow isClosing] || ![self isShown])
+    if ([_attachedWindow isClosing] || ![self isShown])
         return;
 
     if (_implementedDelegateMethods & CPPopoverDelegate_popover_willClose_)
         [_delegate popoverWillClose:self];
 
-    [_popoverWindow close];
+    [_attachedWindow close];
 
-    // popoverDidClose will be sent from popoverWindowDidClose, since
-    // the popover window will close asynchronously when animating.
+    // popoverDidClose will be sent from attachedWindowDidClose, since
+    // the attached window will close asynchronously when animating.
 }
 
 
@@ -277,7 +279,7 @@ Set the behavior of the CPPopover. It can be:
 */
 - (IBAction)performClose:(id)sender
 {
-    if ([_popoverWindow isClosing])
+    if ([_attachedWindow isClosing])
         return;
 
     if (_implementedDelegateMethods & CPPopoverDelegate_popover_shouldClose_)
@@ -292,30 +294,46 @@ Set the behavior of the CPPopover. It can be:
 #pragma mark Delegates
 
 /*! @ignore */
-- (BOOL)popoverWindowShouldClose:(_CPPopoverWindow)aPopoverWindow
+- (BOOL)attachedWindowShouldClose:(_CPAttachedWindow)anAttachedWindow
 {
     [self performClose:self];
 
     // We return NO, because we want the CPPopover to determine
-    // if the popover window can be closed and to give us a chance
+    // if the attached window can be closed and to give us a chance
     // to send delegate messages.
     return NO;
 }
 
 /*! @ignore */
-- (void)popoverWindowDidClose:(_CPPopoverWindow)aPopoverWindow
+- (void)attachedWindowDidClose:(_CPAttachedWindow)anAttachedWindow
 {
     if (_implementedDelegateMethods & CPPopoverDelegate_popover_didClose_)
         [_delegate popoverDidClose:self];
 }
 
 /*! @ignore */
-- (void)popoverWindowDidShow:(_CPPopoverWindow)aPopoverWindow
+- (void)attachedWindowDidShow:(_CPAttachedWindow)anAttachedWindow
 {
     if (_implementedDelegateMethods & CPPopoverDelegate_popover_didShow_)
         [_delegate popoverDidShow:self];
 }
 
+
+#pragma mark -
+#pragma mark Notifications
+
+/*!
+    @ignore
+
+    This method is called only when a non-popover parent window
+    is closing. In that case popovers should order out.
+*/
+- (void)parentWindowWillClose:(CPNotification)aNotification
+{
+    [_attachedWindow orderOut:nil];
+    [self performClose:nil];
+}
+
 @end
 
 @implementation CPPopover (Deprecated)
@@ -329,7 +347,7 @@ Set the behavior of the CPPopover. It can be:
 
 @end
 
-var CPPopoverNeedsNewPopoverWindowKey = @"CPPopoverNeedsNewPopoverWindowKey",
+var CPPopoverNeedsNewAttachedWindowKey = @"CPPopoverNeedsNewAttachedWindowKey",
     CPPopoverAppearanceKey = @"CPPopoverAppearanceKey",
     CPPopoverAnimatesKey = @"CPPopoverAnimatesKey",
     CPPopoverContentViewControllerKey = @"CPPopoverContentViewControllerKey",

AppKit/CPProgressIndicator.j

@@ -23,26 +23,29 @@
 @import "CGGeometry.j"
 @import "CPImageView.j"
 @import "CPView.j"
-@import "CPWindow_Constants.j"
 
 
 /*
     @global
     @group CPProgressIndicatorStyle
 */
-CPProgressIndicatorBarStyle = 0;
+CPProgressIndicatorBarStyle         = 0;
 /*
     @global
     @group CPProgressIndicatorStyle
 */
-CPProgressIndicatorSpinningStyle = 1;
+CPProgressIndicatorSpinningStyle    = 1;
 /*
     @global
     @group CPProgressIndicatorStyle
 */
-CPProgressIndicatorHUDBarStyle = 2;
+CPProgressIndicatorHUDBarStyle      = 2;
 
-var CPProgressIndicatorSpinningStyleColors = [];
+var CPProgressIndicatorSpinningStyleColors  = nil,
+
+    CPProgressIndicatorClassName            = nil,
+    CPProgressIndicatorStyleIdentifiers     = nil,
+    CPProgressIndicatorStyleSizes           = nil;
 
 /*!
     @ingroup appkit
@@ -61,7 +64,7 @@ var CPProgressIndicatorSpinningStyleColors = [];
 
     CPControlSize               _controlSize;
 
-    BOOL                        _indeterminate;
+    BOOL                        _isIndeterminate;
     CPProgressIndicatorStyle    _style;
 
     BOOL                        _isAnimating;
@@ -70,30 +73,66 @@ var CPProgressIndicatorSpinningStyleColors = [];
     BOOL                        _isDisplayedWhenStopped;
 }
 
-+ (CPString)defaultThemeClass
+/*
+    @ignore
+*/
++ (void)initialize
 {
-    return @"progress-indicator";
-}
+    if (self !== [CPProgressIndicator class])
+        return;
 
-+ (CPDictionary)themeAttributes
-{
-    return @{
-            @"indeterminate-bar-color": [CPNull null],
-            @"bar-color": [CPNull null],
-            @"default-height": 20,
-            @"bezel-color": [CPNull null],
-            @"spinning-mini-gif": [CPNull null],
-            @"spinning-small-gif": [CPNull null],
-            @"spinning-regular-gif": [CPNull null],
-        };
-}
+    var bundle = [CPBundle bundleForClass:self];
 
-+ (Class)_binderClassForBinding:(CPString)aBinding
-{
-    if (aBinding === CPValueBinding || aBinding === @"isIndeterminate")
-        return [_CPProgressIndicatorBinder class];
+    CPProgressIndicatorSpinningStyleColors = [];
 
-    return [super _binderClassForBinding:aBinding];
+    CPProgressIndicatorSpinningStyleColors[CPMiniControlSize]       = [CPColor colorWithPatternImage:[[CPImage alloc] initWithContentsOfFile:
+        [bundle pathForResource:@"CPProgressIndicator/CPProgressIndicatorSpinningStyleMini.gif"] size:CGSizeMake(16.0, 16.0)]];
+    CPProgressIndicatorSpinningStyleColors[CPSmallControlSize]      = [CPColor colorWithPatternImage:[[CPImage alloc] initWithContentsOfFile:
+        [bundle pathForResource:@"CPProgressIndicator/CPProgressIndicatorSpinningStyleSmall.gif"] size:CGSizeMake(32.0, 32.0)]];
+    CPProgressIndicatorSpinningStyleColors[CPRegularControlSize]    = [CPColor colorWithPatternImage:[[CPImage alloc] initWithContentsOfFile:
+        [bundle pathForResource:@"CPProgressIndicator/CPProgressIndicatorSpinningStyleRegular.gif"] size:CGSizeMake(64.0, 64.0)]];
+
+    CPProgressIndicatorBezelBorderViewPool = [];
+
+    var start = CPProgressIndicatorBarStyle,
+        end = CPProgressIndicatorHUDBarStyle;
+
+    for (; start <= end; ++start)
+    {
+        CPProgressIndicatorBezelBorderViewPool[start] = [];
+        CPProgressIndicatorBezelBorderViewPool[start][CPMiniControlSize]    = [];
+        CPProgressIndicatorBezelBorderViewPool[start][CPSmallControlSize]   = [];
+        CPProgressIndicatorBezelBorderViewPool[start][CPRegularControlSize]  = [];
+    }
+
+    CPProgressIndicatorClassName = [self className];
+    CPProgressIndicatorStyleIdentifiers = [];
+
+    CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorBarStyle]        = @"Bar";
+    CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorSpinningStyle]   = @"Spinny";
+    CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorHUDBarStyle]     = @"HUDBar";
+
+    var regularIdentifier = _CPControlIdentifierForControlSize(CPRegularControlSize),
+        smallIdentifier = _CPControlIdentifierForControlSize(CPSmallControlSize),
+        miniIdentifier = _CPControlIdentifierForControlSize(CPMiniControlSize);
+
+    CPProgressIndicatorStyleSizes = [];
+
+    // Bar Style
+    var prefixes = [
+            CPProgressIndicatorClassName + @"BezelBorder" + CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorBarStyle],
+            CPProgressIndicatorClassName + @"Bar" + CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorBarStyle],
+            CPProgressIndicatorClassName + @"BezelBorder" + CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorHUDBarStyle],
+            CPProgressIndicatorClassName + @"Bar" + CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorHUDBarStyle]
+        ];
+
+    for (var i = 0, count = prefixes.length; i < count; i++)
+    {
+        var prefix = prefixes[i];
+        CPProgressIndicatorStyleSizes[prefix + regularIdentifier] = [_CGSizeMake(3.0, 16.0), _CGSizeMake(1.0, 16.0), _CGSizeMake(3.0, 16.0)];
+        CPProgressIndicatorStyleSizes[prefix + smallIdentifier] = [_CGSizeMake(3.0, 16.0), _CGSizeMake(1.0, 16.0), _CGSizeMake(3.0, 16.0)];
+        CPProgressIndicatorStyleSizes[prefix + miniIdentifier] = [_CGSizeMake(3.0, 16.0), _CGSizeMake(1.0, 16.0), _CGSizeMake(3.0, 16.0)];
+    }
 }
 
 - (id)initWithFrame:(CGRect)aFrame
@@ -112,7 +151,8 @@ var CPProgressIndicatorSpinningStyleColors = [];
 
         _controlSize = CPRegularControlSize;
 
-        [self setNeedsLayout];
+        [self updateBackgroundColor];
+        [self drawBar];
     }
 
     return self;
@@ -274,12 +314,12 @@ var CPProgressIndicatorSpinningStyleColors = [];
     Specifies whether this progress indicator should be indeterminate or display progress based on it's max and min.
     @param isDeterminate \c YES makes the indicator indeterminate
 */
-- (void)setIndeterminate:(BOOL)indeterminate
+- (void)setIndeterminate:(BOOL)isIndeterminate
 {
-    if (_indeterminate == indeterminate)
+    if (_isIndeterminate == isIndeterminate)
         return;
 
-    _indeterminate = indeterminate;
+    _isIndeterminate = isIndeterminate;
 
     [self updateBackgroundColor];
 }
@@ -289,7 +329,7 @@ var CPProgressIndicatorSpinningStyleColors = [];
 */
 - (BOOL)isIndeterminate
 {
-    return _indeterminate;
+    return _isIndeterminate;
 }
 
 /*!
@@ -303,8 +343,6 @@ var CPProgressIndicatorSpinningStyleColors = [];
 
     _style = aStyle;
 
-    [self setTheme:(_style === CPProgressIndicatorHUDBarStyle) ? [CPTheme defaultHudTheme] : [CPTheme defaultTheme]];
-
     [self updateBackgroundColor];
 }
 
@@ -316,7 +354,8 @@ var CPProgressIndicatorSpinningStyleColors = [];
     if (_style == CPProgressIndicatorSpinningStyle)
         [self setFrameSize:[[CPProgressIndicatorSpinningStyleColors[_controlSize] patternImage] size]];
     else
-        [self setFrameSize:CGSizeMake(CGRectGetWidth([self frame]), [self valueForThemeAttribute:@"default-height"])];
+        [self setFrameSize:CGSizeMake(CGRectGetWidth([self frame]), CPProgressIndicatorStyleSizes[
+            CPProgressIndicatorClassName + @"BezelBorder" + CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorBarStyle] + _CPControlIdentifierForControlSize(_controlSize)][0].height)];
 }
 
 /*!
@@ -366,7 +405,20 @@ var CPProgressIndicatorSpinningStyleColors = [];
 /* @ignore */
 - (void)drawBar
 {
-    [self setNeedsLayout];
+    if (_style == CPProgressIndicatorSpinningStyle)
+        return;
+
+    var barView = [self layoutEphemeralSubviewNamed:"bar-view"
+                                         positioned:CPWindowBelow
+                    relativeToEphemeralSubviewNamed:nil];
+
+    [barView setBackgroundColor:_CPControlThreePartImagePattern(
+        NO,
+        CPProgressIndicatorStyleSizes,
+        CPProgressIndicatorClassName,
+        @"Bar",
+        CPProgressIndicatorStyleIdentifiers[_style],
+        _CPControlIdentifierForControlSize(_controlSize))];
 }
 
 - (CPView)createEphemeralSubviewNamed:(CPString)aName
@@ -384,10 +436,7 @@ var CPProgressIndicatorSpinningStyleColors = [];
         if (barWidth > 0.0 && barWidth < 4.0)
             barWidth = 4.0;
 
-        if (_indeterminate)
-            barWidth = width;
-
-        return _CGRectMake(0, 0, barWidth, [self valueForThemeAttribute:@"default-height"]);
+        return _CGRectMake(0, 0, barWidth, 16.0);
     }
 
     return nil;
@@ -395,18 +444,6 @@ var CPProgressIndicatorSpinningStyleColors = [];
 
 /* @ignore */
 - (void)updateBackgroundColor
-{
-    if ([CPProgressIndicatorSpinningStyleColors count] === 0)
-    {
-        CPProgressIndicatorSpinningStyleColors[CPMiniControlSize] = [self valueForThemeAttribute:@"spinning-mini-gif"];
-        CPProgressIndicatorSpinningStyleColors[CPSmallControlSize] = [self valueForThemeAttribute:@"spinning-small-gif"];
-        CPProgressIndicatorSpinningStyleColors[CPRegularControlSize] = [self valueForThemeAttribute:@"spinning-regular-gif"];
-    }
-
-    [self setNeedsLayout];
-}
-
-- (void)layoutSubviews
 {
     if (YES)//_isBezeled)
     {
@@ -421,16 +458,15 @@ var CPProgressIndicatorSpinningStyleColors = [];
         }
         else
         {
-           [self setBackgroundColor:[self currentValueForThemeAttribute:@"bezel-color"]];
+            [self setBackgroundColor:_CPControlThreePartImagePattern(
+                NO,
+                CPProgressIndicatorStyleSizes,
+                CPProgressIndicatorClassName,
+                @"BezelBorder",
+                CPProgressIndicatorStyleIdentifiers[_style],
+                _CPControlIdentifierForControlSize(_controlSize))];
 
-           var barView = [self layoutEphemeralSubviewNamed:"bar-view"
-                                                 positioned:CPWindowBelow
-                            relativeToEphemeralSubviewNamed:nil];
-
-           if (_indeterminate)
-               [barView setBackgroundColor:[self currentValueForThemeAttribute:@"indeterminate-bar-color"]];
-           else
-               [barView setBackgroundColor:[self currentValueForThemeAttribute:@"bar-color"]];
+            [self drawBar];
         }
     }
     else
@@ -450,7 +486,7 @@ var CPProgressIndicatorSpinningStyleColors = [];
         _maxValue                   = [aCoder decodeObjectForKey:@"_maxValue"];
         _doubleValue                = [aCoder decodeObjectForKey:@"_doubleValue"];
         _controlSize                = [aCoder decodeObjectForKey:@"_controlSize"];
-        _indeterminate              = [aCoder decodeObjectForKey:@"_indeterminate"];
+        _isIndeterminate            = [aCoder decodeObjectForKey:@"_isIndeterminate"];
         _style                      = [aCoder decodeIntForKey:@"_style"];
         _isAnimating                = [aCoder decodeObjectForKey:@"_isAnimating"];
         _isDisplayedWhenStoppedSet  = [aCoder decodeObjectForKey:@"_isDisplayedWhenStoppedSet"];
@@ -464,8 +500,8 @@ var CPProgressIndicatorSpinningStyleColors = [];
 
 - (void)encodeWithCoder:(CPCoder)aCoder
 {
-    // Don't encode the background colour. It can be recreated based on the flags
-    // and if encoded causes hardcoded image paths in the cib while just wasting space.
+    // Don't encode the background colour. It can be recreated based on the flags and if encoded causes hardcoded
+    // image paths in the cib while just wasting space.
     var backgroundColor = [self backgroundColor];
     [self setBackgroundColor:nil];
     [super encodeWithCoder:aCoder];
@@ -475,7 +511,7 @@ var CPProgressIndicatorSpinningStyleColors = [];
     [aCoder encodeObject:_maxValue forKey:@"_maxValue"];
     [aCoder encodeObject:_doubleValue forKey:@"_doubleValue"];
     [aCoder encodeObject:_controlSize forKey:@"_controlSize"];
-    [aCoder encodeObject:_indeterminate forKey:@"_indeterminate"];
+    [aCoder encodeObject:_isIndeterminate forKey:@"_isIndeterminate"];
     [aCoder encodeInt:_style forKey:@"_style"];
     [aCoder encodeObject:_isAnimating forKey:@"_isAnimating"];
     [aCoder encodeObject:_isDisplayedWhenStoppedSet forKey:@"_isDisplayedWhenStoppedSet"];
@@ -483,52 +519,3 @@ var CPProgressIndicatorSpinningStyleColors = [];
 }
 
 @end
-
-
-@implementation _CPProgressIndicatorBinder : CPBinder
-
-- (void)_updatePlaceholdersWithOptions:(CPDictionary)options forBinding:(CPString)aBinding
-{
-    var value = aBinding === CPValueBinding ? 0.0 : YES;
-
-    [self _setPlaceholder:value forMarker:CPMultipleValuesMarker isDefault:YES];
-    [self _setPlaceholder:value forMarker:CPNoSelectionMarker isDefault:YES];
-    [self _setPlaceholder:value forMarker:CPNotApplicableMarker isDefault:YES];
-    [self _setPlaceholder:value forMarker:CPNullMarker isDefault:YES];
-}
-
-- (id)valueForBinding:(CPString)aBinding
-{
-    if (aBinding === CPValueBinding)
-        return [_source doubleValue];
-    else if (aBinding === @"isIndeterminate")
-        [_source isIndeterminate];
-    else
-        return [super valueForBinding:aBinding];
-}
-
-- (BOOL)_setValue:(id)aValue forBinding:(CPString)aBinding
-{
-    if (aBinding === CPValueBinding)
-        [_source setDoubleValue:aValue];
-    else if (aBinding === @"isIndeterminate")
-        [_source setIndeterminate:aValue];
-    else
-        return NO;
-
-    return YES;
-}
-
-- (void)setValue:(id)aValue forBinding:(CPString)aBinding
-{
-    if (![self _setValue:aValue forBinding:aBinding])
-        [super setValue:aValue forBinding:aBinding];
-}
-
-- (void)setPlaceholderValue:(id)aValue withMarker:(CPString)aMarker forBinding:(CPString)aBinding
-{
-    if (![self _setValue:aValue forBinding:aBinding])
-        [super setPlaceholderValue:aValue withMarker:aMarker forBinding:aBinding];
-}
-
-@end

AppKit/CPRadio.j

@@ -25,8 +25,6 @@
 
 @import "CPButton.j"
 
-@global CPApp
-
 
 /*!
     @ingroup appkit
@@ -204,122 +202,29 @@ var CPRadioRadioGroupKey    = @"CPRadioRadioGroupKey";
 
 @implementation CPRadioGroup : CPObject
 {
-    CPArray _radios;
+    CPSet   _radios;
     CPRadio _selectedRadio;
 
-    BOOL    _enabled @accessors(getter=enabled);
-    BOOL    _hidden @accessors(getter=hidden);
-
     id      _target @accessors(property=target);
     SEL     _action @accessors(property=action);
 }
 
-+ (void)initialize
-{
-    if (self !== [CPRadioGroup class])
-        return;
-
-    [self exposeBinding:CPSelectedValueBinding];
-    [self exposeBinding:CPSelectedTagBinding];
-    [self exposeBinding:CPSelectedIndexBinding];
-
-    [self exposeBinding:CPEnabledBinding];
-    [self exposeBinding:CPHiddenBinding];
-}
-
 - (id)init
 {
     self = [super init];
 
     if (self)
     {
-        _radios = [];
+        _radios = [CPSet set];
         _selectedRadio = nil;
-        _enabled = YES;
-        _hidden = NO;
     }
 
     return self;
 }
 
-/*!
-    Selects the radio button at the given index within the group.
-    If index is -1, all of the radio buttons are turned off.
-*/
-- (void)selectRadioAtIndex:(int)index
-{
-    if (index === -1)
-        [self _setSelectedRadio:nil];
-    else
-    {
-        var radio = [_radios objectAtIndex:index];
-
-        [self _setSelectedRadio:radio];
-        [radio setState:CPOnState];
-    }
-}
-
-/*!
-    Selects the first radio button within the group with the given tag.
-    If a radio button with the given tag is found, selects it
-    and returns YES. Otherwise returns NO.
-*/
-- (BOOL)selectRadioWithTag:(int)tag
-{
-    var index = [_radios indexOfObjectPassingTest:function(radio)
-                    {
-                        return [radio tag] === tag;
-                    }];
-
-    if (index !== CPNotFound)
-    {
-        [self selectRadioAtIndex:index];
-        return YES;
-    }
-    else
-        return NO;
-}
-
-/*!
-    Returns the CPRadio that is currently selected within the group,
-    or nil if none are selected.
-*/
-- (CPRadio)selectedRadio
-{
-    return _selectedRadio;
-}
-
-/*!
-    Returns the index of the selected radio within the array of radio buttons.
-    Buttons are numbered going left to right and top to bottom. Returns -1
-    if no radio within the group is selected.
-*/
-- (int)selectedRadioIndex
-{
-    return [_radios indexOfObject:_selectedRadio];
-}
-
-- (CPArray)radios
-{
-    return _radios;
-}
-
-- (void)setEnabled:(BOOL)enabled
-{
-    [_radios makeObjectsPerformSelector:@selector(setEnabled:) withObject:enabled];
-}
-
-- (void)setHidden:(BOOL)hidden
-{
-    [_radios makeObjectsPerformSelector:@selector(setHidden:) withObject:hidden];
-}
-
-#pragma mark Private
-
 - (void)_addRadio:(CPRadio)aRadio
 {
-    if ([_radios indexOfObject:aRadio] === CPNotFound)
-        [_radios addObject:aRadio];
+    [_radios addObject:aRadio];
 
     if ([aRadio state] === CPOnState)
         [self _setSelectedRadio:aRadio];
@@ -333,30 +238,23 @@ var CPRadioRadioGroupKey    = @"CPRadioRadioGroupKey";
     [_radios removeObject:aRadio];
 }
 
-/*!
-    Selects the first radio button within the group with the given tag.
-    If a radio button with the given tag is found, selects it
-    and returns YES. Otherwise returns NO.
-*/
-- (void)_selectRadioWithTitle:(CPString)aTitle
-{
-    var index = [_radios indexOfObjectPassingTest:function(radio)
-                    {
-                        return [radio title] === aTitle;
-                    }];
-
-    [self selectRadioAtIndex:index];
-}
-
 - (void)_setSelectedRadio:(CPRadio)aRadio
 {
     if (_selectedRadio === aRadio)
         return;
 
     [_selectedRadio setState:CPOffState];
-
     _selectedRadio = aRadio;
-    [_CPRadioGroupSelectionBinder reverseSetValueForObject:self];
+}
+
+- (CPRadio)selectedRadio
+{
+    return _selectedRadio;
+}
+
+- (CPArray)radios
+{
+    return [_radios allObjects];
 }
 
 @end
@@ -386,100 +284,3 @@ var CPRadioGroupRadiosKey           = @"CPRadioGroupRadiosKey",
 }
 
 @end
-
-@implementation CPRadioGroup (BindingSupport)
-
-+ (Class)_binderClassForBinding:(CPString)aBinding
-{
-    if (aBinding === CPSelectedValueBinding   ||
-        aBinding === CPSelectedTagBinding     ||
-        aBinding === CPSelectedIndexBinding)
-    {
-        var capitalizedBinding = aBinding.charAt(0).toUpperCase() + aBinding.substr(1);
-
-        return [CPClassFromString(@"_CPRadioGroup" + capitalizedBinding + "Binder") class];
-    }
-    else if ([aBinding hasPrefix:CPEnabledBinding])
-        return [CPMultipleValueAndBinding class];
-    else if ([aBinding hasPrefix:CPHiddenBinding])
-        return [CPMultipleValueOrBinding class];
-
-    return [super _binderClassForBinding:aBinding];
-}
-
-@end
-
-var binderForObject = {};
-
-@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
-{
-    [self setValue:aValue forBinding:aBinding];
-}
-
-@end
-
-@implementation _CPRadioGroupSelectedIndexBinder : _CPRadioGroupSelectionBinder
-
-- (void)setValue:(id)aValue forBinding:(CPString)aBinding
-{
-    [_source selectRadioAtIndex:aValue];
-}
-
-- (id)valueForBinding:(CPString)aBinding
-{
-    return [_source selectedRadioIndex];
-}
-
-@end
-
-@implementation _CPRadioGroupSelectedTagBinder : _CPRadioGroupSelectionBinder
-
-- (void)setValue:(id)aValue forBinding:(CPString)aBinding
-{
-    [_source selectRadioWithTag:aValue];
-}
-
-- (id)valueForBinding:(CPString)aBinding
-{
-    return [[_source selectedRadio] tag];
-}
-
-@end
-
-@implementation _CPRadioGroupSelectedValueBinder : _CPRadioGroupSelectionBinder
-
-- (void)setValue:(id)aValue forBinding:(CPString)aBinding
-{
-    [_source _selectRadioWithTitle:aValue];
-}
-
-- (id)valueForBinding:(CPString)aBinding
-{
-    return [[_source selectedRadio] title];
-}
-
-@end

AppKit/CPResponder.j

@@ -21,11 +21,7 @@
  */
 
 @import <Foundation/CPObject.j>
-@import <Foundation/CPObjJRuntime.j>
 
-@import "CPEvent.j"
-
-@class CPKeyBinding
 
 CPDeleteKeyCode         = 8;
 CPTabKeyCode            = 9;

AppKit/CPRuleEditor/CPPredicateEditor.j

@@ -82,15 +82,15 @@
 }
 
 /*! @cond */
-+ (Class)_binderClassForBinding:(CPString)aBinding
++ (Class)_binderClassForBinding:(CPString)theBinding
 {
-    if (aBinding == CPValueBinding)
+    if (theBinding == CPValueBinding)
         return [CPPredicateEditorValueBinder class];
 
-    return [super _binderClassForBinding:aBinding];
+    return [super _binderClassForBinding:theBinding];
 }
 
-- (CPString)_replacementKeyPathForBinding:(CPString)aBinding
+- (id)_replacementKeyPathForBinding:(CPString)aBinding
 {
     if (aBinding == CPValueBinding)
         return @"predicate";
@@ -220,7 +220,7 @@
         var children = [CPArray array],
             itemsCount = 0,
             menuIndex = -1,
-            itemArray,
+            itemsArray,
 
             templateView = [templateViews objectAtIndex:count],
             isPopup = [templateView isKindOfClass:[CPPopUpButton class]];
@@ -360,11 +360,7 @@
         rootItems = [treeChild children];
     }
 
-    var row = @{
-            @"criteria": criteria,
-            @"displayValues": values,
-            @"rowType": rowType,
-        };
+    var row = [CPDictionary dictionaryWithObjectsAndKeys:criteria, @"criteria", values, @"displayValues", rowType, @"rowType"];
 
     return row;
 }

AppKit/CPRuleEditor/CPPredicateEditorRowTemplate.j

@@ -20,17 +20,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-@import <Foundation/CPPredicate.j>
-
-@import "CPCheckBox.j"
-@import "CPPopUpButton.j"
-@import "CPMenuItem.j"
-@import "CPTextField.j"
-
-// NOTE: CPDatePicker is not implemented yet
-@class CPDatePicker
-
-
 CPUndefinedAttributeType     = 0;
 CPInteger16AttributeType     = 100;
 CPInteger32AttributeType     = 200;
@@ -594,7 +583,7 @@ CPTransformableAttributeType = 1800;
 
 - (CPPopUpButton)_viewFromExpressions:(CPArray)expressions
 {
-    var popup = [[CPPopUpButton alloc] initWithFrame:CGRectMake(0, 0, 100, 18)],
+    var popup = [[CPPopUpButton alloc] initWithFrame:CPMakeRect(0, 0, 100, 18)],
         count = [expressions count];
 
     for (var i = 0; i < count; i++)

AppKit/CPRuleEditor/CPRuleEditor.j

@@ -20,26 +20,35 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+@import <AppKit/CPTextField.j>
+@import <AppKit/CPViewAnimation.j>
+@import <AppKit/CPView.j>
 @import <Foundation/CPPredicate.j>
 @import <Foundation/CPArray.j>
 @import <Foundation/CPDictionary.j>
 @import <Foundation/CPIndexSet.j>
 
-@import "CPPasteboard.j"
-@import "CPRuleEditor_Constants.j"
-@import "CPTextField.j"
-@import "CPViewAnimation.j"
-@import "CPView.j"
-
 @import "_CPRuleEditorViewSliceRow.j"
 @import "_CPRuleEditorLocalizer.j"
 
-@class CPCompoundPredicate
-@class CPComparisonPredicate
+CPRuleEditorPredicateLeftExpression     = "CPRuleEditorPredicateLeftExpression";
+CPRuleEditorPredicateRightExpression    = "CPRuleEditorPredicateRightExpression";
+CPRuleEditorPredicateComparisonModifier = "CPRuleEditorPredicateComparisonModifier";
+CPRuleEditorPredicateOptions            = "CPRuleEditorPredicateOptions";
+CPRuleEditorPredicateOperatorType       = "CPRuleEditorPredicateOperatorType";
+CPRuleEditorPredicateCustomSelector     = "CPRuleEditorPredicateCustomSelector";
+CPRuleEditorPredicateCompoundType       = "CPRuleEditorPredicateCompoundType";
 
-@global CPDirectPredicateModifier
-@global CPCaseInsensitivePredicateOption
-@global CPOrPredicateType
+CPRuleEditorRowsDidChangeNotification   = "CPRuleEditorRowsDidChangeNotification";
+CPRuleEditorRulesDidChangeNotification  = "CPRuleEditorRulesDidChangeNotification";
+
+CPRuleEditorNestingModeSingle   = 0;        // Only a single row is allowed.  Plus/minus buttons will not be shown
+CPRuleEditorNestingModeList     = 1;        // Allows a single list, with no nesting and no compound rows
+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
+
+CPRuleEditorRowTypeSimple       = 0;
+CPRuleEditorRowTypeCompound     = 1;
 
 var CPRuleEditorItemPBoardType  = @"CPRuleEditorItemPBoardType",
     itemsContext                = "items",
@@ -124,16 +133,8 @@ var CPRuleEditorItemPBoardType  = @"CPRuleEditorItemPBoardType",
 
 + (id)themeAttributes
 {
-    return @{
-            @"alternating-row-colors": [CPNull null],
-            @"selected-color": [CPNull null],
-            @"slice-top-border-color": [CPNull null],
-            @"slice-bottom-border-color": [CPNull null],
-            @"slice-last-bottom-border-color": [CPNull null],
-            @"font": [CPNull null],
-            @"add-image": [CPNull null],
-            @"remove-image": [CPNull null],
-        };
+    return [CPDictionary dictionaryWithObjects:[[CPNull null], [CPNull null], [CPNull null], [CPNull null], [CPNull null], [CPNull null], [CPNull null], [CPNull null]]
+                                       forKeys:[@"alternating-row-colors", @"selected-color", @"slice-top-border-color", @"slice-bottom-border-color", @"slice-last-bottom-border-color", @"font", @"add-image", @"remove-image"]];
 }
 
 - (id)initWithFrame:(CGRect)frame
@@ -799,7 +800,7 @@ TODO: implement
 */
 - (CPPredicate)predicateForRow:(CPInteger)aRow
 {
-    var predicateParts = @{},
+    var predicateParts = [CPDictionary dictionary],
         items = [self criteriaForRow:aRow],
         count = [items count],
         predicate,
@@ -1395,10 +1396,7 @@ TODO: implement
     {
         var item = [items objectAtIndex:i],
             value = [values objectAtIndex:i],
-            itemAndValue = @{
-                    "item": item,
-                    "value": value,
-                };
+            itemAndValue = [CPDictionary dictionaryWithObjects:[item, value] forKeys:["item", "value"]];
 
         [itemsAndValues addObject:itemAndValue];
     }
@@ -1514,10 +1512,23 @@ TODO: implement
             oldRows = [CPArray arrayWithArray:newRows];
             [oldRows removeObjectsInArray:changeNewValue];
         }
+        else if (changeKind === CPKeyValueChangeRemoval)
+        {
+            newRows = [self _subrowObjectsOfObject:object];
+            oldRows = [CPArray arrayWithArray:newRows];
+            var delIndexes = [change objectForKey:CPKeyValueChangeIndexesKey];
+            [oldRows insertObjects:delObjects atIndexes:changeOldValue];    // Pas sur que ce soit bon
+        }
 
         [self _changedRowArray:newRows withOldRowArray:oldRows forParent:object];
         [self _reconfigureSubviewsAnimate:[self _wantsRowAnimations]];
     }
+    else if (context === itemsContext)
+    {
+    }
+    else if (context === valuesContext)
+    {
+    }
 }
 
 - (void)_changedItem:(id)fromItem toItem:(id)toItem inRow:(int)aRow atCriteriaIndex:(int)fromItemIndex
@@ -1692,8 +1703,8 @@ TODO: implement
 
 - (void)_setBoundDataSource:(id)datasource withKeyPath:(CPString)keyPath options:(CPDictionary)options
 {
-    if ([datasource respondsToSelector:@selector(objectClass)])
-        _rowClass = [datasource objectClass];
+    if ([observableController respondsToSelector:@selector(objectClass)])
+        _rowClass = [observableController objectClass];
 
     _boundArrayKeyPath = keyPath;
     _boundArrayOwner = datasource;
@@ -1782,7 +1793,7 @@ TODO: implement
 
         if (animate)
         {
-            var animation = @{};
+            var animation = [CPDictionary dictionary];
             [animation setObject:aslice forKey:CPViewAnimationTargetKey];
             [animation setObject:startRect forKey:CPViewAnimationStartFrameKey];
             [animation setObject:targetRect forKey:CPViewAnimationEndFrameKey];
@@ -1877,17 +1888,17 @@ TODO: implement
 
 - (CPString)_toolTipForAddCompoundRowButton
 {
-    return [_standardLocalizer localizedStringForString:@"Add compound row"];
+    return @"Add Compound row";
 }
 
 - (CPString)_toolTipForAddSimpleRowButton
 {
-    return [_standardLocalizer localizedStringForString:@"Add row"];
+    return @"Add row";
 }
 
 - (CPString)_toolTipForDeleteRowButton
 {
-    return [_standardLocalizer localizedStringForString:@"Delete row"];
+    return @"Delete row";
 }
 
 - (void)_updateSliceIndentations
@@ -2047,7 +2058,7 @@ TODO: implement
     [super setNeedsDisplay:flag];
 }
 
-- (void)setFrameSize:(CGSize)size
+- (void)setFrameSize:(CPSize)size
 {
     [self setNeedsDisplay:YES];
 
@@ -2115,7 +2126,7 @@ TODO: implement
     [dragview setBackgroundColor:[firstSlice backgroundColor]];
     [dragview setAlphaValue:0.7];
 
-    dragPoint = CGPointMake(0, firstIndex * _sliceHeight);
+    dragPoint = CPMakePoint(0, firstIndex * _sliceHeight);
 
     [self dragView:dragview
                 at:dragPoint
@@ -2177,7 +2188,7 @@ TODO: implement
         if (_subviewIndexOfDropLine !== CPNotFound && _subviewIndexOfDropLine < numberOfRows)
         {
             var previousBelowSlice = [_slices objectAtIndex:_subviewIndexOfDropLine];
-            [previousBelowSlice setFrameOrigin:CGPointMake(0, [previousBelowSlice rowIndex] * _sliceHeight)];
+            [previousBelowSlice setFrameOrigin:CPMakePoint(0, [previousBelowSlice rowIndex] * _sliceHeight)];
         }
 
         if (indexOfDropLine <= _lastRow && indexOfDropLine < numberOfRows)
@@ -2243,7 +2254,7 @@ TODO: implement
     return [CPIndexSet indexSetWithIndex:CPDragOperationMove];
 }
 
-- (void)draggedView:(CPView)dragView endedAt:(CGPoint)aPoint operation:(CPDragOperation)operation
+- (void)draggedView:(CPView)dragView endedAt:(CPPoint)aPoint operation:(CPDragOperation)operation
 {
     _draggingRows = nil;
 
@@ -2279,7 +2290,7 @@ TODO: implement
 
 - (void)_postRowCountChangedNotificationOfType:(CPString)notificationName indexes:indexes
 {
-    var userInfo = @{ "indexes": indexes };
+    var userInfo = [CPDictionary dictionaryWithObject:indexes forKey:"indexes"];
     [[CPNotificationCenter defaultCenter] postNotificationName:notificationName object:self userInfo:userInfo];
 }
 
@@ -2567,7 +2578,7 @@ var dropSeparatorColor = [CPColor colorWithHexString:@"4886ca"];
 {
 }
 
-- (void)drawRect:(CGRect)rect
+- (void)drawRect:(CPRect)rect
 {
     var context = [[CPGraphicsContext currentContext] graphicsPort];
     CGContextSetFillColor(context, dropSeparatorColor);

AppKit/CPRuleEditor/CPRuleEditor_Constants.j

@@ -1,40 +0,0 @@
-/*
- * CPRuleEditor_Constants.j
- * AppKit
- *
- * Created by cacaodev.
- * Copyright 2011, cacaodev.
- *
- * 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
- */
-
-CPRuleEditorPredicateLeftExpression     = "CPRuleEditorPredicateLeftExpression";
-CPRuleEditorPredicateRightExpression    = "CPRuleEditorPredicateRightExpression";
-CPRuleEditorPredicateComparisonModifier = "CPRuleEditorPredicateComparisonModifier";
-CPRuleEditorPredicateOptions            = "CPRuleEditorPredicateOptions";
-CPRuleEditorPredicateOperatorType       = "CPRuleEditorPredicateOperatorType";
-CPRuleEditorPredicateCustomSelector     = "CPRuleEditorPredicateCustomSelector";
-CPRuleEditorPredicateCompoundType       = "CPRuleEditorPredicateCompoundType";
-
-CPRuleEditorRowsDidChangeNotification   = "CPRuleEditorRowsDidChangeNotification";
-CPRuleEditorRulesDidChangeNotification  = "CPRuleEditorRulesDidChangeNotification";
-
-CPRuleEditorNestingModeSingle   = 0;        // Only a single row is allowed.  Plus/minus buttons will not be shown
-CPRuleEditorNestingModeList     = 1;        // Allows a single list, with no nesting and no compound rows
-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
-
-CPRuleEditorRowTypeSimple       = 0;
-CPRuleEditorRowTypeCompound     = 1;

AppKit/CPRuleEditor/_CPPredicateEditorRowNode.j

@@ -1,25 +1,9 @@
 /*
- * 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
+ *     Created by cacaodev@gmail.com.
+ *     Copyright (c) 2011 Pear, Inc. All rights reserved.
  */
 
-@import <Foundation/CPObject.j>
-@import <Foundation/CPString.j>
-
+@class _CPPredicateEditorTree;
 @implementation _CPPredicateEditorRowNode : CPObject
 {
     _CPPredicateEditorTree                   tree @accessors;

AppKit/CPRuleEditor/_CPPredicateEditorTree.j

@@ -1,25 +1,8 @@
 /*
- * 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
+ *     Created by cacaodev@gmail.com.
+ *     Copyright (c) 2011 Pear, Inc. All rights reserved.
  */
 
-@import <Foundation/CPObject.j>
-@import <Foundation/CPString.j>
-
 @implementation _CPPredicateEditorTree : CPObject
 {
     CPPredicateEditorRowTemplate         template @accessors;

AppKit/CPRuleEditor/_CPRuleEditorLocalizer.j

@@ -1,27 +1,11 @@
 /*
- * 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
+ *     Created by cacaodev@gmail.com.
+ *     Copyright (c) 2011 Pear, Inc. All rights reserved.
  */
 
 @import <Foundation/CPObject.j>
 @import <Foundation/CPDictionary.j>
 @import <Foundation/CPString.j>
-@import <Foundation/CPURLConnection.j>
-@import <Foundation/CPURLRequest.j>
 
 var LocalizerStringsRegex = new RegExp("\"(.+)\"\\s*=\\s*\"(.+)\"\\s*;\\s*(//.+)?");
 
@@ -29,7 +13,7 @@ var LocalizerStringsRegex = new RegExp("\"(.+)\"\\s*=\\s*\"(.+)\"\\s*;\\s*(//.+)
 {
     CPDictionary    _dictionary @accessors(property=dictionary);
     CPURLConnection connection;
-    CPURLRequest    request;
+    CPURLRequest    resquest;
 }
 
 - (void)loadContentOfURL:(CPURL)aURL
@@ -59,7 +43,7 @@ var LocalizerStringsRegex = new RegExp("\"(.+)\"\\s*=\\s*\"(.+)\"\\s*;\\s*(//.+)
 
 - (void)loadContent:(CPString)aContent
 {
-    var dict = @{},
+    var dict = [CPDictionary dictionary],
         lines = [aContent componentsSeparatedByString:"\n"],
         count = [lines count];
 
@@ -93,5 +77,3 @@ var LocalizerStringsRegex = new RegExp("\"(.+)\"\\s*=\\s*\"(.+)\"\\s*;\\s*(//.+)
 
     return aString;
 }
-
-@end

AppKit/CPRuleEditor/_CPRuleEditorPopUpButton.j

@@ -1,27 +1,8 @@
 /*
- * 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
+ *     Created by cacaodev@gmail.com.
+ *     Copyright (c) 2011 Pear, Inc. All rights reserved.
  */
 
-@import "CPBezierPath.j"
-@import "CPPopUpButton.j"
-
-@class _CPRuleEditorViewSlice
-
 var GRADIENT_START_COLOR = "#fcfcfc",
     GRADIENT_END_COLOR = "#dfdfdf",
     BORDER_COLOR = "#BDBDBD";
@@ -63,11 +44,9 @@ else if (CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
 {
     [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
@@ -86,9 +65,9 @@ else if (CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
     return self;
 }
 
-- (id)hitTest:(CGPoint)point
+- (id)hitTest:(CPPoint)point
 {
-    if (!CGRectContainsPoint([self frame], point) || ![self sliceIsEditable])
+    if (!CPRectContainsPoint([self frame], point) || ![self sliceIsEditable])
         return nil;
 
     return self;
@@ -119,13 +98,11 @@ else if (CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
 
 - (void)layoutSubviews
 {
-#if PLATFORM(DOM)
     radius = FLOOR(CGRectGetHeight([self bounds]) / 2);
     var style = _DOMElement.style,
         radiusCSS = radius + "px";
 
     style.borderRadius = radiusCSS;
-#endif
 
     [super layoutSubviews];
 }
@@ -162,11 +139,9 @@ else if (CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
 {
     [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
@@ -187,7 +162,6 @@ else if (CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
 
 - (void)layoutSubviews
 {
-#if PLATFORM(DOM)
     radius = FLOOR(CGRectGetHeight([self bounds]) / 2);
 
     var style = _DOMElement.style,
@@ -195,7 +169,6 @@ else if (CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
 
     style.borderRadius = radiusCSS;
     style[GRADIENT_PROPERTY] = ([self isHighlighted]) ? GRADIENT_HIGHLIGHTED : GRADIENT_NORMAL;
-#endif
 
     [super layoutSubviews];
 }

AppKit/CPRuleEditor/_CPRuleEditorViewSlice.j

@@ -1,34 +1,17 @@
 /*
- * 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
+ *     Created by cacaodev@gmail.com.
+ *     Copyright (c) 2011 Pear, Inc. All rights reserved.
  */
 
-@import "CPView.j"
-
 @implementation _CPRuleEditorViewSlice : CPView
 {
     CPRuleEditor _ruleEditor;
     int          _indentation           @accessors(property=indentation);
     int          _rowIndex              @accessors(property=rowIndex);
-    CGRect       _animationTargetRect   @accessors(property=_animationTargetRect);
+    CPRect       _animationTargetRect   @accessors(property=_animationTargetRect);
     BOOL         _selected              @accessors(getter=_isSelected, setter=_setSelected:);
     BOOL         _lastSelected          @accessors(getter=_isLastSelected, setter=_setLastSelected:);
     CPColor      _backgroundColor       @accessors(property=backgroundColor);
-    BOOL         _editable              @accessors(getter=isEditable, setter=setEditable:);
 }
 
 - (void)removeFromSuperview
@@ -58,14 +41,14 @@
     _selected = select;
 }
 
-- (void)drawRect:(CGRect)rect
+- (void)drawRect:(CPRect)rect
 {
     var context = [[CPGraphicsContext currentContext] graphicsPort],
         bounds = [self bounds],
         maxX = CGRectGetWidth(bounds),
         maxY = CGRectGetHeight(bounds);
 
-    // Draw background
+// Draw background
     if ([self _isSelected])
         _backgroundColor = [_ruleEditor _selectedRowColor];
     else
@@ -78,33 +61,33 @@
     CGContextSetFillColor(context, _backgroundColor);
     CGContextFillRect(context, rect);
 
-    // Draw Top Border
+// Draw Top Border
     CGContextBeginPath(context);
     CGContextMoveToPoint(context, 0, 0);
     CGContextAddLineToPoint(context, maxX, 0);
+    CGContextClosePath(context);
     CGContextSetStrokeColor(context, [_ruleEditor _sliceTopBorderColor]);
     CGContextStrokePath(context);
 
-    // Draw Bottom Border
+// Draw Bottom Border
     CGContextBeginPath(context);
     CGContextMoveToPoint(context, 0, maxY);
     CGContextAddLineToPoint(context, maxX, maxY);
-
+    CGContextClosePath(context);
     var bottomColor = (_rowIndex == [_ruleEditor _lastRow]) ? [_ruleEditor _sliceLastBottomBorderColor] : [_ruleEditor _sliceBottomBorderColor];
-
     CGContextSetStrokeColor(context, bottomColor);
     CGContextStrokePath(context);
 }
 
 - (void)mouseDown:(CPEvent)theEvent
 {
-    if (_editable)
+    if (editable)
         [_ruleEditor _mouseDownOnSlice:self withEvent:theEvent];
 }
 
 - (void)mouseUp:(CPEvent)theEvent
 {
-    if (_editable)
+    if (editable)
         [_ruleEditor _mouseUpOnSlice:self withEvent:theEvent];
 }
 

AppKit/CPRuleEditor/_CPRuleEditorViewSliceRow.j

@@ -1,27 +1,11 @@
 /*
- * 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
+ *     Created by cacaodev@gmail.com.
+ *     Copyright (c) 2011 Pear, Inc. All rights reserved.
  */
 
-@import "CPRuleEditor_Constants.j"
 @import "_CPRuleEditorViewSlice.j"
 @import "_CPRuleEditorPopUpButton.j"
-
-@global CPApp
+@import "CPRuleEditor.j"
 
 var CONTROL_HEIGHT = 16.,
     BUTTON_HEIGHT = 16.;
@@ -34,7 +18,7 @@ var CONTROL_HEIGHT = 16.,
     CPMutableArray  _ruleOptionInitialViewFrames;
     CPButton        _addButton;
     CPButton        _subtractButton;
-
+    BOOL            editable;
     CPRuleEditorRowType _rowType @accessors;
     CPRuleEditorRowType _plusButtonRowType;
 }
@@ -53,14 +37,14 @@ var CONTROL_HEIGHT = 16.,
     _ruleOptionFrames = [[CPMutableArray alloc] init];
     _ruleOptionInitialViewFrames = [[CPMutableArray alloc] init];
     _ruleOptionViews = [[CPMutableArray alloc] init];
-     _editable = [_ruleEditor isEditable];
+     editable = [_ruleEditor isEditable];
 
     _addButton = [self _createAddRowButton];
     _subtractButton = [self _createDeleteRowButton];
     [_addButton setToolTip:[_ruleEditor _toolTipForAddSimpleRowButton]];
     [_subtractButton setToolTip:[_ruleEditor _toolTipForDeleteRowButton]];
-    [_addButton setHidden:!_editable];
-    [_subtractButton setHidden:!_editable];
+    [_addButton setHidden:!editable];
+    [_subtractButton setHidden:!editable];
     [self addSubview:_addButton];
     [self addSubview:_subtractButton];
 
@@ -139,16 +123,15 @@ var CONTROL_HEIGHT = 16.,
 
 - (_CPRuleEditorTextField)_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];
+    var textField = [[_CPRuleEditorTextField alloc] initWithFrame:CPMakeRect(0, 0, 200, CONTROL_HEIGHT)],
+        refont = [_ruleEditor font],
+        font = [CPFont fontWithName:[refont familyName] size:[refont size] + 2],
 
-    [textField setFrameSize:CGSizeMake(size.width + 4, CONTROL_HEIGHT + 2)];
+        localizedText = [[_ruleEditor standardLocalizer] localizedStringForString:text];
 
     [textField setValue:font forThemeAttribute:@"font"];
     [textField setStringValue:localizedText];
+    [textField sizeToFit];
 
     return textField;
 }
@@ -271,11 +254,7 @@ var CONTROL_HEIGHT = 16.,
                     }
                 }
 
-                repObject = @{
-                        @"item": childItem,
-                        @"value": childValue,
-                        @"indexInCriteria": i
-                    };
+                repObject = [CPDictionary dictionaryWithObjectsAndKeys:childItem, @"item", childValue, @"value", i, @"indexInCriteria"];
                 [menuItem setRepresentedObject:repObject];
                 [menuItems addObject:menuItem];
             }
@@ -321,7 +300,7 @@ var CONTROL_HEIGHT = 16.,
 
     [_correspondingRuleItems setArray:ruleItems];
 
-    if (!_editable)
+    if (!editable)
         [self _updateEnabledStateForSubviews];
 
     [self _relayoutSubviewsWidthChanged:YES];
@@ -374,6 +353,14 @@ var CONTROL_HEIGHT = 16.,
 
         optionFrame.origin.y = (rowHeight - CGRectGetHeight(optionFrame)) / 2 - 2;
 
+        // small positioning fix
+        if ([ruleOptionView isKindOfClass:CPTextField])
+        {
+            optionFrame.origin.y += 2;
+            [_ruleOptionViews[i] setValue:CGInsetMake(7, 7, 7, 8) forThemeAttribute:@"content-inset"];
+        }
+
+
         if (widthChanged)
         {
             optionFrame.origin.x = optionViewOriginX;
@@ -403,9 +390,14 @@ var CONTROL_HEIGHT = 16.,
     [self _setRowTypeToAddFromPlusButton:type];
 }
 
+- (BOOL)isEditable
+{
+    return editable;
+}
+
 - (void)setEditable:(BOOL)value
 {
-    [super setEditable:value]
+    editable = value;
 //  [self _updateEnabledStateForSubviews];
     [self _updateButtonVisibilities];
 }
@@ -481,7 +473,7 @@ var CONTROL_HEIGHT = 16.,
     [self layoutSubviews];
 }
 
-- (void)drawRect:(CGRect)rect
+- (void)drawRect:(CPRect)rect
 {
     [super drawRect:rect];
 }
@@ -493,6 +485,13 @@ var CONTROL_HEIGHT = 16.,
     return NO;
 }
 
+- (BOOL)_isRuleStaticTextField:(CPView)view
+{
+    if ([view isKindOfClass:[_CPRuleEditorTextField class]])
+        return YES;
+    return NO;
+}
+
 - (void)_sendRuleAction:(id)sender
 {
     [_ruleEditor _updatePredicate];
@@ -514,17 +513,19 @@ var CONTROL_HEIGHT = 16.,
 - (id)initWithFrame:(CGRect)frame
 {
     self = [super initWithFrame:frame];
-    if (self)
+    if (self != nil)
     {
+        [self setBordered:NO];
+        [self setEditable:NO];
         [self setDrawsBackground:NO];
     }
 
     return self;
 }
 
-- (id)hitTest:(CGPoint)point
+- (id)hitTest:(CPPoint)point
 {
-    if (!CGRectContainsPoint([self frame], point))
+    if (!CPRectContainsPoint([self frame], point))
         return nil;
 
     return [self superview];

AppKit/CPScrollView.j

@@ -143,10 +143,10 @@ var CPScrollerStyleGlobal                       = CPScrollerStyleOverlay,
 
 + (CPDictionary)themeAttributes
 {
-    return @{
-            @"bottom-corner-color": [CPColor whiteColor],
-            @"border-color": [CPColor blackColor]
-        };
+    return [CPDictionary dictionaryWithJSObject:{
+        @"bottom-corner-color": [CPColor whiteColor],
+        @"border-color": [CPColor blackColor]
+    }];
 }
 
 + (CGSize)contentSizeForFrameSize:(CGSize)frameSize hasHorizontalScroller:(BOOL)hFlag hasVerticalScroller:(BOOL)vFlag borderType:(CPBorderType)borderType
@@ -1112,8 +1112,8 @@ Notifies the delegate when the scroll view has finished scrolling.
     contentFrame.size.height -= headerClipViewHeight;
 
     var difference = _CGSizeMake(_CGRectGetWidth(documentFrame) - _CGRectGetWidth(contentFrame), _CGRectGetHeight(documentFrame) - _CGRectGetHeight(contentFrame)),
-        verticalScrollerWidth = [CPScroller scrollerWidthInStyle:[_verticalScroller style]],
-        horizontalScrollerHeight = [CPScroller scrollerWidthInStyle:[_horizontalScroller style]],
+        verticalScrollerWidth = _CGRectGetWidth([_verticalScroller frame]),
+        horizontalScrollerHeight = _CGRectGetHeight([_horizontalScroller frame]),
         hasVerticalScroll = difference.height > 0.0,
         hasHorizontalScroll = difference.width > 0.0,
         shouldShowVerticalScroller = _hasVerticalScroller && (!_autohidesScrollers || hasVerticalScroll),
@@ -1256,7 +1256,7 @@ Notifies the delegate when the scroll view has finished scrolling.
 #pragma mark -
 #pragma mark Overrides
 
-- (void)drawRect:(CGRect)aRect
+- (void)drawRect:(CPRect)aRect
 {
     [super drawRect:aRect];
 

AppKit/CPScroller.j

@@ -25,12 +25,7 @@
 
 #include "../Foundation/Foundation.h"
 
-@import "CPAnimation.j"
 @import "CPControl.j"
-@import "CPWindow_Constants.j"
-@import "CPViewAnimation.j"
-
-@global CPApp
 
 // CPScroller Constants
 CPScrollerNoPart            = 0;
@@ -57,8 +52,6 @@ var PARTS_ARRANGEMENT   = [CPScrollerKnobSlot, CPScrollerDecrementLine, CPScroll
     NAMES_FOR_PARTS     = {},
     PARTS_FOR_NAMES     = {};
 
-var _CACHED_THEME_SCROLLER = nil; // This is used by the class methods to pull the theme attributes.
-
 NAMES_FOR_PARTS[CPScrollerDecrementLine]    = @"decrement-line";
 NAMES_FOR_PARTS[CPScrollerIncrementLine]    = @"increment-line";
 NAMES_FOR_PARTS[CPScrollerKnobSlot]         = @"knob-slot";
@@ -110,19 +103,19 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
 
 + (id)themeAttributes
 {
-    return @{
-            @"scroller-width": 7.0,
-            @"knob-slot-color": [CPNull null],
-            @"decrement-line-color": [CPNull null],
-            @"increment-line-color": [CPNull null],
-            @"knob-color": [CPNull null],
-            @"decrement-line-size":_CGSizeMakeZero(),
-            @"increment-line-size":_CGSizeMakeZero(),
-            @"track-inset":_CGInsetMakeZero(),
-            @"knob-inset": _CGInsetMakeZero(),
-            @"minimum-knob-length":21.0,
-            @"track-border-overlay": 9.0
-        };
+    return [CPDictionary dictionaryWithJSObject:{
+        @"scroller-width": 7.0,
+        @"knob-slot-color": [CPNull null],
+        @"decrement-line-color": [CPNull null],
+        @"increment-line-color": [CPNull null],
+        @"knob-color": [CPNull null],
+        @"decrement-line-size":_CGSizeMakeZero(),
+        @"increment-line-size":_CGSizeMakeZero(),
+        @"track-inset":_CGInsetMakeZero(),
+        @"knob-inset": _CGInsetMakeZero(),
+        @"minimum-knob-length":21.0,
+        @"track-border-overlay": 9.0
+    }];
 }
 
 + (float)scrollerWidth
@@ -135,13 +128,11 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
 */
 + (float)scrollerWidthInStyle:(int)aStyle
 {
-    if (!_CACHED_THEME_SCROLLER)
-        _CACHED_THEME_SCROLLER = [[self alloc] init];
+    var scroller = [[self alloc] init];
 
     if (aStyle == CPScrollerStyleLegacy)
-        return [_CACHED_THEME_SCROLLER valueForThemeAttribute:@"scroller-width" inState:CPThemeStateScrollViewLegacy];
-
-    return [_CACHED_THEME_SCROLLER currentValueForThemeAttribute:@"scroller-width"];
+        return [scroller valueForThemeAttribute:@"scroller-width" inState:CPThemeStateScrollViewLegacy];
+    return [scroller currentValueForThemeAttribute:@"scroller-width"];
 }
 
 /*!
@@ -149,10 +140,7 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
 */
 + (float)scrollerOverlay
 {
-    if (!_CACHED_THEME_SCROLLER)
-        _CACHED_THEME_SCROLLER = [[self alloc] init];
-
-    return [_CACHED_THEME_SCROLLER currentValueForThemeAttribute:@"track-border-overlay"];
+    return [[[self alloc] init] currentValueForThemeAttribute:@"track-border-overlay"];
 }
 
 /*!
@@ -182,19 +170,14 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
         _allowFadingOut = YES;
         _isMouseOver = NO;
         _style = CPScrollerStyleOverlay;
-        var paramAnimFadeOut = @{
-                CPViewAnimationTargetKey: self,
-                CPViewAnimationEffectKey: CPViewAnimationFadeOutEffect,
-            };
+        var paramAnimFadeOut   = [CPDictionary dictionaryWithObjects:[self, CPViewAnimationFadeOutEffect]
+                                                          forKeys:[CPViewAnimationTargetKey, CPViewAnimationEffectKey]];
 
         _animationScroller = [[CPViewAnimation alloc] initWithDuration:0.2 animationCurve:CPAnimationEaseInOut];
         [_animationScroller setViewAnimations:[paramAnimFadeOut]];
         [_animationScroller setDelegate:self];
         [self setAlphaValue:0.0];
-
-        // We have to choose an orientation. If for some bizarre reason width === height,
-        // punt and choose vertical.
-        [self _setIsVertical:_CGRectGetHeight(aFrame) >= _CGRectGetWidth(aFrame)];
+        [self _calculateIsVertical];
     }
 
     return self;
@@ -234,7 +217,7 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
         [self unsetThemeState:CPThemeStateScrollViewLegacy];
     }
 
-    //[self _adjustScrollerSize];
+    [self _adjustScrollerSize];
 }
 
 - (void)setObjectValue:(id)aValue
@@ -540,7 +523,6 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
 
 - (void)layoutSubviews
 {
-    [self _adjustScrollerSize];
     [self checkSpaceForParts];
 
     var index = 0,
@@ -651,13 +633,13 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
 
         if ([anEvent modifierFlags] & CPAlternateKeyMask)
         {
-            if (_trackingPart === CPScrollerDecrementLine)
+            if (_trackingPart == CPScrollerDecrementLine)
                 _hitPart = CPScrollerDecrementPage;
 
-            else if (_trackingPart === CPScrollerIncrementLine)
+            else if (_trackingPart == CPScrollerIncrementLine)
                 _hitPart = CPScrollerIncrementPage;
 
-            else if (_trackingPart === CPScrollerDecrementPage || _trackingPart === CPScrollerIncrementPage)
+            else if (_trackingPart == CPScrollerDecrementPage || _trackingPart == CPScrollerIncrementPage)
             {
                 var knobRect = [self rectForPart:CPScrollerKnob],
                     knobWidth = ![self isVertical] ? _CGRectGetWidth(knobRect) : _CGRectGetHeight(knobRect),
@@ -685,11 +667,11 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
     {
         _trackingStartPoint = [self convertPoint:[anEvent locationInWindow] fromView:nil];
 
-        if (_trackingPart === CPScrollerDecrementPage || _trackingPart === CPScrollerIncrementPage)
+        if (_trackingPart == CPScrollerDecrementPage || _trackingPart == CPScrollerIncrementPage)
         {
             var hitPart = [self testPart:[anEvent locationInWindow]];
 
-            if (hitPart === CPScrollerDecrementPage || hitPart === CPScrollerIncrementPage)
+            if (hitPart == CPScrollerDecrementPage || hitPart == CPScrollerIncrementPage)
             {
                 _trackingPart = hitPart;
                 _hitPart = hitPart;
@@ -705,13 +687,18 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
 
 }
 
-- (void)_setIsVertical:(BOOL)isVertical
+- (void)_calculateIsVertical
 {
-    _isVertical = isVertical;
+    // Recalculate isVertical.
+    var bounds = [self bounds],
+        width = _CGRectGetWidth(bounds),
+        height = _CGRectGetHeight(bounds);
 
-    if (_isVertical)
+    _isVertical = width < height ? 1 : (width > height ? 0 : -1);
+
+    if (_isVertical === 1)
         [self setThemeState:CPThemeStateVertical];
-    else
+    else if (_isVertical === 0)
         [self unsetThemeState:CPThemeStateVertical];
 }
 
@@ -746,14 +733,12 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
 
     switch (_hitPart)
     {
-        case CPScrollerKnob:
-            return [self trackKnob:anEvent];
+        case CPScrollerKnob:            return [self trackKnob:anEvent];
 
         case CPScrollerDecrementLine:
         case CPScrollerIncrementLine:
         case CPScrollerDecrementPage:
-        case CPScrollerIncrementPage:
-            return [self trackScrollButtons:anEvent];
+        case CPScrollerIncrementPage:   return [self trackScrollButtons:anEvent];
     }
 }
 
@@ -801,10 +786,9 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
 
 @end
 
-var CPScrollerControlSizeKey    = @"CPScrollerControlSize",
-    CPScrollerIsVerticalKey     = @"CPScrollerIsVerticalKey",
+var CPScrollerControlSizeKey = @"CPScrollerControlSize",
     CPScrollerKnobProportionKey = @"CPScrollerKnobProportion",
-    CPScrollerStyleKey          = @"CPScrollerStyleKey";
+    CPScrollerStyleKey = @"CPScrollerStyleKey";
 
 @implementation CPScroller (CPCoding)
 
@@ -813,6 +797,7 @@ var CPScrollerControlSizeKey    = @"CPScrollerControlSize",
     if (self = [super initWithCoder:aCoder])
     {
         _controlSize = CPRegularControlSize;
+
         if ([aCoder containsValueForKey:CPScrollerControlSizeKey])
             _controlSize = [aCoder decodeIntForKey:CPScrollerControlSizeKey];
 
@@ -828,19 +813,17 @@ var CPScrollerControlSizeKey    = @"CPScrollerControlSize",
         _allowFadingOut = YES;
         _isMouseOver = NO;
 
-        var paramAnimFadeOut = @{
-                CPViewAnimationTargetKey: self,
-                CPViewAnimationEffectKey: CPViewAnimationFadeOutEffect,
-            };
+        var paramAnimFadeOut = [CPDictionary dictionaryWithObjects:[self, CPViewAnimationFadeOutEffect]
+                                                           forKeys:[CPViewAnimationTargetKey, CPViewAnimationEffectKey]];
 
         _animationScroller = [[CPViewAnimation alloc] initWithDuration:0.2 animationCurve:CPAnimationEaseInOut];
         [_animationScroller setViewAnimations:[paramAnimFadeOut]];
         [_animationScroller setDelegate:self];
         [self setAlphaValue:0.0];
 
-        [self setStyle:[aCoder decodeIntForKey:CPScrollerStyleKey]];
+        [self _calculateIsVertical];
 
-        [self _setIsVertical:[aCoder decodeBoolForKey:CPScrollerIsVerticalKey]];
+        [self setStyle:[aCoder decodeIntForKey:CPScrollerStyleKey]];
     }
 
     return self;
@@ -851,7 +834,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

@@ -21,19 +21,22 @@
  */
 
 @import "CPButton.j"
-@import "CPMenu.j"
-@import "CPMenuItem.j"
 @import "CPTextField.j"
 
-@class CPUserDefaults
-
-@global CPApp
-
 CPSearchFieldRecentsTitleMenuItemTag    = 1000;
 CPSearchFieldRecentsMenuItemTag         = 1001;
 CPSearchFieldClearRecentsMenuItemTag    = 1002;
 CPSearchFieldNoRecentsMenuItemTag       = 1003;
 
+var CPSearchFieldSearchImage = nil,
+    CPSearchFieldFindImage = nil,
+    CPSearchFieldCancelImage = nil,
+    CPSearchFieldCancelPressedImage = nil;
+
+var SEARCH_BUTTON_DEFAULT_WIDTH = 25.0,
+    CANCEL_BUTTON_DEFAULT_WIDTH = 22.0,
+    BUTTON_DEFAULT_HEIGHT = 22.0;
+
 var CPAutosavedRecentsChangedNotification = @"CPAutosavedRecentsChangedNotification";
 
 var RECENT_SEARCH_PREFIX = @"   ";
@@ -67,14 +70,16 @@ var RECENT_SEARCH_PREFIX = @"   ";
     return @"searchfield"
 }
 
-+ (CPDictionary)themeAttributes
++ (void)initialize
 {
-    return @{
-            @"image-search": [CPNull null],
-            @"image-find": [CPNull null],
-            @"image-cancel": [CPNull null],
-            @"image-cancel-pressed": [CPNull null]
-        };
+    if (self !== [CPSearchField class])
+        return;
+
+    var bundle = [CPBundle bundleForClass:self];
+    CPSearchFieldSearchImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPSearchField/CPSearchFieldSearch.png"] size:_CGSizeMake(SEARCH_BUTTON_DEFAULT_WIDTH, BUTTON_DEFAULT_HEIGHT)];
+    CPSearchFieldFindImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPSearchField/CPSearchFieldFind.png"] size:_CGSizeMake(SEARCH_BUTTON_DEFAULT_WIDTH, BUTTON_DEFAULT_HEIGHT)];
+    CPSearchFieldCancelImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPSearchField/CPSearchFieldCancel.png"] size:_CGSizeMake(CANCEL_BUTTON_DEFAULT_WIDTH, BUTTON_DEFAULT_HEIGHT)];
+    CPSearchFieldCancelPressedImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPSearchField/CPSearchFieldCancelPressed.png"] size:_CGSizeMake(CANCEL_BUTTON_DEFAULT_WIDTH, BUTTON_DEFAULT_HEIGHT)];
 }
 
 - (id)initWithFrame:(CGRect)frame
@@ -165,7 +170,7 @@ var RECENT_SEARCH_PREFIX = @"   ";
 - (void)resetSearchButton
 {
     var button = [self searchButton],
-        searchButtonImage = (_searchMenuTemplate === nil) ? [self valueForThemeAttribute:@"image-search"] : [self valueForThemeAttribute:@"image-find"];
+        searchButtonImage = (_searchMenuTemplate === nil) ? CPSearchFieldSearchImage : CPSearchFieldFindImage;
 
     [button setBordered:NO];
     [button setImageScaling:CPImageScaleAxesIndependently];
@@ -188,7 +193,6 @@ var RECENT_SEARCH_PREFIX = @"   ";
         [_cancelButton setAutoresizingMask:CPViewMinXMargin];
         [_cancelButton setTarget:self];
         [_cancelButton setAction:@selector(cancelOperation:)];
-        [_cancelButton setButtonType:CPMomentaryChangeButton];
         [self _updateCancelButtonVisibility];
         [self addSubview:_cancelButton];
     }
@@ -212,8 +216,8 @@ var RECENT_SEARCH_PREFIX = @"   ";
     var button = [self cancelButton];
     [button setBordered:NO];
     [button setImageScaling:CPImageScaleAxesIndependently];
-    [button setImage:[self valueForThemeAttribute:@"image-cancel"]];
-    [button setAlternateImage:[self valueForThemeAttribute:@"image-cancel-pressed"]];
+    [button setImage:CPSearchFieldCancelImage];
+    [button setAlternateImage:CPSearchFieldCancelPressedImage];
     [button setAutoresizingMask:CPViewMinXMargin];
     [button setTarget:self];
     [button setAction:@selector(cancelOperation:)];
@@ -254,9 +258,7 @@ var RECENT_SEARCH_PREFIX = @"   ";
 */
 - (CGRect)searchButtonRectForBounds:(CGRect)rect
 {
-    var size = [[self valueForThemeAttribute:@"image-search"] size] || CGSizeMakeZero();
-
-    return _CGRectMake(5, (_CGRectGetHeight(rect) - size.height) / 2, size.width, size.height);
+    return _CGRectMake(5, (_CGRectGetHeight(rect) - BUTTON_DEFAULT_HEIGHT) / 2, SEARCH_BUTTON_DEFAULT_WIDTH, BUTTON_DEFAULT_HEIGHT);
 }
 
 /*!
@@ -266,9 +268,7 @@ var RECENT_SEARCH_PREFIX = @"   ";
 */
 - (CGRect)cancelButtonRectForBounds:(CGRect)rect
 {
-    var size = [[self valueForThemeAttribute:@"image-cancel"] size] || CGSizeMakeZero();
-
-    return _CGRectMake(_CGRectGetWidth(rect) - size.width - 5, (_CGRectGetHeight(rect) - size.width) / 2, size.height, size.height);
+    return _CGRectMake(_CGRectGetWidth(rect) - CANCEL_BUTTON_DEFAULT_WIDTH - 5, (_CGRectGetHeight(rect) - CANCEL_BUTTON_DEFAULT_WIDTH) / 2, BUTTON_DEFAULT_HEIGHT, BUTTON_DEFAULT_HEIGHT);
 }
 
 // Managing Menu Templates
@@ -679,7 +679,7 @@ var RECENT_SEARCH_PREFIX = @"   ";
         return;
 
     var aFrame = [[self superview] convertRect:[self frame] toView:nil],
-        location = CGPointMake(aFrame.origin.x + 10, aFrame.origin.y + aFrame.size.height - 4);
+        location = CPMakePoint(aFrame.origin.x + 10, aFrame.origin.y + aFrame.size.height - 4);
 
     var anEvent = [CPEvent mouseEventWithType:CPRightMouseDown location:location modifierFlags:0 timestamp:[[CPApp currentEvent] timestamp] windowNumber:[[self window] windowNumber] context:nil eventNumber:1 clickCount:1 pressure:0];
 

AppKit/CPSegmentedControl.j

@@ -23,10 +23,7 @@
 @import <Foundation/CPArray.j>
 
 @import "CPControl.j"
-@import "CPWindow_Constants.j"
-@import "_CPImageAndTextView.j"
 
-@global CPApp
 
 CPSegmentSwitchTrackingSelectOne = 0;
 CPSegmentSwitchTrackingSelectAny = 1;
@@ -58,33 +55,8 @@ CPSegmentSwitchTrackingMomentary = 2;
 
 + (id)themeAttributes
 {
-    return @{
-            @"alignment": CPCenterTextAlignment,
-            @"vertical-alignment": CPCenterVerticalTextAlignment,
-            @"image-position": CPImageLeft,
-            @"image-scaling": CPImageScaleNone,
-            @"bezel-inset": _CGInsetMakeZero(),
-            @"content-inset": _CGInsetMakeZero(),
-            @"left-segment-bezel-color": [CPNull null],
-            @"right-segment-bezel-color": [CPNull null],
-            @"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);
+    return [CPDictionary dictionaryWithObjects:[CPCenterTextAlignment, CPCenterVerticalTextAlignment, CPImageLeft, CPImageScaleNone, _CGInsetMakeZero(), _CGInsetMakeZero(), [CPNull null], [CPNull null], [CPNull null], [CPNull null], 1.0, 24.0]
+                                       forKeys:[@"alignment", @"vertical-alignment", @"image-position", @"image-scaling", @"bezel-inset", @"content-inset", @"left-segment-bezel-color", @"right-segment-bezel-color", @"center-segment-bezel-color", @"divider-bezel-color", @"divider-thickness", @"default-height"]];
 }
 
 - (id)initWithFrame:(CGRect)aRect
@@ -104,19 +76,6 @@ CPSegmentSwitchTrackingMomentary = 2;
     return self;
 }
 
-- (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");
-    else
-        [super bind:aBinding toObject:anObject withKeyPath:aKeyPath options:options];
-}
-
-- (void)_reverseSetBinding
-{
-    [_CPSegmentedControlBinder reverseSetValueForObject:self];
-}
-
 /*!
     Returns the tag of the selected segment.
 */
@@ -156,15 +115,13 @@ CPSegmentSwitchTrackingMomentary = 2;
     if (_selectedSegment >= _segments.length)
         _selectedSegment = -1;
 
+    // Make space for/remove space used by dividers.
     var thickness = [self currentValueForThemeAttribute:@"divider-thickness"],
-        frame = [self frame],
-        widthOfAllSegments = 0,
-        dividerExtraSpace = ([_segments count] - 1) * thickness;
+        delta = thickness * (dividersAfter - dividersBefore),
+        frame = [self frame];
 
-    for (var i = 0; i < [_segments count]; i++)
-        widthOfAllSegments += [_segments[i] width];
-
-    [self setFrameSize:CGSizeMake(widthOfAllSegments + dividerExtraSpace, frame.size.height)];
+    if (delta)
+        [self setFrameSize:CGSizeMake(frame.size.width + delta, frame.size.height)];
 
     [self tileWithChangedSegment:0];
 }
@@ -215,21 +172,6 @@ CPSegmentSwitchTrackingMomentary = 2;
     return NO;
 }
 
-- (BOOL)_selectSegmentWithLabel:(CPString)aLabel
-{
-    var index = 0;
-
-    for (; index < _segments.length; ++index)
-        if (_segments[index].label == aLabel)
-        {
-            [self setSelectedSegment:index];
-
-            return YES;
-        }
-
-    return NO;
-}
-
 // Specifying Tracking Mode
 
 - (BOOL)isTracking
@@ -521,7 +463,7 @@ CPSegmentSwitchTrackingMomentary = 2;
     }
     else if (aName === "right-segment-bezel")
     {
-        return CGRectMake(CGRectGetWidth([self bounds]) - contentInset.right,
+        return CPRectMake(CGRectGetWidth([self bounds]) - contentInset.right,
                             bezelInset.top,
                             contentInset.right,
                             height);
@@ -857,7 +799,6 @@ CPSegmentSwitchTrackingMomentary = 2;
             return;
 
         var highlighted = [self testSegment:location] === _trackingSegment;
-
         if (highlighted != _trackingHighlighted)
         {
             _trackingHighlighted = highlighted;
@@ -944,74 +885,6 @@ var CPSegmentedControlSegmentsKey       = "CPSegmentedControlSegmentsKey",
 
 @end
 
-var CPSegmentedControlBindersMap = {},
-    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
-{
-    [super _updatePlaceholdersWithOptions:options];
-
-    [self _setPlaceholder:CPSegmentedControlNoSelectionPlaceholder forMarker:CPMultipleValuesMarker isDefault:YES];
-    [self _setPlaceholder:CPSegmentedControlNoSelectionPlaceholder forMarker:CPNoSelectionMarker isDefault:YES];
-    [self _setPlaceholder:CPSegmentedControlNoSelectionPlaceholder forMarker:CPNotApplicableMarker isDefault:YES];
-    [self _setPlaceholder:CPSegmentedControlNoSelectionPlaceholder forMarker:CPNullMarker isDefault:YES];
-}
-
-- (void)setPlaceholderValue:(id)aValue withMarker:(CPString)aMarker forBinding:(CPString)aBinding
-{
-    if (aValue == CPSegmentedControlNoSelectionPlaceholder)
-        [_source setSelected:NO forSegment:[_source selectedSegment]];
-    else
-        [self setValue:aValue forBinding:aBinding];
-}
-
-- (void)setValue:(id)aValue forBinding:(CPString)aBinding
-{
-    if (aBinding == CPSelectedIndexBinding)
-        [_source setSelectedSegment:aValue];
-    else if (aBinding == CPSelectedTagBinding)
-        [_source selectSegmentWithTag:aValue];
-    else if (aBinding == CPSelectedLabelBinding)
-        [_source _selectSegmentWithLabel:aValue];
-}
-
-- (id)valueForBinding:(CPString)aBinding
-{
-    var selectedIndex = [_source selectedSegment];
-
-    if (aBinding == CPSelectedIndexBinding)
-        return selectedIndex;
-    else if (aBinding == CPSelectedTagBinding)
-        return [_source tagForSegment:selectedIndex];
-    else if (aBinding == CPSelectedLabelBinding)
-        return [_source labelForSegment:selectedIndex];
-}
-
-@end
 
 @implementation _CPSegmentItem : CPObject
 {

AppKit/CPShadow.j

@@ -31,9 +31,11 @@
 */
 @implementation CPShadow : CPObject
 {
-    CGSize      _offset @accessors(property=shadowOffset);
-    float       _blurRadius @accessors(property=shadowBlurRadius);
-    CPColor     _color @accessors(property=shadowColor);
+    CPSize      _offset;
+    float       _blurRadius;
+    CPColor     _color;
+
+    CPString    _cssString;
 }
 
 /*!
@@ -49,7 +51,7 @@
 }
 
 /* @ignore */
-- (id)_initWithOffset:(CGSize)anOffset blurRadius:(float)aBlurRadius color:(CPColor)aColor
+- (id)_initWithOffset:(CPSize)anOffset blurRadius:(float)aBlurRadius color:(CPColor)aColor
 {
     self = [super init];
 
@@ -58,16 +60,35 @@
         _offset = anOffset;
         _blurRadius = aBlurRadius;
         _color = aColor;
+
+        _cssString = [_color cssString] + " " + ROUND(anOffset.width) + @"px " + ROUND(anOffset.height) + @"px " + ROUND(_blurRadius) + @"px";
     }
 
     return self;
 }
 
-- (void)set
+/*!
+    Returns the shadow's offset.
+*/
+- (CGSize)shadowOffset
 {
-   var context = [[CPGraphicsContext currentContext] graphicsPort];
+    return _offset;
+}
 
-   CGContextSetShadowWithColor(context, _offset, _blurRadius, _color);
+/*!
+    Returns the shadow's blur radius
+*/
+- (float)shadowBlurRadius
+{
+    return _blurRadius;
+}
+
+/*!
+    Returns the shadow's color.
+*/
+- (CPColor)shadowColor
+{
+    return _color;
 }
 
 /*!
@@ -75,7 +96,7 @@
 */
 - (CPString)cssString
 {
-    return [_color cssString] + " " + ROUND(_offset.width) + @"px " + ROUND(_offset.height) + @"px " + ROUND(_blurRadius) + @"px";
+    return _cssString;
 }
 
-@end
+@end

AppKit/CPShadowView.j

@@ -24,15 +24,25 @@
 
 @import "CGGeometry.j"
 @import "CPImage.j"
+@import "CPImageView.j"
 @import "CPView.j"
 
 
 CPLightShadow   = 0;
 CPHeavyShadow   = 1;
 
-CPThemeStateShadowViewLight = CPThemeState("shadowview-style-light");
-CPThemeStateShadowViewHeavy = CPThemeState("shadowview-style-heavy");
+var CPShadowViewLightBackgroundColor    = nil,
+    CPShadowViewHeavyBackgroundColor    = nil;
 
+var LIGHT_LEFT_INSET    = 3.0,
+    LIGHT_RIGHT_INSET   = 3.0,
+    LIGHT_TOP_INSET     = 3.0,
+    LIGHT_BOTTOM_INSET  = 5.0,
+
+    HEAVY_LEFT_INSET    = 7.0,
+    HEAVY_RIGHT_INSET   = 7.0,
+    HEAVY_TOP_INSET     = 5.0,
+    HEAVY_BOTTOM_INSET  = 5.0;
 
 /*!
     @ingroup appkit
@@ -42,25 +52,40 @@ CPThemeStateShadowViewHeavy = CPThemeState("shadowview-style-heavy");
     CPShadowWeight  _weight;
 }
 
-+ (CPString)defaultThemeClass
++ (void)initialize
 {
-    return "shadow-view";
-}
+    if (self !== [CPShadowView class])
+        return;
 
-+ (id)themeAttributes
-{
-    return @{
-            @"bezel-color": [CPNull null],
-            @"content-inset": CGInsetMakeZero()
-        };
-}
+    var bundle = [CPBundle bundleForClass:[self class]];
 
-+ (CGRect)frameForContentFrame:(CGRect)aFrame withWeight:(CPShadowWeight)aWeight
-{
-    var shadowView = [CPShadowView new],
-        inset = [shadowView valueForThemeAttribute:@"content-inset" inState:(aWeight == CPLightShadow) ? CPThemeStateShadowViewLight : CPThemeStateShadowViewHeavy];
+    CPShadowViewLightBackgroundColor = CPColorWithImages([
+        [@"CPShadowView/CPShadowViewLightTopLeft.png", 9.0, 9.0, bundle],
+        [@"CPShadowView/CPShadowViewLightTop.png", 1.0, 9.0, bundle],
+        [@"CPShadowView/CPShadowViewLightTopRight.png", 9.0, 9.0, bundle],
 
-    return CGRectMake(_CGRectGetMinX(aFrame) - inset.left, _CGRectGetMinY(aFrame) - inset.top, _CGRectGetWidth(aFrame) + inset.left + inset.right, _CGRectGetHeight(aFrame) + inset.top + inset.bottom);
+        [@"CPShadowView/CPShadowViewLightLeft.png", 9.0, 1.0, bundle],
+        nil,
+        [@"CPShadowView/CPShadowViewLightRight.png", 9.0, 1.0, bundle],
+
+        [@"CPShadowView/CPShadowViewLightBottomLeft.png", 9.0, 9.0, bundle],
+        [@"CPShadowView/CPShadowViewLightBottom.png", 1.0, 9.0, bundle],
+        [@"CPShadowView/CPShadowViewLightBottomRight.png", 9.0, 9.0, bundle]
+    ]);
+
+    CPShadowViewHeavyBackgroundColor = CPColorWithImages([
+        [@"CPShadowView/CPShadowViewHeavyTopLeft.png", 17.0, 17.0, bundle],
+        [@"CPShadowView/CPShadowViewHeavyTop.png", 1.0, 17.0, bundle],
+        [@"CPShadowView/CPShadowViewHeavyTopRight.png", 17.0, 17.0, bundle],
+
+        [@"CPShadowView/CPShadowViewHeavyLeft.png", 17.0, 1.0, bundle],
+        nil,
+        [@"CPShadowView/CPShadowViewHeavyRight.png", 17.0, 1.0, bundle],
+
+        [@"CPShadowView/CPShadowViewHeavyBottomLeft.png", 17.0, 17.0, bundle],
+        [@"CPShadowView/CPShadowViewHeavyBottom.png", 1.0, 17.0, bundle],
+        [@"CPShadowView/CPShadowViewHeavyBottomRight.png", 17.0, 17.0, bundle]
+    ]);
 }
 
 + (id)shadowViewEnclosingView:(CPView)aView
@@ -77,16 +102,15 @@ CPThemeStateShadowViewHeavy = CPThemeState("shadowview-style-heavy");
         [shadowView setWeight:aWeight];
 
         var size = [shadowView frame].size,
-            inset = [shadowView currentValueForThemeAttribute:@"content-inset"],
-            width = size.width - inset.left - inset.right,
-            height = size.height - inset.top - inset.bottom,
+            width = size.width - [shadowView leftInset] - [shadowView rightInset],
+            height = size.height - [shadowView topInset] - [shadowView bottomInset],
             enclosingView = [aView superview];
 
         [shadowView setHitTests:[aView hitTests]];
         [shadowView setAutoresizingMask:[aView autoresizingMask]];
         [aView removeFromSuperview];
         [shadowView addSubview:aView];
-        [aView setFrame:CGRectMake(inset.left, inset.top, width, height)];
+        [aView setFrame:CGRectMake([shadowView leftInset], [shadowView topInset], width, height)]
         [enclosingView addSubview:shadowView];
     }
 
@@ -99,7 +123,9 @@ CPThemeStateShadowViewHeavy = CPThemeState("shadowview-style-heavy");
 
     if (self)
     {
-        [self setWeight:CPLightShadow];
+        _weight = CPLightShadow;
+
+        [self setBackgroundColor:CPShadowViewLightBackgroundColor];
 
         [self setHitTests:NO];
     }
@@ -115,45 +141,54 @@ CPThemeStateShadowViewHeavy = CPThemeState("shadowview-style-heavy");
     _weight = aWeight;
 
     if (_weight == CPLightShadow)
-        [self setThemeState:CPThemeStateShadowViewLight];
-    else
-        [self setThemeState:CPThemeStateShadowViewHeavy];
+        [self setBackgroundColor:CPShadowViewLightBackgroundColor];
 
-    [self setNeedsLayout];
+    else
+        [self setBackgroundColor:CPShadowViewHeavyBackgroundColor];
 }
 
 - (float)leftInset
 {
-    return [self currentValueForThemeAttribute:@"content-inset"].left;
+    return _weight == CPLightShadow ? LIGHT_LEFT_INSET : HEAVY_LEFT_INSET;
 }
 
 - (float)rightInset
 {
-    return [self currentValueForThemeAttribute:@"content-inset"].right;
+    return _weight == CPLightShadow ? LIGHT_RIGHT_INSET : HEAVY_RIGHT_INSET;
 }
 
 - (float)topInset
 {
-    return [self currentValueForThemeAttribute:@"content-inset"].top;
+    return _weight == CPLightShadow ? LIGHT_TOP_INSET : HEAVY_TOP_INSET;
 }
 
 - (float)bottomInset
 {
-    return [self currentValueForThemeAttribute:@"content-inset"].bottom;
+    return _weight == CPLightShadow ? LIGHT_BOTTOM_INSET : HEAVY_BOTTOM_INSET;
 }
 
 - (float)horizontalInset
 {
-    var currentContentInset = [self currentValueForThemeAttribute:@"content-inset"];
+    if (_weight == CPLightShadow)
+        return LIGHT_LEFT_INSET + LIGHT_RIGHT_INSET;
 
-    return currentContentInset.left + currentContentInset.right;
+    return HEAVY_LEFT_INSET + HEAVY_RIGHT_INSET;
 }
 
 - (float)verticalInset
 {
-    var currentContentInset = [self currentValueForThemeAttribute:@"content-inset"];
+    if (_weight == CPLightShadow)
+        return LIGHT_TOP_INSET + LIGHT_BOTTOM_INSET;
 
-    return currentContentInset.top + currentContentInset.bottom;
+    return HEAVY_TOP_INSET + HEAVY_BOTTOM_INSET;
+}
+
++ (CGRect)frameForContentFrame:(CGRect)aFrame withWeight:(CPShadowWeight)aWeight
+{
+    if (aWeight == CPLightShadow)
+        return CGRectMake(_CGRectGetMinX(aFrame) - LIGHT_LEFT_INSET, _CGRectGetMinY(aFrame) - LIGHT_TOP_INSET, _CGRectGetWidth(aFrame) + LIGHT_LEFT_INSET + LIGHT_RIGHT_INSET, _CGRectGetHeight(aFrame) + LIGHT_TOP_INSET + LIGHT_BOTTOM_INSET);
+    else
+        return CGRectMake(_CGRectGetMinX(aFrame) - HEAVY_LEFT_INSET, _CGRectGetMinY(aFrame) - HEAVY_TOP_INSET, _CGRectGetWidth(aFrame) + HEAVY_LEFT_INSET + HEAVY_RIGHT_INSET, _CGRectGetHeight(aFrame) + HEAVY_TOP_INSET + HEAVY_BOTTOM_INSET);
 }
 
 - (CGRect)frameForContentFrame:(CGRect)aFrame
@@ -166,11 +201,4 @@ CPThemeStateShadowViewHeavy = CPThemeState("shadowview-style-heavy");
     [self setFrame:[self frameForContentFrame:aFrame]];
 }
 
-- (void)layoutSubviews
-{
-    [super layoutSubviews];
-
-    [self setBackgroundColor:[self currentValueForThemeAttribute:@"bezel-color"]];
-}
-
 @end

AppKit/CPSlider.j

@@ -21,7 +21,6 @@
  */
 
 @import "CPControl.j"
-@import "CPWindow_Constants.j"
 
 
 /*! SLIDER STATES */
@@ -40,8 +39,6 @@ CPCircularSlider    = 1;
     double          _altIncrementValue;
 
     BOOL            _isVertical;
-
-    CGSize          _dragOffset;
 }
 
 + (CPString)defaultThemeClass
@@ -51,12 +48,8 @@ CPCircularSlider    = 1;
 
 + (id)themeAttributes
 {
-    return @{
-            @"knob-color": [CPNull null],
-            @"knob-size": _CGSizeMakeZero(),
-            @"track-width": 0.0,
-            @"track-color": [CPNull null],
-        };
+    return [CPDictionary dictionaryWithObjects:[[CPNull null], _CGSizeMakeZero(), 0.0, [CPNull null]]
+                                       forKeys:[@"knob-color", @"knob-size", @"track-width", @"track-color"]];
 }
 
 - (id)initWithFrame:(CGRect)aFrame

AppKit/CPSliderColorPicker.j

@@ -20,14 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-@import "CPColorPicker.j"
-@import "CPSlider.j"
-@import "CPTextField.j"
 @import "CPView.j"
-
-@global CPColorPickerViewWidth
-@global CPColorPickerViewHeight
-@global CPSliderColorPickerMode
+@import "CPColorPicker.j"
 
 
 /*
@@ -71,7 +65,7 @@
 
 - (id)initView
 {
-    var aFrame = CGRectMake(0, 0, CPColorPickerViewWidth, CPColorPickerViewHeight);
+    aFrame = CGRectMake(0, 0, CPColorPickerViewWidth, CPColorPickerViewHeight);
 
     _contentView = [[CPView alloc] initWithFrame:aFrame];
     [_contentView setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];

AppKit/CPSound.j

@@ -21,7 +21,6 @@
  */
 
 @import <Foundation/CPObject.j>
-@import <Foundation/CPRunLoop.j>
 
 CPSoundLoadStateEmpty       = 0;
 CPSoundLoadStateLoading     = 1;
@@ -60,7 +59,7 @@ CPSoundPlayBackStatePause   = 2;
     if (self = [super init])
     {
         _loadStatus = CPSoundLoadStateEmpty;
-//        _loops = NO;
+        _loops = NO;
         _audioTag = document.createElement("audio");
         _audioTag.preload = YES;
         _playRequestBeforeLoad = NO;

AppKit/CPSplitView.j

@@ -25,10 +25,6 @@
 @import "CPButtonBar.j"
 @import "CPImage.j"
 @import "CPView.j"
-@import "CPCursor.j"
-
-@class CPUserDefaults
-@global CPApp
 
 #define SPLIT_VIEW_MAYBE_POST_WILL_RESIZE() \
     if ((_suppressResizeNotificationsMask & DidPostWillResizeNotification) === 0) \
@@ -55,7 +51,10 @@
 CPSplitViewDidResizeSubviewsNotification = @"CPSplitViewDidResizeSubviewsNotification";
 CPSplitViewWillResizeSubviewsNotification = @"CPSplitViewWillResizeSubviewsNotification";
 
-var ShouldSuppressResizeNotifications   = 1,
+var CPSplitViewHorizontalImage = nil,
+    CPSplitViewVerticalImage = nil,
+
+    ShouldSuppressResizeNotifications   = 1,
     DidPostWillResizeNotification       = 1 << 1,
     DidSuppressResizeNotification       = 1 << 2;
 
@@ -105,13 +104,22 @@ var ShouldSuppressResizeNotifications   = 1,
 
 + (id)themeAttributes
 {
-    return @{
-            @"divider-thickness": 1.0,
-            @"pane-divider-thickness": 10.0,
-            @"pane-divider-color": [CPColor grayColor],
-            @"horizontal-divider-color": [CPNull null],
-            @"vertical-divider-color": [CPNull null],
-        };
+    return [CPDictionary dictionaryWithObjects:[1.0, 10.0, [CPColor grayColor]]
+                                       forKeys:[@"divider-thickness", @"pane-divider-thickness", @"pane-divider-color"]];
+}
+
+/*
+    @ignore
+*/
++ (void)initialize
+{
+    if (self !== [CPSplitView class])
+        return;
+
+    var bundle = [CPBundle bundleForClass:self];
+
+    CPSplitViewHorizontalImage = CPImageInBundle("CPSplitView/CPSplitViewHorizontal.png", CGSizeMake(5.0, 10.0), bundle);
+    CPSplitViewVerticalImage = CPImageInBundle("CPSplitView/CPSplitViewVertical.png", CGSizeMake(10.0, 5.0), bundle);
 }
 
 - (id)initWithFrame:(CGRect)aFrame
@@ -194,7 +202,7 @@ var ShouldSuppressResizeNotifications   = 1,
 
     _originComponent = [self isVertical] ? "x" : "y";
     _sizeComponent = [self isVertical] ? "width" : "height";
-    _dividerImagePath = [self isVertical] ? [[self valueForThemeAttribute:@"vertical-divider-color"] filename] : [[self valueForThemeAttribute:@"horizontal-divider-color"] filename];
+    _dividerImagePath = [self isVertical] ? [CPSplitViewVerticalImage filename] : [CPSplitViewHorizontalImage filename];
 
     return changed;
 }
@@ -785,7 +793,7 @@ var ShouldSuppressResizeNotifications   = 1,
     [self setNeedsDisplay:YES];
 }
 
-- (void)resizeSubviewsWithOldSize:(CGSize)oldSize
+- (void)resizeSubviewsWithOldSize:(CPSize)oldSize
 {
     if ([_delegate respondsToSelector:@selector(splitView:resizeSubviewsWithOldSize:)])
     {
@@ -1029,7 +1037,7 @@ The sum of the views and the sum of the dividers should be equal to the size of
     var userInfo = nil;
 
     if (_currentDivider !== CPNotFound)
-        userInfo = @{ @"CPSplitViewDividerIndex": _currentDivider };
+        userInfo = [CPDictionary dictionaryWithObject:_currentDivider forKey:@"CPSplitViewDividerIndex"];
 
     [[CPNotificationCenter defaultCenter] postNotificationName:CPSplitViewWillResizeSubviewsNotification
                                                         object:self
@@ -1041,7 +1049,7 @@ The sum of the views and the sum of the dividers should be equal to the size of
     var userInfo = nil;
 
     if (_currentDivider !== CPNotFound)
-        userInfo = @{ @"CPSplitViewDividerIndex": _currentDivider };
+        userInfo = [CPDictionary dictionaryWithObject:_currentDivider forKey:@"CPSplitViewDividerIndex"];
 
     [[CPNotificationCenter defaultCenter] postNotificationName:CPSplitViewDidResizeSubviewsNotification
                                                         object:self
@@ -1094,7 +1102,7 @@ The sum of the views and the sum of the dividers should be equal to the size of
     for (var i = 0; i < count; i++)
     {
         var frame = [_subviews[i] frame];
-        [positions addObject:CGStringFromRect(frame)];
+        [positions addObject:CPStringFromRect(frame)];
         [preCollapseArray addObject:[_preCollapsePositions objectForKey:"" + i]];
     }
 
@@ -1141,7 +1149,7 @@ The sum of the views and the sum of the dividers should be equal to the size of
 
         for (var i = 0, count = [frames count] - 1; i < count; i++)
         {
-            var frame = CGRectFromString(frames[i]);
+            var frame = CPRectFromString(frames[i]);
             position += frame.size[_sizeComponent];
 
             [self setPosition:position ofDividerAtIndex:i];
@@ -1157,14 +1165,7 @@ The sum of the views and the sum of the dividers should be equal to the size of
         _preCollapsePositions = [CPMutableDictionary new];
 
         for (var i = 0, count = [preCollapseArray count]; i < count; i++)
-        {
-            var item = preCollapseArray[i];
-
-            if (item === nil)
-                [_preCollapsePositions removeObjectForKey:String(i)];
-            else
-                [_preCollapsePositions setObject:item forKey:String(i)];
-        }
+            [_preCollapsePositions setObject:preCollapseArray[i] forKey:i + ""];
     }
 }
 

AppKit/CPStepper.j

@@ -20,9 +20,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-@import "CPControl.j"
-@import "CPButton.j"
-@import "CPTextField.j"
+@import <AppKit/CPControl.j>
+@import <AppKit/CPButton.j>
+@import <AppKit/CPTextField.j>
 
 
 
@@ -55,15 +55,11 @@
 */
 + (CPStepper)stepperWithInitialValue:(float)aValue minValue:(float)aMinValue maxValue:(float)aMaxValue
 {
-    var stepper = [[CPStepper alloc] initWithFrame:_CGRectMakeZero()];
-
+    var stepper = [[CPStepper alloc] initWithFrame:_CGRectMake(0, 0, 19, 25)];
     [stepper setDoubleValue:aValue];
     [stepper setMinValue:aMinValue];
     [stepper setMaxValue:aMaxValue];
 
-    // _sizeToFit will put the good size for the stepper depending of the current theme
-    [stepper _sizeToFit];
-
     return stepper;
 }
 
@@ -80,15 +76,15 @@
     return [CPStepper stepperWithInitialValue:0.0 minValue:0.0 maxValue:59.0];
 }
 
-+ (Class)_binderClassForBinding:(CPString)aBinding
++ (Class)_binderClassForBinding:(CPString)theBinding
 {
-    if (aBinding == CPValueBinding || aBinding == CPMinValueBinding || aBinding == CPMaxValueBinding)
+    if (theBinding == CPValueBinding || theBinding == CPMinValueBinding || theBinding == CPMaxValueBinding)
         return [_CPStepperValueBinder class];
 
-    return [super _binderClassForBinding:aBinding];
+    return [super _binderClassForBinding:theBinding];
 }
 
-- (CPString)_replacementKeyPathForBinding:(CPString)aBinding
+- (id)_replacementKeyPathForBinding:(CPString)aBinding
 {
     if (aBinding == CPValueBinding)
         return @"doubleValue";
@@ -177,7 +173,6 @@
         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);
-
     [_buttonUp setFrame:upFrame];
     [_buttonDown setFrame:downFrame];
 
@@ -189,11 +184,6 @@
     [_buttonDown setValue:[self valueForThemeAttribute:@"bezel-color-down-button" inState:CPThemeStateBordered | CPThemeStateHighlighted] forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered | CPThemeStateHighlighted];
 }
 
-- (void)_sizeToFit
-{
-    [self setFrame:CGRectMake([self frameOrigin].x, [self frameOrigin].y, 0, 0)];
-}
-
 /*!
     Set if CPStepper should autorepeat.
     @param shouldAutoRepeat if YES, the first mouse down does one increment (decrement) and, after each delay of 0.5 seconds
@@ -269,12 +259,8 @@
 
 + (id)themeAttributes
 {
-    return @{
-            @"bezel-color-up-button": [CPNull null],
-            @"bezel-color-down-button": [CPNull null],
-            @"up-button-size": _CGSizeMakeZero(),
-            @"down-button-size": _CGSizeMakeZero(),
-        };
+    return [CPDictionary dictionaryWithObjects:[[CPNull null], [CPNull null], _CGSizeMakeZero(), _CGSizeMakeZero()]
+                                       forKeys:[@"bezel-color-up-button", @"bezel-color-down-button", @"up-button-size", @"down-button-size"]];
 }
 
 @end

AppKit/CPStringDrawing.j

@@ -22,7 +22,6 @@
 
 @import <Foundation/CPString.j>
 
-@import "CGGeometry.j"
 @import "CPPlatformString.j"
 
 

AppKit/CPTabView.j

@@ -508,28 +508,18 @@ var CPTabViewItemsKey               = "CPTabViewItemsKey",
 
         [self setDelegate:[aCoder decodeObjectForKey:CPTabViewDelegateKey]];
 
-        self.selectOnAwake = [aCoder decodeObjectForKey:CPTabViewSelectedItemKey];
-        _type = [aCoder decodeIntForKey:CPTabViewTypeKey];
+        var selected = [aCoder decodeObjectForKey:CPTabViewSelectedItemKey];
+        if (selected)
+            [self selectTabViewItem:selected];
+
+        [self setTabViewType:[aCoder decodeIntForKey:CPTabViewTypeKey]];
+
+        [self setNeedsLayout];
     }
 
     return self;
 }
 
-- (void)awakeFromCib
-{
-    if (self.selectOnAwake)
-    {
-        [self selectTabViewItem:self.selectOnAwake];
-        delete self.selectOnAwake;
-    }
-
-    var type = _type;
-    _type = nil;
-    [self setTabViewType:type];
-
-    [self setNeedsLayout];
-}
-
 - (void)encodeWithCoder:(CPCoder)aCoder
 {
     [super encodeWithCoder:aCoder];

AppKit/CPTabViewItem.j

@@ -60,7 +60,6 @@ CPPressedTab    = 2;
     CPView      _auxiliaryView;
 
     CPTabView   _tabView;
-    unsigned    _tabState;      // Looks like it is not yet implemented
 }
 
 - (id)init

AppKit/CPTableColumn.j

@@ -26,11 +26,8 @@
 @import <Foundation/CPSortDescriptor.j>
 @import <Foundation/CPString.j>
 
-@import "CPTextField.j"
+@import "CPTableHeaderView.j"
 
-@global CPTableViewColumnDidResizeNotification
-
-@class _CPTableColumnHeaderView
 
 CPTableColumnNoResizing         = 0;
 CPTableColumnAutoresizingMask   = 1 << 0;
@@ -52,7 +49,7 @@ CPTableColumnUserResizingMask   = 1 << 1;
     CPTableView         _tableView;
     CPView              _headerView;
     CPView              _dataView;
-    CPData              _dataViewData;
+    Object              _dataViewData;
 
     float               _width;
     float               _minWidth;
@@ -86,7 +83,7 @@ CPTableColumnUserResizingMask   = 1 << 1;
 
     if (self)
     {
-        _dataViewData = nil;
+        _dataViewData = { };
 
         _width = 100.0;
         _minWidth = 10.0;
@@ -395,12 +392,12 @@ CPTableColumnUserResizingMask   = 1 << 1;
 - (void)setDataView:(CPView)aView
 {
     if (_dataView)
-        _dataViewData = nil;
+        _dataViewData[[_dataView UID]] = nil;
 
     [aView setThemeState:CPThemeStateTableDataView];
 
     _dataView = aView;
-    _dataViewData = [CPKeyedArchiver archivedDataWithRootObject:aView];
+    _dataViewData[[aView UID]] = [CPKeyedArchiver archivedDataWithRootObject:aView];
 }
 
 - (CPView)dataView
@@ -424,12 +421,24 @@ CPTableColumnUserResizingMask   = 1 << 1;
 /*!
     @ignore
 */
-- (id)_newDataView
+- (id)_newDataViewForRow:(int)aRowIndex
 {
-    if (!_dataViewData)
-        return nil;
+    var dataView = [self dataViewForRow:aRowIndex],
+        dataViewUID = [dataView UID];
 
-    var newDataView = [CPKeyedUnarchiver unarchiveObjectWithData:_dataViewData];
+    var x = [self tableView]._cachedDataViews[dataViewUID];
+    if (x && x.length)
+        return x.pop();
+
+    // if we haven't cached an archive of the data view, do it now
+    if (!_dataViewData[dataViewUID])
+        _dataViewData[dataViewUID] = [CPKeyedArchiver archivedDataWithRootObject:dataView];
+
+    // unarchive the data view cache
+    var newDataView = [CPKeyedUnarchiver unarchiveObjectWithData:_dataViewData[dataViewUID]];
+    newDataView.identifier = dataViewUID;
+
+    // make sure only we have control over the size and placement
     [newDataView setAutoresizingMask:CPViewNotSizable];
 
     return newDataView;
@@ -548,7 +557,7 @@ CPTableColumnUserResizingMask   = 1 << 1;
     [[CPNotificationCenter defaultCenter]
     postNotificationName:CPTableViewColumnDidResizeNotification
                   object:[self tableView]
-                userInfo:@{ @"CPTableColumn": self, @"CPOldWidth": oldWidth }];
+                userInfo:[CPDictionary dictionaryWithObjects:[self, oldWidth] forKeys:[@"CPTableColumn", "CPOldWidth"]]];
 }
 
 @end
@@ -745,7 +754,7 @@ var CPTableColumnIdentifierKey   = @"CPTableColumnIdentifierKey",
 
     if (self)
     {
-        _dataViewData = nil;
+        _dataViewData = { };
 
         _width = [aCoder decodeFloatForKey:CPTableColumnWidthKey];
         _minWidth = [aCoder decodeFloatForKey:CPTableColumnMinWidthKey];

AppKit/CPTableHeaderView.j

@@ -22,15 +22,9 @@
 
 @import <Foundation/CPIndexSet.j>
 
-@import "CPCursor.j"
-@import "CPPasteboard.j"
 @import "CPTableColumn.j"
+@import "CPTableView.j"
 @import "CPView.j"
-@import "_CPImageAndTextView.j"
-
-@class CPTableView
-
-@global CPApp
 
 
 @implementation _CPTableColumnHeaderView : CPView
@@ -45,22 +39,13 @@
 
 + (id)themeAttributes
 {
-    return @{
-            @"background-color": [CPNull null],
-            @"text-alignment": CPLeftTextAlignment,
-            @"line-break-mode": CPLineBreakByTruncatingTail,
-            @"text-inset": CGInsetMakeZero(),
-            @"text-color": [CPNull null],
-            @"font": [CPNull null],
-            @"text-shadow-color": [CPNull null],
-            @"text-shadow-offset": CGSizeMakeZero(),
-        };
+    return [CPDictionary dictionaryWithObjects:[[CPNull null], CPLeftTextAlignment, CPLineBreakByTruncatingTail, CGInsetMakeZero(), [CPNull null], [CPNull null], [CPNull null], CGSizeMakeZero()]
+                                       forKeys:[@"background-color", @"text-alignment", @"line-break-mode", @"text-inset", @"text-color", @"font", @"text-shadow-color", @"text-shadow-offset"]];
 }
 
 - (void)initWithFrame:(CGRect)frame
 {
     self = [super initWithFrame:frame];
-
     if (self)
         [self _init];
 
@@ -247,10 +232,8 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
 
 + (id)themeAttributes
 {
-    return @{
-            @"background-color": [CPNull null],
-            @"divider-color": [CPColor grayColor],
-        };
+    return [CPDictionary dictionaryWithObjects:[[CPNull null], [CPColor grayColor]]
+                                       forKeys:[@"background-color", @"divider-color"]];
 }
 
 - (void)_init
@@ -331,9 +314,6 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
     {
         var headerView = [_tableView._tableColumns[column] headerView];
         [headerView setThemeState:CPThemeStateHighlighted];
-
-        if (_tableView._editingColumn == column)
-            [[self window] makeFirstResponder:_tableView];
     }
 
     _pressedColumn = column;
@@ -564,8 +544,6 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
     [self stopTrackingTableColumn:_activeColumn at:aLocation];
 
     [self setNeedsDisplay:YES];
-
-    [_tableView _enqueueDraggingViews];
 }
 
 - (BOOL)shouldResizeTableColumn:(int)aColumnIndex at:(CGPoint)aPoint
@@ -714,7 +692,6 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
         columnMaxX;
 
     CGContextBeginPath(context);
-
     for (; columnArrayIndex < columnArrayCount; columnArrayIndex++)
     {
         // grab each column rect and add vertical lines
@@ -726,7 +703,6 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
         CGContextMoveToPoint(context, FLOOR(columnMaxX) - 0.5, ROUND(_CGRectGetMinY(columnToStroke)));
         CGContextAddLineToPoint(context, FLOOR(columnMaxX) - 0.5, ROUND(_CGRectGetMaxY(columnToStroke)) - 1.0);
     }
-
     CGContextClosePath(context);
     CGContextStrokePath(context);
 

AppKit/CPTextField.j

@@ -20,17 +20,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#import "../Foundation/Ref.h"
+
 @import "CPControl.j"
 @import "CPStringDrawing.j"
 @import "CPCompatibility.j"
-@import "CPText.j"
-@import "CPWindow_Constants.j"
 @import "_CPImageAndTextView.j"
 
-@class CPPasteboard
-
-@global CPApp
-@global CPStringPboardType
 
 CPTextFieldSquareBezel          = 0;    /*! A textfield bezel with squared corners. */
 CPTextFieldRoundedBezel         = 1;    /*! A textfield bezel with rounded corners. */
@@ -38,6 +34,8 @@ CPTextFieldRoundedBezel         = 1;    /*! A textfield bezel with rounded corne
 CPTextFieldDidFocusNotification = @"CPTextFieldDidFocusNotification";
 CPTextFieldDidBlurNotification  = @"CPTextFieldDidBlurNotification";
 
+#if PLATFORM(DOM)
+
 var CPTextFieldDOMInputElement = nil,
     CPTextFieldDOMPasswordInputElement = nil,
     CPTextFieldDOMStandardInputElement = nil,
@@ -48,42 +46,13 @@ var CPTextFieldDOMInputElement = nil,
     CPTextFieldInputIsActive = NO,
     CPTextFieldCachedSelectStartFunction = nil,
     CPTextFieldCachedDragFunction = nil,
-    CPTextFieldBlurHandler = nil,
+    CPTextFieldBlurFunction = nil,
     CPTextFieldInputFunction = nil;
 
+#endif
+
 var CPSecureTextFieldCharacter = "\u2022";
 
-
-function CPTextFieldBlurFunction(anEvent, owner, domElement, inputElement, resigning, didBlurRef)
-{
-    if (owner && domElement != inputElement.parentNode)
-        return;
-
-    if (!resigning && [[owner window] isKeyWindow])
-    {
-        /*
-            Browsers blur text fields when a click occurs anywhere outside the text field. That is normal for browsers, but in Cocoa the key view retains focus unless the click target accepts first responder. So if we lost focus but were not told to resign and our window is still key, restore focus.
-        */
-        window.setTimeout(function()
-        {
-            inputElement.focus();
-        }, 0.0);
-    }
-
-    CPTextFieldHandleBlur(anEvent, @ref(owner));
-    @deref(didBlurRef) = YES;
-
-    return true;
-}
-
-function CPTextFieldHandleBlur(anEvent, ownerRef)
-{
-    @deref(ownerRef) = nil;
-
-    [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
-}
-
-
 @implementation CPString (CPTextFieldAdditions)
 
 /*!
@@ -127,18 +96,6 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
     CPControlSize           _controlSize;
 }
 
-+ (Class)_binderClassForBinding:(CPString)aBinding
-{
-    if (aBinding === CPValueBinding)
-        return [_CPTextFieldValueBinder class];
-    else if ([aBinding hasPrefix:CPDisplayPatternValueBinding])
-        return [_CPTextFieldPatternValueBinder class];
-    else if ([aBinding hasPrefix:CPEditableBinding])
-        return [CPMultipleValueAndBinding class];
-
-    return [super _binderClassForBinding:aBinding];
-}
-
 + (CPTextField)textFieldWithStringValue:(CPString)aStringValue placeholder:(CPString)aPlaceholder width:(float)aWidth
 {
     return [self textFieldWithStringValue:aStringValue placeholder:aPlaceholder width:aWidth theme:[CPTheme defaultTheme]];
@@ -202,13 +159,18 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
     return "textfield";
 }
 
++ (Class)_binderClassForBinding:(CPString)theBinding
+{
+    if (theBinding === CPValueBinding)
+        return [_CPTextFieldValueBinder class];
+
+    return [super _binderClassForBinding:theBinding];
+}
+
 + (id)themeAttributes
 {
-    return @{
-            @"bezel-inset": _CGInsetMakeZero(),
-            @"content-inset": _CGInsetMake(1.0, 0.0, 0.0, 0.0),
-            @"bezel-color": [CPNull null],
-        };
+    return [CPDictionary dictionaryWithObjects:[_CGInsetMakeZero(), _CGInsetMake(2.0, 2.0, 2.0, 2.0), [CPNull null]]
+                                       forKeys:[@"bezel-inset", @"content-inset", @"bezel-color"]];
 }
 
 /* @ignore */
@@ -226,15 +188,28 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
         CPTextFieldDOMInputElement.style.background = "transparent";
         CPTextFieldDOMInputElement.style.outline = "none";
 
-        CPTextFieldBlurHandler = function(anEvent)
+        CPTextFieldBlurFunction = function(anEvent)
         {
-            return CPTextFieldBlurFunction(
-                        anEvent,
-                        CPTextFieldInputOwner,
-                        CPTextFieldInputOwner._DOMElement,
-                        CPTextFieldDOMInputElement,
-                        CPTextFieldInputResigning,
-                        @ref(CPTextFieldInputDidBlur));
+            if (CPTextFieldInputOwner && CPTextFieldInputOwner._DOMElement != CPTextFieldDOMInputElement.parentNode)
+                return;
+
+            if (!CPTextFieldInputResigning)
+            {
+                [[CPTextFieldInputOwner window] makeFirstResponder:nil];
+                return;
+            }
+
+            CPTextFieldHandleBlur(anEvent, CPTextFieldDOMInputElement);
+            CPTextFieldInputDidBlur = YES;
+
+            return true;
+        };
+
+        CPTextFieldHandleBlur = function(anEvent)
+        {
+            CPTextFieldInputOwner = nil;
+
+            [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
         };
 
         if (CPFeatureIsCompatible(CPInputOnInputEventFeature))
@@ -244,16 +219,9 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
                 if (!CPTextFieldInputOwner)
                     return;
 
-                var cappEvent = [CPEvent keyEventWithType:CPKeyUp
-                                                 location:_CGPointMakeZero()
-                                            modifierFlags:0
-                                                timestamp:[CPEvent currentTimestamp]
-                                             windowNumber:[[CPApp keyWindow] windowNumber]
-                                                  context:nil
-                                               characters:nil
-                              charactersIgnoringModifiers:nil
-                                                isARepeat:NO
-                                                  keyCode:nil];
+                var cappEvent = [CPEvent keyEventWithType:CPKeyUp location:_CGPointMakeZero() modifierFlags:0
+                                                timestamp:[CPEvent currentTimestamp] windowNumber:[[CPApp keyWindow] windowNumber] context:nil
+                                               characters:nil charactersIgnoringModifiers:nil isARepeat:NO keyCode:nil];
 
                 [CPTextFieldInputOwner keyUp:cappEvent];
 
@@ -263,8 +231,8 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
             CPTextFieldDOMInputElement.oninput = CPTextFieldInputFunction;
         }
 
-        // FIXME make this not onblur
-        CPTextFieldDOMInputElement.onblur = CPTextFieldBlurHandler;
+        //FIXME make this not onblur
+        CPTextFieldDOMInputElement.onblur = CPTextFieldBlurFunction;
 
         CPTextFieldDOMStandardInputElement = CPTextFieldDOMInputElement;
     }
@@ -293,7 +261,7 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
             CPTextFieldDOMPasswordInputElement.style.outline = "none";
             CPTextFieldDOMPasswordInputElement.type = "password";
 
-            CPTextFieldDOMPasswordInputElement.onblur = CPTextFieldBlurHandler;
+            CPTextFieldDOMPasswordInputElement.onblur = CPTextFieldBlurFunction;
         }
 
         CPTextFieldDOMInputElement = CPTextFieldDOMPasswordInputElement;
@@ -348,11 +316,6 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
     // We only allow first responder status if the field is editable and enabled.
     if (!shouldBeEditable && [[self window] firstResponder] === self)
         [[self window] makeFirstResponder:nil];
-
-    if (shouldBeEditable)
-        [self setThemeState:CPThemeStateEditable];
-    else
-        [self unsetThemeState:CPThemeStateEditable];
 }
 
 /*!
@@ -531,6 +494,12 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 /* @ignore */
 - (BOOL)becomeFirstResponder
 {
+#if PLATFORM(DOM)
+    // FIXME Why do we care about who's the first responder in a different window?
+    if (CPTextFieldInputOwner && [CPTextFieldInputOwner window] !== [self window])
+        [[CPTextFieldInputOwner window] makeFirstResponder:nil];
+#endif
+
     // As long as we are the first responder we need to monitor the key status of our window.
     [self _setObserveWindowKeyNotifications:YES];
 
@@ -543,15 +512,12 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 }
 
 /*!
-    A text field can be the first responder without necessarily being the focus of keyboard input. For example, it might be the first responder of window A but window B is the main and key window. It's important we don't put a focused input field into a text field in a non-key window, even if that field is the first responder, because the key window might also have a first responder text field which the user will expect to receive keyboard input.
+    A text field can be the first responder without necessarily being the focus of keyboard input. For example, it might be the first responder of window A but window B is the main and key window. It's important we don't put a focused input field into a text field in a non key window, even if that field is the first responder, because the key window might also have a first responder text field which the user will expect to receive keyboard input.
 
     Since a first responder but non-key window text field can't receive input it should not even look like an active text field (Cocoa has a "slightly active" text field look it uses when another window is the key window, but Cappuccino doesn't today.)
 */
 - (void)_becomeFirstKeyResponder
 {
-    // Make sure the text field is visible so the browser will not scroll without the NSScrollView knowing about it.
-    [self scrollRectToVisible:[self bounds]];
-
     [self setThemeState:CPThemeStateEditing];
 
     [self _updatePlaceholderState];
@@ -568,10 +534,8 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 
     element.value = _stringValue;
     element.style.color = [[self currentValueForThemeAttribute:@"text-color"] cssString];
-
     if (CPFeatureIsCompatible(CPInputSetFontOutsideOfDOM))
         element.style.font = [font cssString];
-
     element.style.zIndex = 1000;
 
     switch ([self alignment])
@@ -607,24 +571,37 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 
     element.style.top = topPoint;
     var left = _CGRectGetMinX(contentRect);
-
     // If the browser has a built in left padding, compensate for it. We need the input text to be exactly on top of the original text.
     if (CPFeatureIsCompatible(CPInput1PxLeftPadding))
         left -= 1;
-
     element.style.left = left + "px";
     element.style.width = _CGRectGetWidth(contentRect) + "px";
     element.style.height = ROUND(lineHeight) + "px";
     element.style.lineHeight = ROUND(lineHeight) + "px";
-    element.style.verticalAlign = "top";
-    element.style.cursor = "auto";
+    element.style.verticalAlign = @"top";
 
     _DOMElement.appendChild(element);
 
-    // The font change above doesn't work for some browsers if the element isn't already appendChild'ed.
+    // The font change above doesn't work for some browsers if the element isn't already .appendChild'ed.
     if (!CPFeatureIsCompatible(CPInputSetFontOutsideOfDOM))
         element.style.font = [font cssString];
 
+    window.setTimeout(function()
+    {
+        element.focus();
+
+        // Select the text if the textfield became first responder through keyboard interaction
+        if (!_willBecomeFirstResponderByClick)
+            [self _selectText:self immediately:YES];
+
+        _willBecomeFirstResponderByClick = NO;
+
+        [self textDidFocus:[CPNotification notificationWithName:CPTextFieldDidFocusNotification object:self userInfo:nil]];
+        CPTextFieldInputOwner = self;
+    }, 0.0);
+
+    [[[self window] platformWindow] _propagateCurrentDOMEvent:YES];
+
     CPTextFieldInputIsActive = YES;
 
     if (document.attachEvent)
@@ -635,28 +612,6 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
         [[self window] platformWindow]._DOMBodyElement.ondrag = function () {};
         [[self window] platformWindow]._DOMBodyElement.onselectstart = function () {};
     }
-
-    CPTextFieldInputOwner = self;
-
-    window.setTimeout(function()
-    {
-        /*
-            setTimeout handlers are not guaranteed to fire in the order they were initiated. This can cause a race condition when several windows with text fields are opened quickly, resulting in several instances of this timeout function being fired, perhaps out of order. So we have to check that by the time this function is fired, CPTextFieldInputOwner has not been changed to another text field in the meantime.
-        */
-        if (CPTextFieldInputOwner !== self)
-            return;
-
-        element.focus();
-
-        // Select the text if the textfield became first responder through keyboard interaction
-        if (!_willBecomeFirstResponderByClick)
-            [self _selectText:self immediately:YES];
-
-        _willBecomeFirstResponderByClick = NO;
-
-        [self textDidFocus:[CPNotification notificationWithName:CPTextFieldDidFocusNotification object:self userInfo:nil]];
-    }, 0.0);
-
 #endif
 }
 
@@ -722,7 +677,7 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
         element.blur();
 
     if (!CPTextFieldInputDidBlur)
-        CPTextFieldBlurHandler();
+        CPTextFieldBlurFunction();
 
     CPTextFieldInputDidBlur = NO;
     CPTextFieldInputResigning = NO;
@@ -776,7 +731,7 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 
     var error = @"";
 
-    if ([self _setStringValue:aValue isNewValue:NO errorDescription:@ref(error)] === NO)
+    if ([self _setStringValue:aValue isNewValue:NO errorDescription:AT_REF(error)] === NO)
     {
         var acceptInvalidValue = NO;
 
@@ -793,20 +748,11 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 }
 
 /*!
-    Text fields require panels to become key window, so this returns \c YES
-    if the text field is ready to become the first responder as well.
+    Text fields require panels to become key window, so this returns \c YES.
 */
 - (BOOL)needsPanelToBecomeKey
 {
-    return [self acceptsFirstResponder];
-}
-
-/*!
-    Only text fields that can become first responder accepts first mouse.
-*/
-- (BOOL)acceptsFirstMouse:(CPEvent)anEvent
-{
-    return [self acceptsFirstResponder];
+    return YES;
 }
 
 - (void)mouseDown:(CPEvent)anEvent
@@ -1043,7 +989,7 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
     {
         var object = nil;
 
-        if ([formatter getObjectValue:@ref(object) forString:aValue errorDescription:anError])
+        if ([formatter getObjectValue:AT_REF(object) forString:aValue errorDescription:anError])
             objectValue = object;
         else
         {
@@ -1082,7 +1028,7 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 
             // Formatting failed, get an "empty" object by formatting an empty string.
             // If that fails, the value is undefined.
-            if ([formatter getObjectValue:@ref(value) forString:@"" errorDescription:nil] === NO)
+            if ([formatter getObjectValue:AT_REF(value) forString:@"" errorDescription:nil] === NO)
                 value = undefined;
 
             [super setObjectValue:value];
@@ -1639,8 +1585,10 @@ var CPTextFieldIsEditableKey            = "CPTextFieldIsEditableKey",
 @end
 
 @implementation _CPTextFieldValueBinder : CPBinder
+{
+}
 
-- (void)_updatePlaceholdersWithOptions:(CPDictionary)options forBinding:(CPBinder)aBinding
+- (void)_updatePlaceholdersWithOptions:(CPDictionary)options
 {
     [super _updatePlaceholdersWithOptions:options];
 
@@ -1658,28 +1606,8 @@ var CPTextFieldIsEditableKey            = "CPTextFieldIsEditableKey",
 
 - (void)setValue:(id)aValue forBinding:(CPString)aBinding
 {
-    if (!aValue || (aValue.isa && [aValue isMemberOfClass:CPNull]))
-        [_source setPlaceholderString:[self _placeholderForMarker:CPNullMarker]];
-
     [_source setObjectValue:aValue];
 }
 
 @end
 
-@implementation _CPTextFieldPatternValueBinder : CPValueWithPatternBinding
-
-- (void)setPlaceholderValue:(id)aValue withMarker:(CPString)aMarker forBinding:(CPString)aBinding
-{
-    [_source setPlaceholderString:aValue];
-    [_source setObjectValue:nil];
-}
-
-- (void)setValue:(id)aValue forBinding:(CPString)aBinding
-{
-    if (!aValue || (aValue.isa && [aValue isMemberOfClass:CPNull]))
-        [_source setPlaceholderString:[self _placeholderForMarker:CPNullMarker]];
-
-    [_source setObjectValue:aValue];
-}
-
-@end

AppKit/CPTheme.j

@@ -21,11 +21,9 @@
  */
 
 @import <Foundation/CPObject.j>
-@import <Foundation/CPMutableArray.j>
 @import <Foundation/CPString.j>
 @import <Foundation/CPKeyedUnarchiver.j>
 
-@class CPView
 
 var CPThemesByName          = { },
     CPThemeDefaultTheme     = nil,
@@ -85,7 +83,7 @@ var CPThemesByName          = { },
     if (self)
     {
         _name = aName;
-        _attributes = @{};
+        _attributes = [CPDictionary dictionary];
 
         CPThemesByName[_name] = self;
     }
@@ -147,7 +145,7 @@ var CPThemesByName          = { },
                 className = [aClass defaultThemeClass];
             else if ([aClass respondsToSelector:@selector(themeClass)])
             {
-                CPLog.warn(@"%@ themeClass is deprecated in favor of defaultThemeClass", CPStringFromClass(aClass));
+                CPLog.warn(@"%@ themeClass is deprecated in favor of defaultThemeClass",CPStringFromClass([anObject class]));
                 className = [aClass themeClass];
             }
             else
@@ -270,7 +268,7 @@ var CPThemesByName          = { },
 
     if (!attributes)
     {
-        attributes = @{};
+        attributes = [CPDictionary dictionary];
 
         [_attributes setObject:attributes forKey:aClass];
     }
@@ -443,7 +441,7 @@ CPThemeStateKeyWindow       = CPThemeState("keyWindow");
         _cache = { };
         _name = aName;
         _defaultValue = aDefaultValue;
-        _values = @{};
+        _values = [CPDictionary dictionary];
     }
 
     return self;
@@ -474,9 +472,9 @@ CPThemeStateKeyWindow       = CPThemeState("keyWindow");
     _cache = {};
 
     if (aValue === undefined || aValue === nil)
-        _values = @{};
+        _values = [CPDictionary dictionary];
     else
-        _values = @{ String(CPThemeStateNormal): aValue };
+        _values = [CPDictionary dictionaryWithObject:aValue forKey:String(CPThemeStateNormal)];
 }
 
 - (void)setValue:(id)aValue forState:(CPThemeState)aState
@@ -585,7 +583,7 @@ CPThemeStateKeyWindow       = CPThemeState("keyWindow");
 
         _name = [aCoder decodeObjectForKey:@"name"];
         _defaultValue = [aCoder decodeObjectForKey:@"defaultValue"];
-        _values = @{};
+        _values = [CPDictionary dictionary];
 
         if ([aCoder containsValueForKey:@"value"])
         {
@@ -633,7 +631,7 @@ CPThemeStateKeyWindow       = CPThemeState("keyWindow");
     }
     else
     {
-        var encodedValues = @{};
+        var encodedValues = [CPDictionary dictionary];
 
         while (count--)
         {

AppKit/CPThemeBlend.j

@@ -33,7 +33,7 @@
 
 @implementation CPThemeBlend : CPObject
 {
-    CPBundle    _bundle @accessors(getter=bundle);
+    CPBundle    _bundle;
     CPArray     _themes;
     id          _loadDelegate;
 }

AppKit/CPTokenField.j

@@ -26,16 +26,12 @@
 @import <Foundation/CPIndexSet.j>
 @import <Foundation/CPTimer.j>
 
-@import "_CPAutocompleteMenu.j"
 @import "CPButton.j"
-@import "CPPopUpButton.j"
 @import "CPScrollView.j"
-@import "CPTableView.j"
-@import "CPText.j"
 @import "CPTextField.j"
-@import "CPWindow_Constants.j"
-
-@global CPApp
+@import "CPTableView.j"
+@import "CPWindow.j"
+@import "_CPAutocompleteMenu.j"
 
 #if PLATFORM(DOM)
 
@@ -51,7 +47,7 @@ var CPTokenFieldDOMInputElement = nil,
     CPTokenFieldCachedDragFunction = nil,
     CPTokenFieldFocusInput = NO,
 
-    CPTokenFieldBlurHandler = nil;
+    CPTokenFieldBlurFunction = nil;
 
 #endif
 
@@ -59,9 +55,6 @@ var CPScrollDestinationNone             = 0,
     CPScrollDestinationLeft             = 1,
     CPScrollDestinationRight            = 2;
 
-CPTokenFieldDisclosureButtonType = 0;
-CPTokenFieldDeleteButtonType     = 1;
-
 @implementation CPTokenField : CPTextField
 {
     CPScrollView        _tokenScrollView;
@@ -78,9 +71,8 @@ CPTokenFieldDeleteButtonType     = 1;
 
     CPEvent             _mouseDownEvent;
 
+    BOOL                _preventResign;
     BOOL                _shouldNotifyTarget;
-
-    int                 _buttonType @accessors(property=buttonType);
 }
 
 + (CPCharacterSet)defaultTokenizingCharacterSet
@@ -100,16 +92,15 @@ CPTokenFieldDeleteButtonType     = 1;
 
 + (id)themeAttributes
 {
-    return @{ @"editor-inset": _CGInsetMakeZero() };
+    return [CPDictionary dictionaryWithObject:_CGInsetMakeZero() forKey:@"editor-inset"];
 }
 
-- (id)initWithFrame:(CGRect)frame
+- (id)initWithFrame:(CPRect)frame
 {
     if (self = [super initWithFrame:frame])
     {
         _completionDelay = [[self class] defaultCompletionDelay];
         _tokenizingCharacterSet = [[self class] defaultTokenizingCharacterSet];
-        _buttonType = CPTokenFieldDisclosureButtonType;
         [self setBezeled:YES];
 
         [self _init];
@@ -329,8 +320,6 @@ CPTokenFieldDeleteButtonType     = 1;
     // As long as we are the first responder we need to monitor the key status of our window.
     [self _setObserveWindowKeyNotifications:YES];
 
-    [self scrollRectToVisible:[self bounds]];
-
     if ([[self window] isKeyWindow])
         [self _becomeFirstKeyResponder];
 
@@ -372,20 +361,17 @@ CPTokenFieldDeleteButtonType     = 1;
     element.style.width = CGRectGetWidth(contentRect) + "px";
     element.style.height = [font defaultLineHeightForFont] + "px";
 
+    [_tokenScrollView documentView]._DOMElement.appendChild(element);
+
     window.setTimeout(function()
     {
-        [_tokenScrollView documentView]._DOMElement.appendChild(element);
-
-        //post CPControlTextDidBeginEditingNotification
-        [self textDidBeginEditing:[CPNotification notificationWithName:CPControlTextDidBeginEditingNotification object:self userInfo:nil]];
-
-        window.setTimeout(function()
-        {
-            element.focus();
-            CPTokenFieldInputOwner = self;
-        }, 0.0);
+        element.focus();
+        CPTokenFieldInputOwner = self;
     }, 0.0);
 
+    //post CPControlTextDidBeginEditingNotification
+    [self textDidBeginEditing:[CPNotification notificationWithName:CPControlTextDidBeginEditingNotification object:self userInfo:nil]];
+
     [[[self window] platformWindow] _propagateCurrentDOMEvent:YES];
 
     CPTokenFieldInputIsActive = YES;
@@ -404,6 +390,9 @@ CPTokenFieldDeleteButtonType     = 1;
 
 - (BOOL)resignFirstResponder
 {
+    if (_preventResign)
+        return NO;
+
     [self _autocomplete];
 
     // From CPTextField superclass.
@@ -438,7 +427,7 @@ CPTokenFieldDeleteButtonType     = 1;
     element.blur();
 
     if (!CPTokenFieldInputDidBlur)
-        CPTokenFieldBlurHandler();
+        CPTokenFieldBlurFunction();
 
     CPTokenFieldInputDidBlur = NO;
     CPTokenFieldInputResigning = NO;
@@ -462,6 +451,7 @@ CPTokenFieldDeleteButtonType     = 1;
 
 - (void)mouseDown:(CPEvent)anEvent
 {
+    _preventResign = YES;
     _mouseDownEvent = anEvent;
 
     [self _selectToken:nil byExtendingSelection:NO];
@@ -471,11 +461,13 @@ CPTokenFieldDeleteButtonType     = 1;
 
 - (void)mouseUp:(CPEvent)anEvent
 {
+    _preventResign = NO;
     _mouseDownEvent = nil;
 }
 
 - (void)_mouseDownOnToken:(_CPTokenFieldToken)aToken withEvent:(CPEvent)anEvent
 {
+    _preventResign = YES;
     _mouseDownEvent = anEvent;
 }
 
@@ -488,6 +480,8 @@ CPTokenFieldDeleteButtonType     = 1;
         // Snap to the token if it's only half visible due to mouse wheel scrolling.
         _shouldScrollTo = aToken;
     }
+
+    _preventResign = NO;
 }
 
 // ===========
@@ -572,7 +566,7 @@ CPTokenFieldDeleteButtonType     = 1;
 
             if (newToken === nil)
             {
-                newToken = [_CPTokenFieldToken new];
+                newToken = [[_CPTokenFieldToken alloc] init];
                 [newToken setTokenField:self];
                 [newToken setRepresentedObject:tokenObject];
                 [newToken setStringValue:tokenValue];
@@ -658,19 +652,38 @@ CPTokenFieldDeleteButtonType     = 1;
         CPTokenFieldDOMInputElement.style.background = "transparent";
         CPTokenFieldDOMInputElement.style.outline = "none";
 
-        CPTokenFieldBlurHandler = function(anEvent)
+        CPTokenFieldBlurFunction = function(anEvent)
         {
-            return CPTextFieldBlurFunction(
-                        anEvent,
-                        CPTokenFieldInputOwner,
-                        CPTokenFieldInputOwner ? [CPTokenFieldInputOwner._tokenScrollView documentView]._DOMElement : nil,
-                        CPTokenFieldDOMInputElement,
-                        CPTokenFieldInputResigning,
-                        @ref(CPTokenFieldInputDidBlur));
+            if (CPTokenFieldInputOwner && [CPTokenFieldInputOwner._tokenScrollView documentView]._DOMElement != CPTokenFieldDOMInputElement.parentNode)
+                return;
+
+            if (CPTokenFieldInputOwner && CPTokenFieldInputOwner._preventResign)
+                return false;
+
+            if (!CPTokenFieldInputResigning && [[CPTokenFieldInputOwner window] isKeyWindow])
+            {
+                // If we lost focus somehow but we're not resigning and we're still in the key window, we'll need to take it back.
+                window.setTimeout(function()
+                {
+                    CPTokenFieldDOMInputElement.focus();
+                }, 0.0);
+            }
+
+            CPTokenFieldHandleBlur(anEvent, CPTokenFieldDOMInputElement);
+            CPTokenFieldInputDidBlur = YES;
+
+            return true;
         };
 
-        // FIXME make this not onblur
-        CPTokenFieldDOMInputElement.onblur = CPTokenFieldBlurHandler;
+        CPTokenFieldHandleBlur = function(anEvent)
+        {
+            CPTokenFieldInputOwner = nil;
+
+            [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
+        };
+
+        //FIXME make this not onblur
+        CPTokenFieldDOMInputElement.onblur = CPTokenFieldBlurFunction;
 
         CPTokenFieldDOMStandardInputElement = CPTokenFieldDOMInputElement;
     }
@@ -929,9 +942,7 @@ CPTokenFieldDeleteButtonType     = 1;
 
 - (void)keyDown:(CPEvent)anEvent
 {
-#if PLATFORM(DOM)
     CPTokenFieldTextDidChangeValue = [self stringValue];
-#endif
 
     // Leave the default _propagateCurrentDOMEvent setting in place. This might be YES or NO depending
     // on if something that could be a browser shortcut was pressed or not, such as Cmd-R to reload.
@@ -941,16 +952,14 @@ CPTokenFieldDeleteButtonType     = 1;
     [self interpretKeyEvents:[anEvent]];
 
     [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
-}
+}}
 
 - (void)keyUp:(CPEvent)anEvent
 {
-#if PLATFORM(DOM)
     if ([self stringValue] !== CPTokenFieldTextDidChangeValue)
     {
         [self textDidChange:[CPNotification notificationWithName:CPControlTextDidChangeNotification object:self userInfo:nil]];
     }
-#endif
 
     [[[self window] platformWindow] _propagateCurrentDOMEvent:YES];
 }
@@ -1016,8 +1025,8 @@ CPTokenFieldDeleteButtonType     = 1;
     var contentRect = _CGRectMakeCopy([contentView bounds]),
         contentOrigin = contentRect.origin,
         contentSize = contentRect.size,
-        offset = CGPointMake(contentOrigin.x, contentOrigin.y),
-        spaceBetweenTokens = CGSizeMake(2.0, 2.0),
+        offset = CPPointMake(contentOrigin.x, contentOrigin.y),
+        spaceBetweenTokens = CPSizeMake(2.0, 2.0),
         isEditing = [[self window] firstResponder] == self,
         tokenToken = [_CPTokenFieldToken new],
         font = [self currentValueForThemeAttribute:@"font"],
@@ -1104,8 +1113,6 @@ CPTokenFieldDeleteButtonType     = 1;
             tokenFrame = fitAndFrame(tokenViewSize.width, tokenViewSize.height);
 
         [tokenView setFrame:tokenFrame];
-
-        [tokenView setButtonType:_buttonType];
     }
 
     if (isEditing && !_selectedRange.length && _CPMaxRange(_selectedRange) >= [tokens count])
@@ -1258,30 +1265,6 @@ CPTokenFieldDeleteButtonType     = 1;
     return aString;
 }
 
-- (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];
-
-    return NO;
-}
-
-- (CPMenu)_menuForRepresentedObject:(id)aRepresentedObject
-{
-    var delegate = [self delegate];
-    if ([delegate respondsToSelector:@selector(tokenField:hasMenuForRepresentedObject:)] &&
-        [delegate respondsToSelector:@selector(tokenField:menuForRepresentedObject:)])
-    {
-        var hasMenu = [delegate tokenField:self hasMenuForRepresentedObject:aRepresentedObject];
-        if (hasMenu)
-            return [delegate tokenField:self menuForRepresentedObject:aRepresentedObject] || nil;
-    }
-
-    return nil;
-}
-
 // We put the string on the pasteboard before calling this delegate method.
 // By default, we write the NSStringPboardType as well as an array of NSStrings.
 // - (BOOL)tokenField:(NSTokenField *)tokenField writeRepresentedObjects:(NSArray *)objects toPasteboard:(NSPasteboard *)pboard;
@@ -1306,25 +1289,13 @@ CPTokenFieldDeleteButtonType     = 1;
     [_autocompleteMenu _hideCompletions];
 }
 
-
-- (void)setButtonType:(int)aButtonType
-{
-    if (_buttonType === aButtonType)
-        return;
-
-    _buttonType = aButtonType;
-    [self setNeedsLayout];
-}
-
 @end
 
 @implementation _CPTokenFieldToken : CPTextField
 {
-    _CPTokenFieldTokenCloseButton       _deleteButton;
-    _CPTokenFieldTokenDisclosureButton  _disclosureButton;
-    CPTokenField                        _tokenField;
-    id                                  _representedObject;
-    int                                 _buttonType;
+    _CPTokenFieldTokenCloseButton   _deleteButton;
+    CPTokenField                    _tokenField;
+    id                              _representedObject;
 }
 
 + (CPString)defaultThemeClass
@@ -1337,14 +1308,16 @@ CPTokenFieldDeleteButtonType     = 1;
     return NO;
 }
 
-- (id)initWithFrame:(CGRect)frame
+- (id)initWithFrame:(CPRect)frame
 {
     if (self = [super initWithFrame:frame])
     {
+        _deleteButton = [[_CPTokenFieldTokenCloseButton alloc] initWithFrame:CPRectMakeZero()];
+        [self addSubview:_deleteButton];
+
         [self setEditable:NO];
         [self setHighlighted:NO];
         [self setBezeled:YES];
-        [self setButtonType:CPTokenFieldDisclosureButtonType];
     }
 
     return self;
@@ -1368,7 +1341,6 @@ CPTokenFieldDeleteButtonType     = 1;
 - (void)setRepresentedObject:(id)representedObject
 {
     _representedObject = representedObject;
-    [self setNeedsLayout];
 }
 
 - (void)setEditable:(BOOL)shouldBeEditable
@@ -1381,12 +1353,9 @@ CPTokenFieldDeleteButtonType     = 1;
 {
     var r = [super setThemeState:aState];
 
-    // Share hover state with the disclosure and delete buttons.
-    if (aState & CPThemeStateHovered)
-    {
-        [_disclosureButton setThemeState:CPThemeStateHovered];
-        [_deleteButton setThemeState:CPThemeStateHovered];
-    }
+    // Share hover state with the delete button.
+    if (r && aState === CPThemeStateHovered)
+        [_deleteButton setThemeState:aState];
 
     return r;
 }
@@ -1395,12 +1364,9 @@ CPTokenFieldDeleteButtonType     = 1;
 {
     var r = [super unsetThemeState:aState];
 
-    // Share hover state with the disclosure and delete button.
-    if (aState & CPThemeStateHovered)
-    {
-        [_disclosureButton unsetThemeState:CPThemeStateHovered];
-        [_deleteButton unsetThemeState:CPThemeStateHovered];
-    }
+    // Share hover state with the delete button.
+    if (r && aState === CPThemeStateHovered)
+        [_deleteButton unsetThemeState:aState];
 
     return r;
 }
@@ -1418,47 +1384,6 @@ CPTokenFieldDeleteButtonType     = 1;
     return size;
 }
 
-- (void)setButtonType:(int)aButtonType
-{
-    if (_buttonType === aButtonType)
-        return;
-
-    _buttonType = aButtonType;
-
-    if (_buttonType === CPTokenFieldDisclosureButtonType)
-    {
-        if (_deleteButton)
-        {
-            [_deleteButton removeFromSuperview];
-            _deleteButton = nil;
-        }
-
-        if (!_disclosureButton)
-        {
-            _disclosureButton = [[_CPTokenFieldTokenDisclosureButton alloc] initWithFrame:CGRectMakeZero()];
-            [self addSubview:_disclosureButton];
-        }
-    }
-    else
-    {
-        if (_disclosureButton)
-        {
-            [_disclosureButton removeFromSuperview];
-            _disclosureButton = nil;
-        }
-
-        if (!_deleteButton)
-        {
-            _deleteButton = [[_CPTokenFieldTokenCloseButton alloc] initWithFrame:CGRectMakeZero()];
-            [self addSubview:_deleteButton];
-            [_deleteButton setTarget:self];
-            [_deleteButton setAction:@selector(_delete:)];
-        }
-    }
-
-    [self setNeedsLayout];
-}
-
 - (void)layoutSubviews
 {
     [super layoutSubviews];
@@ -1467,33 +1392,17 @@ CPTokenFieldDeleteButtonType     = 1;
                                            positioned:CPWindowBelow
                       relativeToEphemeralSubviewNamed:@"content-view"];
 
-    if (bezelView && _tokenField)
+    if (bezelView)
     {
-        switch (_buttonType)
-        {
-            case CPTokenFieldDisclosureButtonType:
-                var shouldBeEnabled = [self hasMenu];
-                [_disclosureButton setHidden:!shouldBeEnabled];
+        [_deleteButton setTarget:self];
+        [_deleteButton setAction:@selector(_delete:)];
+        [_deleteButton setEnabled:[self isEditable]];
 
-                if (shouldBeEnabled)
-                    [_disclosureButton setMenu:[self menu]];
+        var frame = [bezelView frame],
+            buttonOffset = [_deleteButton currentValueForThemeAttribute:@"offset"],
+            buttonSize = [_deleteButton currentValueForThemeAttribute:@"min-size"];
 
-                var frame = [bezelView frame],
-                    buttonOffset = [_disclosureButton currentValueForThemeAttribute:@"offset"],
-                    buttonSize = [_disclosureButton currentValueForThemeAttribute:@"min-size"];
-
-                [_disclosureButton setFrame:_CGRectMake(CGRectGetMaxX(frame) - buttonOffset.x, CGRectGetMinY(frame) + buttonOffset.y, buttonSize.width, buttonSize.height)];
-                break;
-            case CPTokenFieldDeleteButtonType:
-                [_deleteButton setEnabled:[self isEditable] && [self isEnabled]];
-
-                var frame = [bezelView frame],
-                    buttonOffset = [_deleteButton currentValueForThemeAttribute:@"offset"],
-                    buttonSize = [_deleteButton currentValueForThemeAttribute:@"min-size"];
-
-                [_deleteButton setFrame:_CGRectMake(CGRectGetMaxX(frame) - buttonOffset.x, CGRectGetMinY(frame) + buttonOffset.y, buttonSize.width, buttonSize.height)];
-                break;
-        }
+        [_deleteButton setFrame:_CGRectMake(CPRectGetMaxX(frame) - buttonOffset.x, CPRectGetMinY(frame) + buttonOffset.y, buttonSize.width, buttonSize.height)];
     }
 }
 
@@ -1513,18 +1422,11 @@ CPTokenFieldDeleteButtonType     = 1;
         [_tokenField _deleteToken:self];
 }
 
-- (BOOL)hasMenu
-{
-    return [_tokenField _hasMenuForRepresentedObject:_representedObject];
-}
-
-- (CPMenu)menu
-{
-    return [_tokenField _menuForRepresentedObject:_representedObject];
-}
-
 @end
 
+/*
+    Theming hook.
+*/
 @implementation _CPTokenFieldTokenCloseButton : CPButton
 {
 }
@@ -1543,73 +1445,11 @@ CPTokenFieldDeleteButtonType     = 1;
     return "tokenfield-token-close-button";
 }
 
-- (void)mouseEntered:(CPEvent)anEvent
-{
-    // Don't toggle hover state from within the button - we use the hover state of the token field as a whole.
-}
-
-- (void)mouseExited:(CPEvent)anEvent
-{
-    // Don't toggle hover state from within the button - we use the hover state of the token field as a whole.
-}
-
-@end
-
-@implementation _CPTokenFieldTokenDisclosureButton : CPPopUpButton
-{
-}
-
-+ (id)themeAttributes
-{
-    var attributes = [CPButton themeAttributes];
-
-    [attributes setObject:_CGPointMake(15, 5) forKey:@"offset"];
-
-    return attributes;
-}
-
-+ (CPString)defaultThemeClass
-{
-    return "tokenfield-token-disclosure-button";
-}
-
-- (id)initWithFrame:(CGRect)aFrame
-{
-    if (self = [self initWithFrame:aFrame pullsDown:YES])
-    {
-        [self setBordered:YES];
-        [super setTitle:@""];
-    }
-
-    return self;
-}
-
-- (void)setTitle:(CPString)aTitle
-{
-    // skip
-}
-
-- (void)synchronizeTitleAndSelectedItem
-{
-    // skip
-}
-
-- (void)mouseEntered:(CPEvent)anEvent
-{
-    // Don't toggle hover state from within the button - we use the hover state of the token field as a whole.
-}
-
-- (void)mouseExited:(CPEvent)anEvent
-{
-    // Don't toggle hover state from within the button - we use the hover state of the token field as a whole.
-}
-
 @end
 
 
 var CPTokenFieldTokenizingCharacterSetKey   = "CPTokenFieldTokenizingCharacterSetKey",
-    CPTokenFieldCompletionDelayKey          = "CPTokenFieldCompletionDelay",
-    CPTokenFieldButtonTypeKey               = "CPTokenFieldButtonTypeKey";
+    CPTokenFieldCompletionDelayKey          = "CPTokenFieldCompletionDelay";
 
 @implementation CPTokenField (CPCoding)
 
@@ -1621,7 +1461,6 @@ var CPTokenFieldTokenizingCharacterSetKey   = "CPTokenFieldTokenizingCharacterSe
     {
         _tokenizingCharacterSet = [aCoder decodeObjectForKey:CPTokenFieldTokenizingCharacterSetKey] || [[self class] defaultTokenizingCharacterSet];
         _completionDelay = [aCoder decodeDoubleForKey:CPTokenFieldCompletionDelayKey] || [[self class] defaultCompletionDelay];
-        _buttonType = [aCoder decodeIntForKey:CPTokenFieldButtonTypeKey] || CPTokenFieldDisclosureButtonType;
 
         [self _init];
 
@@ -1638,7 +1477,6 @@ var CPTokenFieldTokenizingCharacterSetKey   = "CPTokenFieldTokenizingCharacterSe
 
     [aCoder encodeInt:_tokenizingCharacterSet forKey:CPTokenFieldTokenizingCharacterSetKey];
     [aCoder encodeDouble:_completionDelay forKey:CPTokenFieldCompletionDelayKey];
-    [aCoder encodeInt:_buttonType forKey:CPTokenFieldButtonTypeKey];
 }
 
 @end

AppKit/CPToolbar.j

@@ -28,7 +28,6 @@
 @import "CPPopUpButton.j"
 @import "CPToolbarItem.j"
 
-@global CPApp
 
 /*
     @global
@@ -118,8 +117,8 @@ var CPToolbarsByIdentifier              = nil,
     if (self !== [CPToolbar class])
         return;
 
-    CPToolbarsByIdentifier = @{};
-    CPToolbarConfigurationsByIdentifier = @{};
+    CPToolbarsByIdentifier = [CPDictionary dictionary];
+    CPToolbarConfigurationsByIdentifier = [CPDictionary dictionary];
 }
 
 /* @ignore */
@@ -136,6 +135,19 @@ var CPToolbarsByIdentifier              = nil,
     [toolbarsSharingIdentifier addObject:toolbar];
 }
 
+/*
+    Temporary theme attributes until we've figured out which CPView these theme attributes should
+    belong to.
+    @ignore
+*/
++ (id)_themeAttributes
+{
+    // "regular-size-height" is used if no item has a non-zero min size and sizeMode == CPToolbarSizeModeRegular.
+    // "small-size-height" is used if no item has a non-zero min size and sizeMode == CPToolbarSizeModeSmall.
+    return [CPDictionary dictionaryWithObjects:[_CGInsetMake(4.0, 4.0, 4.0, TOOLBAR_ITEM_MARGIN), 59.0, 46.0]
+                                       forKeys:[@"content-inset", @"regular-size-height", @"small-size-height"]];
+}
+
 - (id)init
 {
     return [self initWithIdentifier:@""];
@@ -230,7 +242,7 @@ var CPToolbarsByIdentifier              = nil,
 - (void)_setWindow:(CPWindow)aWindow
 {
     if (_window)
-        [[CPNotificationCenter defaultCenter] removeObserver:self name:_CPWindowDidChangeFirstResponderNotification object:_window];
+        [[CPNotificationCenter defaultCenter] removeObserver:self object:_window];
 
     _window = aWindow;
 
@@ -269,8 +281,18 @@ var CPToolbarsByIdentifier              = nil,
 
 - (CGRect)_toolbarViewFrame
 {
-    var height = _desiredHeight || (_sizeMode != CPToolbarSizeModeSmall ? [_toolbarView valueForThemeAttribute:@"regular-size-height"] : [_toolbarView valueForThemeAttribute:@"small-size-height"]);
-    return CGRectMake(0.0, 0.0, 1200.0, height);
+    var height = _desiredHeight || (_sizeMode != CPToolbarSizeModeSmall ? [self _valueForThemeAttribute:@"regular-size-height"] : [self _valueForThemeAttribute:@"small-size-height"]);
+    return CPRectMake(0.0, 0.0, 1200.0, height);
+}
+
+/*
+    Temporary theme attributes until we've figured out which CPView these theme attributes should
+    belong to.
+    @ignore
+*/
+- (id)_valueForThemeAttribute:(CPString)attributeName
+{
+    return [[[self class] _themeAttributes] valueForKey:attributeName];
 }
 
 /* @ignore */
@@ -570,6 +592,9 @@ var _CPToolbarViewBackgroundColor = nil,
     _CPToolbarViewExtraItemsImage = nil,
     _CPToolbarViewExtraItemsAlternateImage = nil;
 
+var TOOLBAR_ITEM_MARGIN         = 10.0,
+    TOOLBAR_EXTRA_ITEMS_WIDTH   = 20.0;
+
 var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)
 {
     return { index:anIndex, view:aView, label:aLabel, minWidth:aMinWidth };
@@ -598,24 +623,16 @@ var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)
     BOOL                _FIXME_isHUD;
 }
 
-+ (CPString)defaultThemeClass
++ (void)initialize
 {
-    return @"toolbar-view";
-}
+    if (self !== [_CPToolbarView class])
+        return;
 
-+ (id)themeAttributes
-{
-    return @{
-            @"item-margin": 10.0,
-            @"extra-item-width": 20.0,
-            @"extra-item-extra-image": [CPNull null],
-            @"extra-item-extra-alternate-image": [CPNull null],
-            @"content-inset": _CGInsetMake(4.0, 4.0, 4.0, 10),
-            @"regular-size-height": 59.0,
-            @"small-size-height": 46.0,
-            @"image-item-separator-color": [CPNull null],
-            @"image-item-separator-size": CGRectMake(0.0, 0.0, 2.0, 32.0),
-        };
+    var bundle = [CPBundle bundleForClass:self];
+
+    _CPToolbarViewExtraItemsImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:"_CPToolbarView/_CPToolbarViewExtraItemsImage.png"] size:CPSizeMake(10.0, 15.0)];
+
+    _CPToolbarViewExtraItemsAlternateImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:"_CPToolbarView/_CPToolbarViewExtraItemsAlternateImage.png"] size:_CGSizeMake(10.0, 15.0)];
 }
 
 - (id)initWithFrame:(CGRect)aFrame
@@ -635,6 +652,8 @@ var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)
         [_additionalItemsButton setImagePosition:CPImageOnly];
         [[_additionalItemsButton menu] setShowsStateColumn:NO];
         [[_additionalItemsButton menu] setAutoenablesItems:NO];
+
+        [_additionalItemsButton setAlternateImage:_CPToolbarViewExtraItemsAlternateImage];
     }
 
     return self;
@@ -690,7 +709,7 @@ var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)
     // minimum width for hiding items.
     if (itemsWidth < minWidth)
     {
-        itemsWidth -= [self valueForThemeAttribute:@"extra-item-width"];
+        itemsWidth -= TOOLBAR_EXTRA_ITEMS_WIDTH;
 
         _visibleItems = [_visibleItems copy];
 
@@ -706,7 +725,7 @@ var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)
             var item = itemsSortedByVisibilityPriority[--count],
                 view = [self viewForItem:item];
 
-            minWidth -= [view minSize].width + [self valueForThemeAttribute:@"item-margin"];
+            minWidth -= [view minSize].width + TOOLBAR_ITEM_MARGIN;
 
             [_visibleItems removeObjectIdenticalTo:item];
             [invisibleItemsSortedByPriority addObject:item];
@@ -732,7 +751,7 @@ var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)
     // We'll figure out the proper height for the toolbar depending on its items.
     // If nothing has a minimum size we'll use the standard toolbar size for the
     // sizeMode, indicated by a 0 _desiredHeight.
-    var contentInset = [self valueForThemeAttribute:@"content-inset"],
+    var contentInset = [_toolbar _valueForThemeAttribute:@"content-inset"],
         newDesiredHeight = height ? height + contentInset.top + contentInset.bottom : 0;
 
     if (newDesiredHeight != _toolbar._desiredHeight)
@@ -809,7 +828,7 @@ var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)
     var index = 0,
         count = _visibleItems.length,
         x = contentInset.left,
-        contentInset = [self valueForThemeAttribute:@"content-inset"],
+        contentInset = [_toolbar _valueForThemeAttribute:@"content-inset"],
         y = contentInset.top;
 
     for (; index < count; ++index)
@@ -819,7 +838,7 @@ var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)
 
         [view setFrame:_CGRectMake(x, y, viewWidth, height)];
 
-        x += viewWidth + [self valueForThemeAttribute:@"item-margin"];
+        x += viewWidth + TOOLBAR_ITEM_MARGIN;
     }
 
     var needsAdditionalItemsButton = NO;
@@ -858,7 +877,7 @@ var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)
         [_additionalItemsButton removeAllItems];
 
         [_additionalItemsButton addItemWithTitle:@"Additional Items"];
-        [[_additionalItemsButton itemArray][0] setImage:[self valueForThemeAttribute:@"extra-item-extra-image"]];
+        [[_additionalItemsButton itemArray][0] setImage:_CPToolbarViewExtraItemsImage];
 
         var index = 0,
             count = [_invisibleItems count],
@@ -924,7 +943,7 @@ var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)
 
     count = items.length;
 
-    _minWidth = [self valueForThemeAttribute:@"item-margin"];
+    _minWidth = TOOLBAR_ITEM_MARGIN;
     _viewsForToolbarItems = { };
 
     for (; index < count; ++index)
@@ -939,17 +958,12 @@ var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)
 
         [self addSubview:view];
 
-        _minWidth += [view minSize].width + [self valueForThemeAttribute:@"item-margin"];
+        _minWidth += [view minSize].width + TOOLBAR_ITEM_MARGIN;
     }
 
     [self tile];
 }
 
-- (void)layoutSubviews
-{
-    [_additionalItemsButton setAlternateImage:[self valueForThemeAttribute:@"extra-item-extra-alternate-image"]];
-}
-
 @end
 
 /* @ignore */
@@ -1046,7 +1060,13 @@ var LABEL_MARGIN    = 2.0;
 
         if (identifier === CPToolbarSeparatorItemIdentifier)
         {
-            _view = [[CPView alloc] initWithFrame:CGRectMakeZero()];
+            _view = [[CPView alloc] initWithFrame:_CGRectMake(0.0, 0.0, 2.0, 32.0)];
+
+            // FIXME: Get rid of this old API!!!
+            sizes = {};
+            sizes[@"CPToolbarItemSeparator"] = [_CGSizeMake(2.0, 26.0), _CGSizeMake(2.0, 1.0), _CGSizeMake(2.0, 26.0)];
+            [_view setBackgroundColor:_CPControlThreePartImagePattern(YES, sizes, @"CPToolbarItem", @"Separator")];
+
             [self addSubview:_view];
         }
 
@@ -1119,15 +1139,7 @@ var LABEL_MARGIN    = 2.0;
         width = _CGRectGetWidth(bounds);
 
     if (identifier === CPToolbarSeparatorItemIdentifier)
-    {
-        var itemSeparatorColor = [_toolbar valueForThemeAttribute:@"image-item-separator-color"],
-            itemSeparatorSize = [_toolbar valueForThemeAttribute:@"image-item-separator-size"];
-
-        [_view setFrame:_CGRectMake(ROUND((width - itemSeparatorSize.size.width) / 2.0), 0.0, itemSeparatorSize.size.width, _CGRectGetHeight(bounds))];
-        [_view setBackgroundColor:itemSeparatorColor];
-
-        return;
-    }
+        return [_view setFrame:_CGRectMake(ROUND((width - 2.0) / 2.0), 0.0, 2.0, _CGRectGetHeight(bounds))];
 
     // The view is centred in the available space above the label.
     var view = _view || _imageView,

AppKit/CPToolbarItem.j

@@ -20,8 +20,641 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+@import <Foundation/CPObject.j>
+@import <Foundation/CPString.j>
+
+@import "CPImage.j"
+@import "CPView.j"
+
+
+CPToolbarItemVisibilityPriorityStandard = 0;
+CPToolbarItemVisibilityPriorityLow      = -1000;
+CPToolbarItemVisibilityPriorityHigh     = 1000;
+CPToolbarItemVisibilityPriorityUser     = 2000;
+
+CPToolbarSeparatorItemIdentifier        = @"CPToolbarSeparatorItem";
+CPToolbarSpaceItemIdentifier            = @"CPToolbarSpaceItem";
+CPToolbarFlexibleSpaceItemIdentifier    = @"CPToolbarFlexibleSpaceItem";
+CPToolbarShowColorsItemIdentifier       = @"CPToolbarShowColorsItem";
+CPToolbarShowFontsItemIdentifier        = @"CPToolbarShowFontsItem";
+CPToolbarCustomizeToolbarItemIdentifier = @"CPToolbarCustomizeToolbarItem";
+CPToolbarPrintItemIdentifier            = @"CPToolbarPrintItem";
+
+/*!
+    @ingroup appkit
+    @class CPToolbarItem
+
+    A representation of an item in a CPToolbar.
+*/
+@implementation CPToolbarItem : CPObject
+{
+    CPString    _itemIdentifier;
+
+    CPToolbar   _toolbar;
+
+    CPString    _label;
+    CPString    _paletteLabel;
+    CPString    _toolTip;
+    int         _tag;
+    id          _target;
+    SEL         _action;
+    BOOL        _isEnabled;
+    CPImage     _image;
+    CPImage     _alternateImage;
+
+    CPView      _view;
+
+    CGSize      _minSize;
+    CGSize      _maxSize;
+
+    int         _visibilityPriority;
+
+    BOOL        _autovalidates;
+}
+
+- (id)init
+{
+    return [self initWithItemIdentifier:@""];
+}
+
+// Creating a Toolbar Item
+/*!
+    Initializes the toolbar item with a specified identifier.
+    @param anItemIdentifier the item's identifier
+    @return the initialized toolbar item
+*/
+- (id)initWithItemIdentifier:(CPString)anItemIdentifier
+{
+    self = [super init];
+
+    if (self)
+    {
+        _itemIdentifier = anItemIdentifier;
+
+        _tag = 0;
+        _isEnabled = YES;
+
+        _minSize = CGSizeMakeZero();
+        _maxSize = CGSizeMakeZero();
+
+        _visibilityPriority = CPToolbarItemVisibilityPriorityStandard;
+        _autovalidates = YES;
+    }
+
+    return self;
+}
+
+// Managing Attributes
+/*!
+    Returns the item's identifier.
+*/
+- (CPString)itemIdentifier
+{
+    return _itemIdentifier;
+}
+
+/*!
+    Returns the toolbar of which this item is a part.
+*/
+- (CPToolbar)toolbar
+{
+    return _toolbar;
+}
+
+/* @ignore */
+- (void)_setToolbar:(CPToolbar)aToolbar
+{
+    _toolbar = aToolbar;
+}
+
+/*!
+    Returns the item's label
+*/
+- (CPString)label
+{
+    return _label;
+}
+
+/*!
+    Sets the item's label.
+    @param aLabel the new label for the item
+*/
+- (void)setLabel:(CPString)aLabel
+{
+    _label = aLabel;
+}
+
+/*!
+    Returns the palette label.
+*/
+- (CPString)paletteLabel
+{
+    return _paletteLabel;
+}
+
+/*!
+    Sets the palette label
+    @param aPaletteLabel the new palette label
+*/
+- (void)setPaletteLabel:(CPString)aPaletteLabel
+{
+    _paletteLabel = aPaletteLabel;
+}
+
+/*!
+    Returns the item's tooltip. A tooltip pops up
+    next to the cursor when the user hovers over
+    the item with the mouse.
+*/
+- (CPString)toolTip
+{
+    if ([_view respondsToSelector:@selector(toolTip)])
+        return [_view toolTip];
+
+    return _toolTip;
+}
+
+/*!
+    Sets the item's tooltip. A tooltip pops up next to the cursor when the user hovers over the item with the mouse.
+    @param aToolTip the new item tool tip
+*/
+- (void)setToolTip:(CPString)aToolTip
+{
+    if ([_view respondsToSelector:@selector(setToolTip:)])
+        [_view setToolTip:aToolTip];
+
+    _toolTip = aToolTip;
+}
+
+/*!
+    Returns the item's tag.
+*/
+- (int)tag
+{
+    if ([_view respondsToSelector:@selector(tag)])
+        return [_view tag];
+
+    return _tag;
+}
+
+/*!
+    Sets the item's tag.
+    @param aTag the new tag for the item
+*/
+- (void)setTag:(int)aTag
+{
+    if ([_view respondsToSelector:@selector(setTag:)])
+        [_view setTag:aTag];
+
+    _tag = aTag;
+}
+
+/*!
+    Returns the item's action target.
+*/
+- (id)target
+{
+    if (_view)
+        return [_view respondsToSelector:@selector(target)] ? [_view target] : nil;
+
+    return _target;
+}
+
+/*!
+    Sets the target of the action that is triggered when the user clicks this item. \c nil will cause
+    the action to be passed on to the first responder.
+    @param aTarget the new target
+*/
+- (void)setTarget:(id)aTarget
+{
+    if (!_view)
+        _target = aTarget;
+
+    else if ([_view respondsToSelector:@selector(setTarget:)])
+        [_view setTarget:aTarget];
+}
+
+/*!
+    Returns the action that is triggered when the user clicks this item.
+*/
+- (SEL)action
+{
+    if (_view)
+        return [_view respondsToSelector:@selector(action)] ? [_view action] : nil;
+
+    return _action;
+}
+
+/*!
+    Sets the action that is triggered when the user clicks this item.
+    @param anAction the new action
+*/
+- (void)setAction:(SEL)anAction
+{
+    if (!_view)
+        _action = anAction;
+
+    else if ([_view respondsToSelector:@selector(setAction:)])
+        [_view setAction:anAction];
+}
+
+/*!
+    Returns \c YES if the item is enabled.
+*/
+- (BOOL)isEnabled
+{
+    if ([_view respondsToSelector:@selector(isEnabled)])
+        return [_view isEnabled];
+
+    return _isEnabled;
+}
+
+/*!
+    Sets whether the item is enabled.
+    @param aFlag \c YES enables the item
+*/
+- (void)setEnabled:(BOOL)shouldBeEnabled
+{
+    if (_isEnabled === shouldBeEnabled)
+        return;
+
+    if ([_view respondsToSelector:@selector(setEnabled:)])
+        [_view setEnabled:shouldBeEnabled];
+
+    _isEnabled = shouldBeEnabled;
+}
+
+/*!
+    Returns the item's image
+*/
+- (CPImage)image
+{
+    if ([_view respondsToSelector:@selector(image)])
+        return [_view image];
+
+    return _image;
+}
+
+/*!
+    Sets the item's image.
+    @param anImage the new item image
+*/
+- (void)setImage:(CPImage)anImage
+{
+    if ([_view respondsToSelector:@selector(setImage:)])
+        [_view setImage:anImage];
+
+    _image = anImage;
+
+    if (!_image)
+        return;
+
+    if (_minSize.width === 0 && _minSize.height === 0 &&
+        _maxSize.width === 0 && _maxSize.height === 0)
+    {
+        var imageSize = [_image size];
+
+        if (imageSize.width > 0 || imageSize.height > 0)
+        {
+            [self setMinSize:imageSize];
+            [self setMaxSize:imageSize];
+        }
+    }
+}
+
+/*!
+    Sets the alternate image. This image is displayed on the item when the user is clicking it.
+    @param anImage the new alternate image
+*/
+- (void)setAlternateImage:(CPImage)anImage
+{
+    if ([_view respondsToSelector:@selector(setAlternateImage:)])
+        [_view setAlternateImage:anImage];
+
+    _alternateImage = anImage;
+}
+
+/*!
+    Returns the alternate image. This image is displayed on the item when the user is clicking it.
+*/
+- (CPImage)alternateImage
+{
+    if ([_view respondsToSelector:@selector(alternateIamge)])
+        return [_view alternateImage];
+
+    return _alternateImage;
+}
+
+/*!
+    Returns the item's view.
+*/
+- (CPView)view
+{
+    return _view;
+}
+
+/*!
+    Sets the item's view
+    @param aView the item's new view
+*/
+- (void)setView:(CPView)aView
+{
+    if (_view == aView)
+        return;
+
+    _view = aView;
+
+    if (_view)
+    {
+        // Tags get forwarded.
+        if (_tag !== 0 && [_view respondsToSelector:@selector(setTag:)])
+            [_view setTag:_tag];
+
+        _target = nil;
+        _action = nil;
+    }
+}
+
+/*!
+    Returns the item's minimum size.
+*/
+- (CGSize)minSize
+{
+    return _minSize;
+}
+
+/*!
+    Sets the item's minimum size.
+    @param aMinSize the new minimum size
+*/
+- (void)setMinSize:(CGSize)aMinSize
+{
+    if (!aMinSize.height || !aMinSize.width)
+        return;
+
+    _minSize = CGSizeMakeCopy(aMinSize);
+
+    // Try to provide some sanity: Make maxSize >= minSize
+    _maxSize = CGSizeMake(MAX(_minSize.width, _maxSize.width), MAX(_minSize.height, _maxSize.height));
+}
+
+/*!
+    Returns the item's maximum size.
+*/
+- (CGSize)maxSize
+{
+    return _maxSize;
+}
+
+/*!
+    Sets the item's new maximum size.
+    @param aMaxSize the new maximum size
+*/
+- (void)setMaxSize:(CGSize)aMaxSize
+{
+    if (!aMaxSize.height || !aMaxSize.width)
+        return;
+
+    _maxSize = CGSizeMakeCopy(aMaxSize);
+
+    // Try to provide some sanity: Make minSize <= maxSize
+    _minSize = CGSizeMake(MIN(_minSize.width, _maxSize.width), MIN(_minSize.height, _maxSize.height));
+}
+
+// Visibility Priority
+/*!
+    Returns the item's visibility priority. The value will be one of:
+<pre>
+CPToolbarItemVisibilityPriorityStandard
+CPToolbarItemVisibilityPriorityLow
+CPToolbarItemVisibilityPriorityHigh
+CPToolbarItemVisibilityPriorityUser
+</pre>
+*/
+- (int)visibilityPriority
+{
+    return _visibilityPriority;
+}
+
+/*!
+    Sets the item's visibility priority. The value must be one of:
+<pre>
+CPToolbarItemVisibilityPriorityStandard
+CPToolbarItemVisibilityPriorityLow
+CPToolbarItemVisibilityPriorityHigh
+CPToolbarItemVisibilityPriorityUser
+</pre>
+    @param aVisiblityPriority the priority
+*/
+- (void)setVisibilityPriority:(int)aVisibilityPriority
+{
+    _visibilityPriority = aVisibilityPriority;
+}
+
+- (void)validate
+{
+    var action = [self action],
+        target = [self target];
+
+    // View items do not do any target-action analysis.
+    if (_view)
+    {
+        if ([target respondsToSelector:@selector(validateToolbarItem:)])
+        {
+            var shouldBeEnabled = [target validateToolbarItem:self];
+            if (_isEnabled !== shouldBeEnabled)
+                [self setEnabled:shouldBeEnabled];
+        }
+
+        return;
+    }
+
+    if (!action)
+    {
+        if (_isEnabled)
+            return [self setEnabled:NO];
+        return;
+    }
+
+    if (target && ![target respondsToSelector:action])
+    {
+        if (_isEnabled)
+            return [self setEnabled:NO];
+        return;
+    }
+
+    target = [CPApp targetForAction:action to:target from:self];
+
+    if (!target)
+    {
+        if (_isEnabled)
+            return [self setEnabled:NO];
+        return;
+    }
+
+    if ([target respondsToSelector:@selector(validateToolbarItem:)])
+    {
+        var shouldBeEnabled = [target validateToolbarItem:self];
+        if (_isEnabled !== shouldBeEnabled)
+            [self setEnabled:shouldBeEnabled];
+    }
+    else
+    {
+        if (!_isEnabled)
+            [self setEnabled:YES];
+    }
+}
+
+- (BOOL)autovalidates
+{
+    return _autovalidates;
+}
+
+- (void)setAutovalidates:(BOOL)shouldAutovalidate
+{
+    _autovalidates = !!shouldAutovalidate;
+}
+
+@end
+
+var CPToolbarItemItemIdentifierKey      = @"CPToolbarItemItemIdentifierKey",
+    CPToolbarItemLabelKey               = @"CPToolbarItemLabelKey",
+    CPToolbarItemPaletteLabelKey        = @"CPToolbarItemPaletteLabelKey",
+    CPToolbarItemToolTipKey             = @"CPToolbarItemToolTipKey",
+    CPToolbarItemTagKey                 = @"CPToolbarItemTagKey",
+    CPToolbarItemTargetKey              = @"CPToolbarItemTargetKey",
+    CPToolbarItemActionKey              = @"CPToolbarItemActionKey",
+    CPToolbarItemEnabledKey             = @"CPToolbarItemEnabledKey",
+    CPToolbarItemImageKey               = @"CPToolbarItemImageKey",
+    CPToolbarItemAlternateImageKey      = @"CPToolbarItemAlternateImageKey",
+    CPToolbarItemViewKey                = @"CPToolbarItemViewKey",
+    CPToolbarItemMinSizeKey             = @"CPToolbarItemMinSizeKey",
+    CPToolbarItemMaxSizeKey             = @"CPToolbarItemMaxSizeKey",
+    CPToolbarItemVisibilityPriorityKey  = @"CPToolbarItemVisibilityPriorityKey",
+    CPToolbarItemAutovalidatesKey       = @"CPToolbarItemAutovalidatesKey";
+
+@implementation CPToolbarItem (CPCoding)
+
+- (id)initWithCoder:(CPCoder)aCoder
+{
+    self = [super init];
+
+    if (self)
+    {
+        _itemIdentifier = [aCoder decodeObjectForKey:CPToolbarItemItemIdentifierKey];
+
+        _minSize = [aCoder decodeSizeForKey:CPToolbarItemMinSizeKey];
+        _maxSize = [aCoder decodeSizeForKey:CPToolbarItemMaxSizeKey];
+
+        [self setLabel:[aCoder decodeObjectForKey:CPToolbarItemLabelKey]];
+        [self setPaletteLabel:[aCoder decodeObjectForKey:CPToolbarItemPaletteLabelKey]];
+        [self setToolTip:[aCoder decodeObjectForKey:CPToolbarItemToolTipKey]];
+
+        [self setTag:[aCoder decodeObjectForKey:CPToolbarItemTagKey]];
+        [self setTarget:[aCoder decodeObjectForKey:CPToolbarItemTargetKey]];
+        [self setAction:CPSelectorFromString([aCoder decodeObjectForKey:CPToolbarItemActionKey])];
+
+        [self setEnabled:[aCoder decodeBoolForKey:CPToolbarItemEnabledKey]];
+
+        [self setImage:[aCoder decodeObjectForKey:CPToolbarItemImageKey]];
+        [self setAlternateImage:[aCoder decodeObjectForKey:CPToolbarItemAlternateImageKey]];
+
+        [self setView:[aCoder decodeObjectForKey:CPToolbarItemViewKey]];
+
+        [self setVisibilityPriority:[aCoder decodeIntForKey:CPToolbarItemVisibilityPriorityKey]];
+        [self setAutovalidates:[aCoder decodeBoolForKey:CPToolbarItemAutovalidatesKey]];
+    }
+
+    return self;
+}
+
+- (void)encodeWithCoder:(CPCoder)aCoder
+{
+    [aCoder encodeObject:_itemIdentifier forKey:CPToolbarItemItemIdentifierKey];
+
+    [aCoder encodeObject:[self label] forKey:CPToolbarItemLabelKey];
+    [aCoder encodeObject:[self paletteLabel] forKey:CPToolbarItemPaletteLabelKey];
+
+    [aCoder encodeObject:[self toolTip] forKey:CPToolbarItemToolTipKey];
+
+    [aCoder encodeObject:[self tag] forKey:CPToolbarItemTagKey];
+    [aCoder encodeObject:[self target] forKey:CPToolbarItemTargetKey];
+    [aCoder encodeObject:[self action] forKey:CPToolbarItemActionKey];
+
+    [aCoder encodeObject:[self isEnabled] forKey:CPToolbarItemEnabledKey];
+
+    [aCoder encodeObject:[self image] forKey:CPToolbarItemImageKey];
+    [aCoder encodeObject:[self alternateImage] forKey:CPToolbarItemAlternateImageKey];
+
+    [aCoder encodeObject:[self view] forKey:CPToolbarItemViewKey];
+
+    [aCoder encodeSize:[self minSize] forKey:CPToolbarItemMinSizeKey];
+    [aCoder encodeSize:[self maxSize] forKey:CPToolbarItemMaxSizeKey];
+
+    [aCoder encodeObject:[self visibilityPriority] forKey:CPToolbarItemVisibilityPriorityKey];
+    [aCoder encodeBool:[self autovalidates] forKey:CPToolbarItemAutovalidatesKey];
+}
+
+@end
+
+@implementation CPToolbarItem (CPCopying)
+
+- (id)copy
+{
+    var copy = [[[self class] alloc] initWithItemIdentifier:_itemIdentifier];
+
+    if (_view)
+        [copy setView:[CPKeyedUnarchiver unarchiveObjectWithData:[CPKeyedArchiver archivedDataWithRootObject:_view]]];
+
+    [copy _setToolbar:_toolbar];
+
+    [copy setLabel:_label];
+    [copy setPaletteLabel:_paletteLabel];
+    [copy setToolTip:[self toolTip]];
+
+    [copy setTag:[self tag]];
+    [copy setTarget:[self target]];
+    [copy setAction:[self action]];
+
+    [copy setEnabled:[self isEnabled]];
+
+    [copy setImage:[self image]];
+    [copy setAlternateImage:[self alternateImage]];
+
+    [copy setMinSize:_minSize];
+    [copy setMaxSize:_maxSize];
+
+    [copy setVisibilityPriority:[self visibilityPriority]];
+    [copy setAutovalidates:[self autovalidates]];
+
+    return copy;
+}
+
+@end
+
+// Standard toolbar identifiers
+
+@implementation CPToolbarItem (Standard)
+
+/* @ignore */
++ (CPToolbarItem)_standardItemWithItemIdentifier:(CPString)anItemIdentifier
+{
+    switch (anItemIdentifier)
+    {
+        case CPToolbarSeparatorItemIdentifier:          return [_CPToolbarSeparatorItem new];
+        case CPToolbarSpaceItemIdentifier:              return [_CPToolbarSpaceItem new];
+        case CPToolbarFlexibleSpaceItemIdentifier:      return [_CPToolbarFlexibleSpaceItem new];
+        case CPToolbarShowColorsItemIdentifier:         return [_CPToolbarShowColorsItem new];
+        case CPToolbarShowFontsItemIdentifier:          return nil;
+        case CPToolbarCustomizeToolbarItemIdentifier:   return nil;
+        case CPToolbarPrintItemIdentifier:              return nil;
+    }
+
+    return nil;
+}
+
+@end
 
-@import "_CPToolbarItem.j"
 @import "_CPToolbarFlexibleSpaceItem.j"
 @import "_CPToolbarShowColorsItem.j"
 @import "_CPToolbarSeparatorItem.j"

AppKit/CPTreeNode.j

@@ -1,24 +1,3 @@
-/*
- * CPTreeNode.j
- * AppKit
- *
- * Created by Francisco Tolmasky.
- * Copyright 2009, 280 North, Inc.
- *
- * 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 <Foundation/CPObject.j>
 @import <Foundation/CPIndexPath.j>

AppKit/CPUserDefaultsController.j

@@ -23,15 +23,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-@import <Foundation/CPDictionary.j>
-@import <Foundation/CPNotificationCenter.j>
+
 @import <Foundation/CPString.j>
-@import <Foundation/CPUserDefaults.j>
-
-@import "CPController.j"
-
-@global CPUserDefaultsDidChangeNotification
-
+@import <AppKit/CPController.j>
 
 var SharedUserDefaultsController = nil;
 
@@ -40,7 +34,6 @@ var SharedUserDefaultsController = nil;
     CPUserDefaults  _defaults           @accessors(readonly, property=defaults);
     CPDictionary    _initialValues      @accessors(property=initialValues);
     BOOL            _appliesImmediately @accessors(property=appliesImmediately);
-    id              _valueProxy;
 }
 
 + (id)sharedUserDefaultsController

AppKit/CPView.j

@@ -21,27 +21,19 @@
  */
 
 @import <Foundation/CPArray.j>
+@import <Foundation/CPGeometry.j>
 @import <Foundation/CPObjJRuntime.j>
 @import <Foundation/CPSet.j>
 
 @import "CGAffineTransform.j"
-@import "CGGeometry.j"
+
+
 @import "CPColor.j"
 @import "CPGraphicsContext.j"
 @import "CPResponder.j"
 @import "CPTheme.j"
-@import "CPWindow_Constants.j"
 @import "_CPDisplayServer.j"
 
-@class _CPToolTip
-@class CPWindow
-@class _CPMenuItemView
-@class CPPlatformWindow
-@class CPMenu
-@class CPClipView
-@class CPScrollView
-
-@global appkit_tag_dom_elements
 
 /*
     @global
@@ -134,7 +126,6 @@ var CPViewFlags                     = { },
     CPGraphicsContext   _graphicsContext;
 
     int                 _tag;
-    CPString            _identifier @accessors(property=identifier);
 
     CGRect              _frame;
     CGRect              _bounds;
@@ -228,14 +219,6 @@ var CPViewFlags                     = { },
     CachedNotificationCenter = [CPNotificationCenter defaultCenter];
 }
 
-+ (Class)_binderClassForBinding:(CPString)aBinding
-{
-    if ([aBinding hasPrefix:CPHiddenBinding])
-        return [CPMultipleValueOrBinding class];
-
-    return [super _binderClassForBinding:aBinding];
-}
-
 - (void)_setupViewFlags
 {
     var theClass = [self class],
@@ -476,15 +459,11 @@ var CPViewFlags                     = { },
 {
     if (aSubview === self)
         [CPException raise:CPInvalidArgumentException reason:"can't add a view as a subview of itself"];
-#if DEBUG
-    if (!aSubview._superview && _subviews.indexOf(aSubview) !== CPNotFound)
-        [CPException raise:CPInvalidArgumentException reason:"can't insert a subview in duplicate (probably partially decoded)"];
-#endif
 
     // We will have to adjust the z-index of all views starting at this index.
     var count = _subviews.length;
 
-    // Dirty the key view loop, in case the window wants to auto recalculate it
+    // dirty the key view loop, in case the window wants to auto recalculate it
     [[self window] _dirtyKeyViewLoop];
 
     // If this is already one of our subviews, remove it.
@@ -565,15 +544,15 @@ var CPViewFlags                     = { },
     if (!_superview)
         return;
 
-    // Dirty the key view loop, in case the window wants to auto recalculate it
+    // dirty the key view loop, in case the window wants to auto recalculate it
     [[self window] _dirtyKeyViewLoop];
 
     [_superview willRemoveSubview:self];
 
-    [_superview._subviews removeObjectIdenticalTo:self];
+    [_superview._subviews removeObject:self];
 
 #if PLATFORM(DOM)
-    CPDOMDisplayServerRemoveChild(_superview._DOMElement, _DOMElement);
+        CPDOMDisplayServerRemoveChild(_superview._DOMElement, _DOMElement);
 #endif
     _superview = nil;
 
@@ -1375,7 +1354,6 @@ var CPViewFlags                     = { },
     }
     else
     {
-        [self setNeedsDisplay:YES];
         [self _notifyViewDidUnhide];
     }
 }
@@ -1511,12 +1489,13 @@ var CPViewFlags                     = { },
 
 /*!
     Returns whether the receiver should be sent a \c -mouseDown: message for \c anEvent.<br/>
-    Returns \c NO by default.
+    Returns \c YES by default.
     @return \c YES, if the view object accepts first mouse-down event. \c NO, otherwise.
 */
+//FIXME: should be NO by default?
 - (BOOL)acceptsFirstMouse:(CPEvent)anEvent
 {
-    return NO;
+    return YES;
 }
 
 /*!
@@ -1542,7 +1521,7 @@ var CPViewFlags                     = { },
     @param aPoint the point to test
     @return returns the containing view, or nil if the point is not contained
 */
-- (CPView)hitTest:(CGPoint)aPoint
+- (CPView)hitTest:(CPPoint)aPoint
 {
     if (_isHidden || !_hitTests || !_CGRectContainsPoint(_frame, aPoint))
         return nil;
@@ -1587,7 +1566,6 @@ var CPViewFlags                     = { },
 - (void)rightMouseDown:(CPEvent)anEvent
 {
     var menu = [self menuForEvent:anEvent];
-
     if (menu)
         [CPMenu popUpContextMenu:menu withEvent:anEvent forView:self];
     else if ([[self nextResponder] isKindOfClass:CPView])
@@ -2064,7 +2042,7 @@ setBoundsOrigin:
     @param aSourceObject the drag operation controller
     @param slideBack Whether the view should 'slide back' if the drag is rejected
 */
-- (void)dragView:(CPView)aView at:(CGPoint)aLocation offset:(CGSize)mouseOffset event:(CPEvent)anEvent pasteboard:(CPPasteboard)aPasteboard source:(id)aSourceObject slideBack:(BOOL)slideBack
+- (void)dragView:(CPView)aView at:(CPPoint)aLocation offset:(CPSize)mouseOffset event:(CPEvent)anEvent pasteboard:(CPPasteboard)aPasteboard source:(id)aSourceObject slideBack:(BOOL)slideBack
 {
     [_window dragView:aView at:[self convertPoint:aLocation toView:nil] offset:mouseOffset event:anEvent pasteboard:aPasteboard source:aSourceObject slideBack:slideBack];
 }
@@ -2114,7 +2092,7 @@ setBoundsOrigin:
     Draws the receiver into \c aRect. This method should be overridden by subclasses.
     @param aRect the area that should be drawn into
 */
-- (void)drawRect:(CGRect)aRect
+- (void)drawRect:(CPRect)aRect
 {
 
 }
@@ -2134,7 +2112,7 @@ setBoundsOrigin:
     Marks the area denoted by \c aRect as dirty, and initiates a redraw on it.
     @param aRect the area that needs to be redrawn
 */
-- (void)setNeedsDisplayInRect:(CGRect)aRect
+- (void)setNeedsDisplayInRect:(CPRect)aRect
 {
     if (!(_viewClassFlags & CPViewHasCustomDrawRect))
         return;
@@ -2182,7 +2160,7 @@ setBoundsOrigin:
     Draws the receiver into the area defined by \c aRect.
     @param aRect the area to be drawn
 */
-- (void)displayRect:(CGRect)aRect
+- (void)displayRect:(CPRect)aRect
 {
     [self viewWillDraw];
 
@@ -2219,7 +2197,6 @@ setBoundsOrigin:
     {
         var graphicsPort = CGBitmapGraphicsContextCreate();
 
-#if PLATFORM(DOM)
         _DOMContentsElement = graphicsPort.DOMElement;
 
         _DOMContentsElement.style.zIndex = -100;
@@ -2236,6 +2213,7 @@ setBoundsOrigin:
         _DOMContentsElement.style.width = ROUND(_CGRectGetWidth(_frame)) + "px";
         _DOMContentsElement.style.height = ROUND(_CGRectGetHeight(_frame)) + "px";
 
+#if PLATFORM(DOM)
         // The performance implications of this aren't clear, but without this subviews might not be redrawn when this
         // view moves.
         if (CPPlatformHasBug(CPCanvasParentDrawErrorsOnMovementBug))
@@ -2338,11 +2316,13 @@ setBoundsOrigin:
 */
 - (BOOL)scrollRectToVisible:(CGRect)aRect
 {
+    var visibleRect = [self visibleRect];
+
     // Make sure we have a rect that exists.
     aRect = CGRectIntersection(aRect, _bounds);
 
-    // If aRect is empty no scrolling required.
-    if (_CGRectIsEmpty(aRect))
+    // If aRect is empty or is already visible then no scrolling required.
+    if (_CGRectIsEmpty(aRect) || CGRectContainsRect(visibleRect, aRect))
         return NO;
 
     var enclosingClipView = [self _enclosingClipView];
@@ -2351,34 +2331,20 @@ setBoundsOrigin:
     if (!enclosingClipView)
         return NO;
 
-    var documentView = [enclosingClipView documentView];
-
-    // If the clip view doesn't have a document view, then there isn't much we can do.
-    if (!documentView)
-        return NO;
-
-    // Get the document view visible rect and convert aRect to the document view's coordinate system
-    var documentViewVisibleRect = [documentView visibleRect],
-        rectInDocumentView = [self convertRect:aRect toView:documentView];
-
-    // If already visible then no scrolling required.
-    if (CGRectContainsRect(documentViewVisibleRect, rectInDocumentView))
-        return NO;
-
-    var scrollPoint = _CGPointMakeCopy(documentViewVisibleRect.origin);
+    var scrollPoint = _CGPointMakeCopy(visibleRect.origin);
 
     // One of the following has to be true since our current visible rect didn't contain aRect.
-    if (_CGRectGetMinX(rectInDocumentView) < _CGRectGetMinX(documentViewVisibleRect))
-        scrollPoint.x = _CGRectGetMinX(rectInDocumentView);
-    else if (_CGRectGetMaxX(rectInDocumentView) > _CGRectGetMaxX(documentViewVisibleRect))
-        scrollPoint.x += _CGRectGetMaxX(rectInDocumentView) - _CGRectGetMaxX(documentViewVisibleRect);
+    if (_CGRectGetMinX(aRect) <= _CGRectGetMinX(visibleRect))
+        scrollPoint.x = _CGRectGetMinX(aRect);
+    else if (_CGRectGetMaxX(aRect) > _CGRectGetMaxX(visibleRect))
+        scrollPoint.x += _CGRectGetMaxX(aRect) - _CGRectGetMaxX(visibleRect);
 
-    if (_CGRectGetMinY(rectInDocumentView) < _CGRectGetMinY(documentViewVisibleRect))
-        scrollPoint.y = _CGRectGetMinY(rectInDocumentView);
-    else if (_CGRectGetMaxY(rectInDocumentView) > _CGRectGetMaxY(documentViewVisibleRect))
-        scrollPoint.y += _CGRectGetMaxY(rectInDocumentView) - _CGRectGetMaxY(documentViewVisibleRect);
+    if (_CGRectGetMinY(aRect) <= _CGRectGetMinY(visibleRect))
+        scrollPoint.y = CGRectGetMinY(aRect);
+    else if (_CGRectGetMaxY(aRect) > _CGRectGetMaxY(visibleRect))
+        scrollPoint.y += _CGRectGetMaxY(aRect) - _CGRectGetMaxY(visibleRect);
 
-    [enclosingClipView scrollToPoint:scrollPoint];
+    [enclosingClipView scrollToPoint:CGPointMake(scrollPoint.x, scrollPoint.y)];
 
     return YES;
 }
@@ -2562,7 +2528,7 @@ setBoundsOrigin:
 
 - (void)_setPreviousKeyView:(CPView)previous
 {
-    if ([previous isEqual:self] || ![[previous window] isEqual:[self window]])
+    if ([previous isEqual:self])
         _previousKeyView = nil;
     else
         _previousKeyView = previous;
@@ -2570,7 +2536,7 @@ setBoundsOrigin:
 
 - (void)setNextKeyView:(CPView)next
 {
-    if ([next isEqual:self] || ![[next window] isEqual:[self window]])
+    if ([next isEqual:self])
         _nextKeyView = nil;
     else
     {
@@ -2798,12 +2764,6 @@ setBoundsOrigin:
     [self viewDidChangeTheme];
 }
 
-- (void)_setThemeIncludingDescendants:(CPTheme)aTheme
-{
-    [self setTheme:aTheme];
-    [[self subviews] makeObjectsPerformSelector:@selector(_setThemeIncludingDescendants:) withObject:aTheme];
-}
-
 - (CPTheme)theme
 {
     return _theme;
@@ -2827,7 +2787,7 @@ setBoundsOrigin:
 
 - (CPDictionary)_themeAttributeDictionary
 {
-    var dictionary = @{};
+    var dictionary = [CPDictionary dictionary];
 
     if (_themeAttributes)
     {
@@ -3020,8 +2980,7 @@ var CPViewAutoresizingMaskKey       = @"CPViewAutoresizingMask",
     CPViewThemeStateKey             = @"CPViewThemeStateKey",
     CPViewWindowKey                 = @"CPViewWindowKey",
     CPViewNextKeyViewKey            = @"CPViewNextKeyViewKey",
-    CPViewPreviousKeyViewKey        = @"CPViewPreviousKeyViewKey",
-    CPReuseIdentifierKey            = @"CPReuseIdentifierKey";
+    CPViewPreviousKeyViewKey        = @"CPViewPreviousKeyViewKey";
 
 @implementation CPView (CPCoding)
 
@@ -3050,24 +3009,11 @@ var CPViewAutoresizingMaskKey       = @"CPViewAutoresizingMask",
     {
         // We have to manually check because it may be 0, so we can't use ||
         _tag = [aCoder containsValueForKey:CPViewTagKey] ? [aCoder decodeIntForKey:CPViewTagKey] : -1;
-        _identifier = [aCoder decodeObjectForKey:CPReuseIdentifierKey];
 
         _window = [aCoder decodeObjectForKey:CPViewWindowKey];
+        _subviews = [aCoder decodeObjectForKey:CPViewSubviewsKey] || [];
         _superview = [aCoder decodeObjectForKey:CPViewSuperviewKey];
 
-        // We have to manually add the subviews so that they will receive
-        // viewWillMoveToSuperview: and viewDidMoveToSuperview:
-        _subviews = [];
-
-        var subviews = [aCoder decodeObjectForKey:CPViewSubviewsKey] || [];
-
-        for (var i = 0, count = [subviews count]; i < count; ++i)
-        {
-            // addSubview won't do anything if the superview is already self, so clear it
-            subviews[i]._superview = nil;
-            [self addSubview:subviews[i]];
-        }
-
         // FIXME: Should we encode/decode this?
         _registeredDraggedTypes = [CPSet set];
         _registeredDraggedTypesArray = [];
@@ -3213,9 +3159,6 @@ var CPViewAutoresizingMaskKey       = @"CPViewAutoresizingMask",
     for (var attributeName in _themeAttributes)
         if (_themeAttributes.hasOwnProperty(attributeName))
             CPThemeAttributeEncode(aCoder, _themeAttributes[attributeName]);
-
-    if (_identifier)
-        [aCoder encodeObject:_identifier forKey:CPReuseIdentifierKey];
 }
 
 @end

AppKit/CPViewAnimation.j

@@ -22,7 +22,6 @@
 
 @import "CPAnimation.j"
 
-@class CPWindow
 
 CPViewAnimationTargetKey = @"CPViewAnimationTargetKey";
 CPViewAnimationStartFrameKey = @"CPViewAnimationStartFrameKey";
@@ -59,12 +58,8 @@ CPViewAnimationFadeOutEffect = @"CPViewAnimationFadeOutEffect";
 
     For example:
     <pre>
-    var animation = @{
-            CPViewAnimationTargetKey: myViewToAnimate,
-            CPViewAnimationStartFrameKey: aStartFrame,
-            CPViewAnimationEndFrameKey: anEndFrame,
-            CPViewAnimationEffectKey: CPViewAnimationFadeInEffect,
-        };
+    var animation = [CPDictionary dictionaryWithObjects:[myViewToAnimate, aStartFrame, anEndFrame, CPViewAnimationFadeInEffect]
+                                                forKeys:[CPViewAnimationTargetKey, CPViewAnimationStartFrameKey, CPViewAnimationEndFrameKey, CPViewAnimationEffectKey]];
     </pre>
 
     If you pass nil instead of an array of dictionaries you should later call setViewAnimations:.