Merge branch 'master' of git://github.com/slevenbits/cappuccino into slevenbits-master

Before this fix, CPWindowController -setViewController was unconditionally loading the view, which should not happen.

.gitignore

@@ -5,15 +5,8 @@ Demos
 ./Aristo
 WebSite
 .push-package
-*.xcodeproj*
 *.xcodeproj/*.pbxuser
 *.xcodeproj/*.perspectivev3
 xcuserdata/
 !*.xcodeproj/project.pbxproj
 *.xCodeSupport/
-*.XcodeSupport/
-*XcodeSupport/
-Tests/Manual/**/*.xcodeproj
-*.sublime-project
-*.sublime-workspace
-*.tm_properties

.travis.yml

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

AppKit/AppKit.j

@@ -20,14 +20,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-@import "_CPObject+Theme.j"
 @import "_CPToolTip.j"
 @import "CALayer.j"
 @import "CGGeometry.j"
 @import "CPAccordionView.j"
 @import "CPAlert.j"
 @import "CPAnimation.j"
-@import "CPAppearance.j"
 @import "CPApplication.j"
 @import "CPArrayController.j"
 @import "CPBezierPath.j"
@@ -57,7 +55,6 @@
 @import "CPController.j"
 @import "CPCookie.j"
 @import "CPCursor.j"
-@import "CPDatePicker.j"
 @import "CPDocument.j"
 @import "CPDocumentController.j"
 @import "CPEvent.j"
@@ -103,14 +100,12 @@
 @import "CPTokenField.j"
 @import "CPToolbar.j"
 @import "CPToolbarItem.j"
-@import "CPTrackingArea.j"
 @import "CPTreeNode.j"
 @import "CPUserDefaultsController.j"
 @import "CPView.j"
 @import "CPViewAnimation.j"
 @import "CPViewController.j"
-@import "CPVisualEffectView.j"
 @import "CPWebView.j"
 @import "CPWindow.j"
 @import "CPWindowController.j"
-@import "CPWorkspace.j"
+@import "CPWorkspace.j"

AppKit/CPAccordionView.j

@@ -106,7 +106,7 @@ var secondItem = [[CPAccordionViewItem alloc] initWithIdentifier:@"secondSection
         _itemViews = [];
         _expandedItemIndexes = [CPIndexSet indexSet];
 
-        [self setItemHeaderPrototype:[[CPButton alloc] initWithFrame:CGRectMake(0.0, 0.0, 100.0, 24.0)]];
+        [self setItemHeaderPrototype:[[CPButton alloc] initWithFrame:_CGRectMake(0.0, 0.0, 100.0, 24.0)]];
     }
 
     return self;
@@ -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;
 }
@@ -258,18 +258,18 @@ var secondItem = [[CPAccordionViewItem alloc] initWithIdentifier:@"secondSection
 
 - (void)setFrameSize:(CGSize)aSize
 {
-    var width = CGRectGetWidth([self frame]);
+    var width = _CGRectGetWidth([self frame]);
 
     [super setFrameSize:aSize];
 
-    if (width !== CGRectGetWidth([self frame]))
+    if (width !== _CGRectGetWidth([self frame]))
         [self _invalidateItemsStartingAtIndex:0];
 }
 
 - (void)layoutSubviews
 {
     if (_items.length <= 0)
-        return [self setFrameSize:CGSizeMake(CGRectGetWidth([self frame]), 0.0)];
+        return [self setFrameSize:_CGSizeMake(_CGRectGetWidth([self frame]), 0.0)];
 
     if (_dirtyItemIndex === CPNotFound)
         return;
@@ -278,7 +278,7 @@ var secondItem = [[CPAccordionViewItem alloc] initWithIdentifier:@"secondSection
 
     var index = _dirtyItemIndex,
         count = _itemViews.length,
-        width = CGRectGetWidth([self bounds]),
+        width = _CGRectGetWidth([self bounds]),
         y = index > 0 ? CGRectGetMaxY([_itemViews[index - 1] frame]) : 0.0;
 
     // Do this now (instead of after looping), so that if we are made dirty again in the middle we don't blow this value away.
@@ -293,7 +293,7 @@ var secondItem = [[CPAccordionViewItem alloc] initWithIdentifier:@"secondSection
         y = CGRectGetMaxY([itemView frame]);
     }
 
-    [self setFrameSize:CGSizeMake(CGRectGetWidth([self frame]), y)];
+    [self setFrameSize:_CGSizeMake(_CGRectGetWidth([self frame]), y)];
 }
 
 @end
@@ -310,7 +310,7 @@ var secondItem = [[CPAccordionViewItem alloc] initWithIdentifier:@"secondSection
 
 - (id)initWithAccordionView:(CPAccordionView)anAccordionView
 {
-    self = [super initWithFrame:CGRectMakeZero()];
+    self = [super initWithFrame:_CGRectMakeZero()];
 
     if (self)
     {
@@ -376,21 +376,21 @@ var secondItem = [[CPAccordionViewItem alloc] initWithIdentifier:@"secondSection
 
 - (void)setFrameY:(float)aY width:(float)aWidth
 {
-    var headerHeight = CGRectGetHeight([_headerView frame]);
+    var headerHeight = _CGRectGetHeight([_headerView frame]);
 
     // Size to fit or something?
-    [_headerView setFrameSize:CGSizeMake(aWidth, headerHeight)];
-    [_contentView setFrameOrigin:CGPointMake(0.0, headerHeight)];
+    [_headerView setFrameSize:_CGSizeMake(aWidth, headerHeight)];
+    [_contentView setFrameOrigin:_CGPointMake(0.0, headerHeight)];
 
     if ([self isCollapsed])
-        [self setFrame:CGRectMake(0.0, aY, aWidth, headerHeight)];
+        [self setFrame:_CGRectMake(0.0, aY, aWidth, headerHeight)];
 
     else
     {
-        var contentHeight = CGRectGetHeight([_contentView frame]);
+        var contentHeight = _CGRectGetHeight([_contentView frame]);
 
-        [_contentView setFrameSize:CGSizeMake(aWidth, contentHeight)];
-        [self setFrame:CGRectMake(0.0, aY, aWidth, contentHeight + headerHeight)];
+        [_contentView setFrameSize:_CGSizeMake(aWidth, contentHeight)];
+        [self setFrame:_CGRectMake(0.0, aY, aWidth, contentHeight + headerHeight)];
     }
 }
 

AppKit/CPAlert.j

@@ -28,23 +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
-
-var CPAlertDelegate_alertShowHelp_              = 1 << 0,
-    CPAlertDelegate_alertDidEnd_returnCode_     = 1 << 1;
-
-@typedef CPAlertStyle
 /*
     @global
     @group CPAlertStyle
@@ -61,64 +53,6 @@ CPInformationalAlertStyle   = 1;
 */
 CPCriticalAlertStyle        = 2;
 
-var bottomHeight = 71;
-
-@protocol CPAlertDelegate <CPObject>
-
-@optional
-- (BOOL)alertShowHelp:(CPAlert)alert;
-- (void)alertDidEnd:(CPAlert)theAlert returnCode:(int)returnCode;
-
-@end
-
-
-@implementation _CPAlertThemeView : CPView
-
-+ (CPString)defaultThemeClass
-{
-    return @"alert";
-}
-
-+ (CPDictionary)themeAttributes
-{
-    return @{
-            @"size": CGSizeMake(400.0, 110.0),
-            @"content-inset": CGInsetMake(15, 15, 15, 50),
-            @"informative-offset": 6,
-            @"button-offset": 10,
-            @"message-text-alignment": CPJustifiedTextAlignment,
-            @"message-text-color": [CPColor blackColor],
-            @"message-text-font": [CPFont boldSystemFontOfSize:13.0],
-            @"message-text-shadow-color": [CPNull null],
-            @"message-text-shadow-offset": CGSizeMakeZero(),
-            @"informative-text-alignment": CPJustifiedTextAlignment,
-            @"informative-text-color": [CPColor blackColor],
-            @"informative-text-font": [CPFont systemFontOfSize:12.0],
-            @"informative-text-shadow-color": [CPNull null],
-            @"informative-text-shadow-offset": CGSizeMakeZero(),
-            @"image-offset": CGPointMake(15, 12),
-            @"information-image": [CPNull null],
-            @"warning-image": [CPNull null],
-            @"error-image": [CPNull null],
-            @"help-image": [CPNull null],
-            @"help-image-left-offset": 15,
-            @"help-image-pressed": [CPNull null],
-            @"suppression-button-y-offset": 0.0,
-            @"suppression-button-x-offset": 0.0,
-            @"default-elements-margin": 3.0,
-            @"suppression-button-text-color": [CPColor blackColor],
-            @"suppression-button-text-font": [CPFont systemFontOfSize:12.0],
-            @"suppression-button-text-shadow-color": [CPNull null],
-            @"suppression-button-text-shadow-offset": 0.0,
-            @"modal-window-button-margin-y": 0.0,
-            @"modal-window-button-margin-x": 0.0,
-            @"standard-window-button-margin-y": 0.0,
-            @"standard-window-button-margin-x": 0.0,
-        };
-}
-
-@end
-
 /*!
     @ingroup appkit
 
@@ -141,35 +75,32 @@ var bottomHeight = 71;
            representing the first button added to the alert which appears on the
            right, 1 representing the next button to the left and so on)
 */
-@implementation CPAlert : CPObject
+@implementation CPAlert : CPView
 {
-    BOOL                    _showHelp                   @accessors(property=showsHelp);
-    BOOL                    _showSuppressionButton      @accessors(property=showsSuppressionButton);
+    BOOL            _showHelp               @accessors(property=showsHelp);
+    BOOL            _showSuppressionButton  @accessors(property=showsSuppressionButton);
 
-    CPAlertStyle            _alertStyle                 @accessors(property=alertStyle);
-    CPString                _title                      @accessors(property=title);
-    CPView                  _accessoryView              @accessors(property=accessoryView);
-    CPImage                 _icon                       @accessors(property=icon);
+    CPAlertStyle    _alertStyle             @accessors(property=alertStyle);
+    CPString        _title                  @accessors(property=title);
+    CPView          _accessoryView          @accessors(property=accessoryView);
+    CPImage         _icon                   @accessors(property=icon);
 
-    CPArray                 _buttons                    @accessors(property=buttons, readonly);
-    CPCheckBox              _suppressionButton          @accessors(property=suppressionButton, readonly);
+    CPArray         _buttons                @accessors(property=buttons,readonly);
+    CPCheckBox      _suppressionButton      @accessors(property=suppressionButton,readonly);
 
-    id <CPAlertDelegate>    _delegate                   @accessors(property=delegate);
-    id                      _modalDelegate;
-    SEL                     _didEndSelector             @accessors(property=didEndSelector);
-    Function                _didEndBlock;
-    unsigned                _implementedDelegateMethods;
+    id              _delegate               @accessors(property=delegate);
+    id              _modalDelegate;
+    SEL             _didEndSelector;
 
-    _CPAlertThemeView       _themeView                  @accessors(property=themeView, readonly);
-    CPWindow                _window                     @accessors(property=window, readonly);
-    int                     _defaultWindowStyle;
+    CPWindow        _window                 @accessors(property=window,readonly);
+    int             _defaultWindowStyle;
 
-    CPImageView             _alertImageView;
-    CPTextField             _informativeLabel;
-    CPTextField             _messageLabel;
-    CPButton                _alertHelpButton;
+    CPImageView     _alertImageView;
+    CPTextField     _informativeLabel;
+    CPTextField     _messageLabel;
+    CPButton        _alertHelpButton;
 
-    BOOL                    _needsLayout;
+    BOOL            _needsLayout;
 }
 
 #pragma mark Creating Alerts
@@ -232,8 +163,7 @@ var bottomHeight = 71;
         _alertStyle         = CPWarningAlertStyle;
         _showHelp           = NO;
         _needsLayout        = YES;
-        _defaultWindowStyle = _CPModalWindowMask;
-        _themeView          = [_CPAlertThemeView new];
+        _defaultWindowStyle = CPTitledWindowMask;
 
         _messageLabel       = [CPTextField labelWithTitle:@"Alert"];
         _alertImageView     = [[CPImageView alloc] init];
@@ -248,37 +178,8 @@ var bottomHeight = 71;
     return self;
 }
 
-
-#pragma mark -
-#pragma mark Delegate
-
-/*!
-    Set the delegate of the receiver
-    @param aDelegate the delegate object for the alert.
-*/
-- (void)setDelegate:(id <CPAlertDelegate>)aDelegate
-{
-    if (_delegate === aDelegate)
-        return;
-
-    _delegate = aDelegate;
-    _implementedDelegateMethods = 0;
-
-    if ([_delegate respondsToSelector:@selector(alertShowHelp:)])
-        _implementedDelegateMethods |= CPAlertDelegate_alertShowHelp_;
-
-    if ([_delegate respondsToSelector:@selector(alertDidEnd:returnCode:)])
-        _implementedDelegateMethods |= CPAlertDelegate_alertDidEnd_returnCode_;
-}
-
-
 #pragma mark Accessors
 
-- (CPTheme)theme
-{
-    return [_themeView theme];
-}
-
 /*!
     set the theme to use
 
@@ -296,29 +197,19 @@ var bottomHeight = 71;
 
     _window = nil; // will be regenerated at next layout
     _needsLayout = YES;
-    [_themeView setTheme:aTheme];
+    [super setTheme:aTheme];
 }
 
-- (void)setValue:(id)aValue forThemeAttribute:(CPString)aName
-{
-    [_themeView setValue:aValue forThemeAttribute:aName];
-}
-
-- (void)setValue:(id)aValue forThemeAttribute:(CPString)aName inState:(ThemeState)aState
-{
-    [_themeView setValue:aValue forThemeAttribute:aName inState:aState];
-}
-
-
-/*! @deprecated */
-- (void)setWindowStyle:(int)style
+/*! @deprecated
+*/
+- (void)setWindowStyle:(int)aStyle
 {
     CPLog.warn("DEPRECATED: setWindowStyle: is deprecated. use setTheme: instead");
-
-    [self setTheme:(style === CPHUDBackgroundWindowMask) ? [CPTheme defaultHudTheme] : [CPTheme defaultTheme]];
+    [self setTheme:(aStyle === CPHUDBackgroundWindowMask) ? [CPTheme defaultHudTheme] : [CPTheme defaultTheme]];
 }
 
-/*! @deprecated */
+/*! @deprecated
+*/
 - (int)windowStyle
 {
     CPLog.warn("DEPRECATED: windowStyle: is deprecated. use theme instead");
@@ -327,19 +218,18 @@ var bottomHeight = 71;
 
 
 /*!
-    Set the text of the alert's message.
+    set the text of the alert's message
 
     @param aText CPString containing the text
 */
-- (void)setMessageText:(CPString)text
+- (void)setMessageText:(CPString)aText
 {
-    [_messageLabel setStringValue:text];
+    [_messageLabel setStringValue:aText];
     _needsLayout = YES;
 }
 
 /*!
-    Return the content of the message text.
-
+    return the content of the message text
     @return CPString containing the message text
 */
 - (CPString)messageText
@@ -348,13 +238,13 @@ var bottomHeight = 71;
 }
 
 /*!
-    Set the text of the alert's informative text.
+    set the text of the alert's informative text
 
     @param aText CPString containing the informative text
 */
-- (void)setInformativeText:(CPString)text
+- (void)setInformativeText:(CPString)aText
 {
-    [_informativeLabel setStringValue:text];
+    [_informativeLabel setStringValue:aText];
     _needsLayout = YES;
 }
 
@@ -371,7 +261,6 @@ var bottomHeight = 71;
 /*!
     Sets the title of the alert window.
     This API is not present in Cocoa.
-
     @param aTitle CPString containing the window title
 */
 - (void)setTitle:(CPString)aTitle
@@ -381,7 +270,7 @@ var bottomHeight = 71;
 }
 
 /*!
-    Set the accessory view.
+    set the accessory view
 
     @param aView the accessory view
 */
@@ -392,7 +281,7 @@ var bottomHeight = 71;
 }
 
 /*!
-    Set if the alert shows the suppression button.
+    set if alert shows the suppression button
 
     @param shouldShowSuppressionButton YES or NO
 */
@@ -445,16 +334,16 @@ var bottomHeight = 71;
 */
 - (void)_layoutMessageView
 {
-    var inset = [_themeView currentValueForThemeAttribute:@"content-inset"],
+    var inset = [self currentValueForThemeAttribute:@"content-inset"],
         sizeWithFontCorrection = 6.0,
         messageLabelWidth,
         messageLabelTextSize;
 
-    [_messageLabel setTextColor:[_themeView currentValueForThemeAttribute:@"message-text-color"]];
-    [_messageLabel setFont:[_themeView currentValueForThemeAttribute:@"message-text-font"]];
-    [_messageLabel setTextShadowColor:[_themeView currentValueForThemeAttribute:@"message-text-shadow-color"]];
-    [_messageLabel setTextShadowOffset:[_themeView currentValueForThemeAttribute:@"message-text-shadow-offset"]];
-    [_messageLabel setAlignment:[_themeView currentValueForThemeAttribute:@"message-text-alignment"]];
+    [_messageLabel setTextColor:[self currentValueForThemeAttribute:@"message-text-color"]];
+    [_messageLabel setFont:[self currentValueForThemeAttribute:@"message-text-font"]];
+    [_messageLabel setTextShadowColor:[self currentValueForThemeAttribute:@"message-text-shadow-color"]];
+    [_messageLabel setTextShadowOffset:[self currentValueForThemeAttribute:@"message-text-shadow-offset"]];
+    [_messageLabel setAlignment:[self currentValueForThemeAttribute:@"message-text-alignment"]];
     [_messageLabel setLineBreakMode:CPLineBreakByWordWrapping];
 
     messageLabelWidth = CGRectGetWidth([[_window contentView] frame]) - inset.left - inset.right;
@@ -468,18 +357,18 @@ var bottomHeight = 71;
 */
 - (void)_layoutInformativeView
 {
-    var inset = [_themeView currentValueForThemeAttribute:@"content-inset"],
-        defaultElementsMargin = [_themeView currentValueForThemeAttribute:@"default-elements-margin"],
+    var inset = [self currentValueForThemeAttribute:@"content-inset"],
+        defaultElementsMargin = [self currentValueForThemeAttribute:@"default-elements-margin"],
         sizeWithFontCorrection = 6.0,
         informativeLabelWidth,
         informativeLabelOriginY,
         informativeLabelTextSize;
 
-    [_informativeLabel setTextColor:[_themeView currentValueForThemeAttribute:@"informative-text-color"]];
-    [_informativeLabel setFont:[_themeView currentValueForThemeAttribute:@"informative-text-font"]];
-    [_informativeLabel setTextShadowColor:[_themeView currentValueForThemeAttribute:@"informative-text-shadow-color"]];
-    [_informativeLabel setTextShadowOffset:[_themeView currentValueForThemeAttribute:@"informative-text-shadow-offset"]];
-    [_informativeLabel setAlignment:[_themeView currentValueForThemeAttribute:@"informative-text-alignment"]];
+    [_informativeLabel setTextColor:[self currentValueForThemeAttribute:@"informative-text-color"]];
+    [_informativeLabel setFont:[self currentValueForThemeAttribute:@"informative-text-font"]];
+    [_informativeLabel setTextShadowColor:[self currentValueForThemeAttribute:@"informative-text-shadow-color"]];
+    [_informativeLabel setTextShadowOffset:[self currentValueForThemeAttribute:@"informative-text-shadow-offset"]];
+    [_informativeLabel setAlignment:[self currentValueForThemeAttribute:@"informative-text-alignment"]];
     [_informativeLabel setLineBreakMode:CPLineBreakByWordWrapping];
 
     informativeLabelWidth = CGRectGetWidth([[_window contentView] frame]) - inset.left - inset.right;
@@ -497,8 +386,8 @@ var bottomHeight = 71;
     if (!_accessoryView)
         return;
 
-    var inset = [_themeView currentValueForThemeAttribute:@"content-inset"],
-        defaultElementsMargin = [_themeView currentValueForThemeAttribute:@"default-elements-margin"],
+    var inset = [self currentValueForThemeAttribute:@"content-inset"],
+        defaultElementsMargin = [self currentValueForThemeAttribute:@"default-elements-margin"],
         accessoryViewWidth = CGRectGetWidth([[_window contentView] frame]) - inset.left - inset.right,
         accessoryViewOriginY = CGRectGetMaxY([_informativeLabel frame]) + defaultElementsMargin;
 
@@ -514,16 +403,16 @@ var bottomHeight = 71;
     if (!_showSuppressionButton)
         return;
 
-    var inset = [_themeView currentValueForThemeAttribute:@"content-inset"],
-        suppressionViewXOffset = [_themeView currentValueForThemeAttribute:@"suppression-button-x-offset"],
-        suppressionViewYOffset = [_themeView currentValueForThemeAttribute:@"suppression-button-y-offset"],
-        defaultElementsMargin = [_themeView currentValueForThemeAttribute:@"default-elements-margin"],
+    var inset = [self currentValueForThemeAttribute:@"content-inset"],
+        suppressionViewXOffset = [self currentValueForThemeAttribute:@"suppression-button-x-offset"],
+        suppressionViewYOffset = [self currentValueForThemeAttribute:@"suppression-button-y-offset"],
+        defaultElementsMargin = [self currentValueForThemeAttribute:@"default-elements-margin"],
         suppressionButtonViewOriginY = CGRectGetMaxY([(_accessoryView || _informativeLabel) frame]) + defaultElementsMargin + suppressionViewYOffset;
 
-    [_suppressionButton setTextColor:[_themeView currentValueForThemeAttribute:@"suppression-button-text-color"]];
-    [_suppressionButton setFont:[_themeView currentValueForThemeAttribute:@"suppression-button-text-font"]];
-    [_suppressionButton setTextShadowColor:[_themeView currentValueForThemeAttribute:@"suppression-button-text-shadow-color"]];
-    [_suppressionButton setTextShadowOffset:[_themeView currentValueForThemeAttribute:@"suppression-button-text-shadow-offset"]];
+    [_suppressionButton setTextColor:[self currentValueForThemeAttribute:@"suppression-button-text-color"]];
+    [_suppressionButton setFont:[self currentValueForThemeAttribute:@"suppression-button-text-font"]];
+    [_suppressionButton setTextShadowColor:[self currentValueForThemeAttribute:@"suppression-button-text-shadow-color"]];
+    [_suppressionButton setTextShadowOffset:[self currentValueForThemeAttribute:@"suppression-button-text-shadow-offset"]];
     [_suppressionButton sizeToFit];
 
     [_suppressionButton setFrameOrigin:CGPointMake(inset.left + suppressionViewXOffset, suppressionButtonViewOriginY)];
@@ -535,17 +424,14 @@ var bottomHeight = 71;
 */
 - (CGSize)_layoutButtonsFromView:(CPView)lastView
 {
-    var inset = [_themeView currentValueForThemeAttribute:@"content-inset"],
-        minimumSize = [_themeView currentValueForThemeAttribute:@"size"],
-        buttonOffset = [_themeView currentValueForThemeAttribute:@"button-offset"],
-        helpLeftOffset = [_themeView currentValueForThemeAttribute:@"help-image-left-offset"],
+    var inset = [self currentValueForThemeAttribute:@"content-inset"],
+        minimumSize = [self currentValueForThemeAttribute:@"size"],
+        buttonOffset = [self currentValueForThemeAttribute:@"button-offset"],
+        helpLeftOffset = [self currentValueForThemeAttribute:@"help-image-left-offset"],
         aRepresentativeButton = [_buttons objectAtIndex:0],
-        defaultElementsMargin = [_themeView currentValueForThemeAttribute:@"default-elements-margin"],
+        defaultElementsMargin = [self currentValueForThemeAttribute:@"default-elements-margin"],
         panelSize = [[_window contentView] frame].size,
         buttonsOriginY,
-        buttonMarginY,
-        buttonMarginX,
-        theme = [self theme],
         offsetX;
 
     [aRepresentativeButton setTheme:[self theme]];
@@ -558,19 +444,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];
@@ -582,14 +455,14 @@ 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;
     }
 
     if (_showHelp)
     {
-        var helpImage = [_themeView currentValueForThemeAttribute:@"help-image"],
-            helpImagePressed = [_themeView currentValueForThemeAttribute:@"help-image-pressed"],
+        var helpImage = [self currentValueForThemeAttribute:@"help-image"],
+            helpImagePressed = [self currentValueForThemeAttribute:@"help-image-pressed"],
             helpImageSize = helpImage ? [helpImage size] : CGSizeMakeZero(),
             helpFrame = CGRectMake(helpLeftOffset, buttonsOriginY, helpImageSize.width, helpImageSize.height);
 
@@ -614,7 +487,7 @@ var bottomHeight = 71;
     if (!_window)
         [self _createWindowWithStyle:nil];
 
-    var iconOffset = [_themeView currentValueForThemeAttribute:@"image-offset"],
+    var iconOffset = [self currentValueForThemeAttribute:@"image-offset"],
         theImage = _icon,
         finalSize;
 
@@ -622,13 +495,13 @@ var bottomHeight = 71;
         switch (_alertStyle)
         {
             case CPWarningAlertStyle:
-                theImage = [_themeView currentValueForThemeAttribute:@"warning-image"];
+                theImage = [self currentValueForThemeAttribute:@"warning-image"];
                 break;
             case CPInformationalAlertStyle:
-                theImage = [_themeView currentValueForThemeAttribute:@"information-image"];
+                theImage = [self currentValueForThemeAttribute:@"information-image"];
                 break;
             case CPCriticalAlertStyle:
-                theImage = [_themeView currentValueForThemeAttribute:@"error-image"];
+                theImage = [self currentValueForThemeAttribute:@"error-image"];
                 break;
         }
 
@@ -646,7 +519,7 @@ var bottomHeight = 71;
     if (_showSuppressionButton)
         lastView = _suppressionButton;
     else if (_accessoryView)
-        lastView = _accessoryView;
+        lastView = _accessoryView
 
     finalSize = [self _layoutButtonsFromView:lastView];
     if ([_window styleMask] & CPDocModalWindowMask)
@@ -655,12 +528,6 @@ var bottomHeight = 71;
     [_window setFrameSize:finalSize];
     [_window center];
 
-    if ([_window styleMask] & _CPModalWindowMask || [_window styleMask] & CPHUDBackgroundWindowMask)
-    {
-        [_window setMovable:YES];
-        [_window setMovableByWindowBackground:YES];
-    }
-
     _needsLayout = NO;
 }
 
@@ -683,17 +550,6 @@ var bottomHeight = 71;
     [CPApp runModalForWindow:_window];
 }
 
-/*!
-    The same as \c runModal, but executes the code in \c block when the
-    alert is dismissed.
-*/
-- (void)runModalWithDidEndBlock:(Function /*(CPAlert alert, int returnCode)*/)block
-{
-    _didEndBlock = block;
-
-    [self runModal];
-}
-
 /*!
     Runs the receiver modally as an alert sheet attached to a specified window.
 
@@ -728,20 +584,6 @@ var bottomHeight = 71;
     [self beginSheetModalForWindow:aWindow modalDelegate:nil didEndSelector:nil contextInfo:nil];
 }
 
-/*!
-    Runs the receiver modally as an alert sheet attached to a specified window.
-    Executes the code in \c block when the alert is dismissed.
-
-    @param window The parent window for the sheet.
-    @param block  Code block to execute on dismissal
-*/
-- (void)beginSheetModalForWindow:(CPWindow)aWindow didEndBlock:(Function /*(CPAlert alert, int returnCode)*/)block
-{
-    _didEndBlock = block;
-
-    [self beginSheetModalForWindow:aWindow modalDelegate:nil didEndSelector:nil contextInfo:nil];
-}
-
 #pragma mark Private
 
 /*!
@@ -750,11 +592,10 @@ var bottomHeight = 71;
 - (void)_createWindowWithStyle:(int)forceStyle
 {
     var frame = CGRectMakeZero();
-    frame.size = [_themeView currentValueForThemeAttribute:@"size"];
+    frame.size = [self currentValueForThemeAttribute:@"size"];
 
-    _window = [[CPPanel alloc] initWithContentRect:frame styleMask:forceStyle || _defaultWindowStyle];
+    _window = [[CPWindow alloc] initWithContentRect:frame styleMask:forceStyle || _defaultWindowStyle];
     [_window setLevel:CPStatusWindowLevel];
-    [_window setPlatformWindow:[[CPApp keyWindow] platformWindow]];
 
     if (_title)
         [_window setTitle:_title];
@@ -781,7 +622,8 @@ var bottomHeight = 71;
 */
 - (@action)_showHelp:(id)aSender
 {
-    [self _sendDelegateAlertShowHelp];
+    if ([_delegate respondsToSelector:@selector(alertShowHelp:)])
+        [_delegate alertShowHelp:self];
 }
 
 /*
@@ -791,8 +633,8 @@ var bottomHeight = 71;
 {
     if ([_window isSheet])
     {
-        [_window orderOut:nil];
         [CPApp endSheet:_window returnCode:[aSender tag]];
+        [_window orderOut:nil];
     }
     else
     {
@@ -808,57 +650,61 @@ var bottomHeight = 71;
 */
 - (void)_alertDidEnd:(CPWindow)aWindow returnCode:(int)returnCode contextInfo:(id)contextInfo
 {
-    if (_didEndBlock)
-    {
-        if (typeof(_didEndBlock) === "function")
-            _didEndBlock(self, returnCode);
-        else
-            CPLog.warn("%s: didEnd block is not a function", [self description]);
+    if ([_delegate respondsToSelector:@selector(alertDidEnd:returnCode:)])
+            [_delegate alertDidEnd:self returnCode:returnCode];
 
-        // didEnd blocks are transient
-        _didEndBlock = nil;
-    }
-    else if (_modalDelegate)
-    {
-        if (_didEndSelector)
-            _modalDelegate.isa.objj_msgSend3(_modalDelegate, _didEndSelector, self, returnCode, contextInfo);
-    }
-    else if (_delegate)
-    {
-        if (_didEndSelector)
-            _delegate.isa.objj_msgSend2(_delegate, _didEndSelector, self, returnCode);
-        else
-            [self _sendDelegateAlertDidEndReturnCode:returnCode];
-    }
-}
-
-@end
-
-
-@implementation CPAlert (CPAlertDelegate)
-
-/*!
-    @ignore
-    Call the delegate alertDidEnd:returnCode
-*/
-- (void)_sendDelegateAlertDidEndReturnCode:(int)returnCode
-{
-    if (!(_implementedDelegateMethods & CPAlertDelegate_alertDidEnd_returnCode_))
-        return;
-
-    [_delegate alertDidEnd:self returnCode:returnCode];
-}
-
-/*!
-    @ignore
-    Call the delegate alertShowHelp:
-*/
-- (BOOL)_sendDelegateAlertShowHelp
-{
-    if (!(_implementedDelegateMethods & CPAlertDelegate_alertShowHelp_))
-        return YES;
-
-    return [_delegate alertShowHelp:self];
+    if (_didEndSelector)
+        objj_msgSend(_modalDelegate, _didEndSelector, self, returnCode, contextInfo);
+
+    _modalDelegate = nil;
+    _didEndSelector = nil;
+}
+
+#pragma mark Theme Attributes
+
++ (CPString)defaultThemeClass
+{
+    return @"alert";
+}
+
++ (id)themeAttributes
+{
+    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

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

@@ -1,162 +0,0 @@
-/*
- * CPAppearance.j
- * AppKit
- *
- * Created by Antoine Mercadal.
- * Copyright 2015, Cappuccino Project.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-@import <Foundation/Foundation.j>
-@import "CPTheme.j"
-
-CPAppearanceNameAqua         = @"CPAppearanceNameAqua";
-CPAppearanceNameLightContent = @"CPAppearanceNameLightContent";
-CPAppearanceNameVibrantDark  = @"CPAppearanceNameVibrantDark";
-CPAppearanceNameVibrantLight = @"CPAppearanceNameVibrantLight";
-
-var _CPAppearanceCurrent = nil,
-    _CPAppearancesRegistry = @{};
-
-
-@protocol CPAppearanceCustomization <CPObject>
-
-@required
-- (CPAppearance)appearance;
-- (void)setAppearance:(CPAppearance)appearance;
-- (CPAppearance)effectiveAppearance;
-- (void)setEffectiveAppearance:(CPAppearance)appearance;
-
-@end
-
-CPThemeStateAppearanceAqua             = CPThemeState("appearance-aqua");
-CPThemeStateAppearanceLightContent     = CPThemeState("appearance-light-content");
-CPThemeStateAppearanceVibrantLight     = CPThemeState("appearance-vibrant-light");
-CPThemeStateAppearanceVibrantDark      = CPThemeState("appearance-vibrant-dark");
-
-
-/*!
-    @ingroup appkit
-
-    A CPAppareance represents the appearance of an to a subset of UI elements.
-    This is a very lightweight implementation of the NSAppearance system, but
-    We are using it for compliance, and especially for the CPVisualEffectView
-*/
-@implementation CPAppearance : CPObject
-{
-    BOOL            _allowsVibrancy     @accessors(property=allowsVibrancy);
-
-    CPString        _name;
-}
-
-
-#pragma mark -
-#pragma mark Class Methods
-
-/*! Returns the current default CPAppearance
-*/
-+ (CPAppearance)currentAppearance
-{
-    if (!_CPAppearanceCurrent)
-        _CPAppearanceCurrent = [CPAppearance appearanceNamed:CPAppearanceNameAqua];
-
-    return _CPAppearanceCurrent;
-}
-
-/*! Sets the current default CPAppearance
-    @param appearance the new current appearance
-*/
-+ (void)setCurrentAppearance:(CPAppearance)anAppearance
-{
-    _CPAppearanceCurrent = anAppearance;
-}
-
-/*! Returns the CPAppearance object with the given name
-    @param name the name of the appearance
-*/
-+ (CPAppearance)appearanceNamed:(CPString)aName
-{
-    if (![_CPAppearancesRegistry containsKey:aName])
-    {
-        [_CPAppearancesRegistry setObject:[[CPAppearance alloc] initWithAppearanceNamed:aName bundle:nil]
-                                   forKey:aName];
-    }
-
-    return [_CPAppearancesRegistry objectForKey:aName];
-}
-
-
-#pragma mark -
-#pragma mark Initialization
-
-/*! Creates a CPAppearance object initialized to the specified appearance file in the specified bundle
-    This method does actually nothing special. It just creates a default appearance object
-*/
-- (id)initWithAppearanceNamed:(CPString)aName bundle:(CPBundle)bundle
-{
-    if (self = [super init])
-    {
-        _name = aName;
-        _allowsVibrancy = YES;
-
-        if ([_CPAppearancesRegistry containsKey:aName])
-            [CPException raise:CPInternalInconsistencyException reason:"Appearance with name '" + aName + "' is already declared."];
-
-        [_CPAppearancesRegistry setObject:self forKey:aName];
-    }
-
-    return self;
-}
-
-
-#pragma mark -
-#pragma mark Implementation
-
-- (BOOL)isEqual:(id)anObject
-{
-    if (![anObject isKindOfClass:CPAppearance])
-        return NO;
-
-    return self._name == anObject._name;
-}
-
-- (CPString)description
-{
-    return @"<CPAppearance @" + [self UID] + @" name: " + _name + ">";
-}
-
-
-#pragma mark -
-#pragma mark CPCoding
-
-- (id)initWithCoder:(CPCoder)aCoder
-{
-    if (self = [super init])
-    {
-        _name           = [aCoder decodeObjectForKey:@"_name"];
-        _allowsVibrancy = [aCoder decodeBoolForKey:@"_allowsVibrancy"];
-    }
-
-    return self;
-}
-
-- (void)encodeWithCoder:(CPCoder)aCoder
-{
-    [aCoder encodeObject:_name forKey:@"_name"];
-    [aCoder encodeBool:_allowsVibrancy forKey:@"_allowsVibrancy"];
-}
-
-@end

AppKit/CPApplication.j

@@ -22,46 +22,37 @@
 
 @import <Foundation/CPBundle.j>
 
-@import "CPApplication_Constants.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"
-@import "_CPPopoverWindow.j"
 
-@typedef CPModalSession
 
 var CPMainCibFile               = @"CPMainCibFile",
     CPMainCibFileHumanFriendly  = @"Main cib file base name",
     CPEventModifierFlags = 0;
 
+CPApp = nil;
 
-@protocol CPApplicationDelegate <CPObject>
+CPApplicationWillFinishLaunchingNotification    = @"CPApplicationWillFinishLaunchingNotification";
+CPApplicationDidFinishLaunchingNotification     = @"CPApplicationDidFinishLaunchingNotification";
+CPApplicationWillTerminateNotification          = @"CPApplicationWillTerminateNotification";
+CPApplicationWillBecomeActiveNotification       = @"CPApplicationWillBecomeActiveNotification";
+CPApplicationDidBecomeActiveNotification        = @"CPApplicationDidBecomeActiveNotification";
+CPApplicationWillResignActiveNotification       = @"CPApplicationWillResignActiveNotification";
+CPApplicationDidResignActiveNotification        = @"CPApplicationDidResignActiveNotification";
 
-@optional
-- (CPApplicationTerminateReply)applicationShouldTerminate:(CPApplication)sender;
-- (CPString)applicationShouldTerminateMessage:(CPApplication)sender;
-- (void)applicationDidBecomeActive:(CPNotification)aNotification;
-- (void)applicationDidChangeScreenParameters:(CPNotification)aNotification;
-- (void)applicationDidFinishLaunching:(CPNotification)aNotification;
-- (void)applicationDidResignActive:(CPNotification)aNotification;
-- (void)applicationWillBecomeActive:(CPNotification)aNotification;
-- (void)applicationWillFinishLaunching:(CPNotification)aNotification;
-- (void)applicationWillResignActive:(CPNotification)aNotification;
-- (void)applicationWillTerminate:(CPNotification)aNotification;
+CPTerminateNow      = YES;
+CPTerminateCancel   = NO;
+CPTerminateLater    = -1; // not currently supported
 
-@end
-
-var CPApplicationDelegate_applicationShouldTerminate_           = 1 << 0,
-    CPApplicationDelegate_applicationShouldTerminateMessage_    = 1 << 1;
+CPRunStoppedResponse    = -1000;
+CPRunAbortedResponse    = -1001;
+CPRunContinuesResponse  = -1002;
 
 /*!
     @ingroup appkit
@@ -90,38 +81,34 @@ var CPApplicationDelegate_applicationShouldTerminate_           = 1 << 0,
 */
 @implementation CPApplication : CPResponder
 {
-    CPArray                     _eventListeners;
-    int                         _eventListenerInsertionIndex;
+    CPArray                 _eventListeners;
 
-    CPEvent                     _currentEvent;
-    CPWindow                    _lastMouseMoveWindow;
+    CPEvent                 _currentEvent;
 
-    CPArray                     _windows;
-    CPWindow                    _keyWindow;
-    CPWindow                    _mainWindow;
-    CPWindow                    _previousKeyWindow;
-    CPWindow                    _previousMainWindow;
+    CPArray                 _windows;
+    CPWindow                _keyWindow;
+    CPWindow                _mainWindow;
+    CPWindow                _previousKeyWindow;
+    CPWindow                _previousMainWindow;
 
-    CPDocumentController        _documentController;
+    CPDocumentController    _documentController;
 
-    CPModalSession              _currentSession;
+    CPModalSession          _currentSession;
 
     //
-    id <CPApplicationDelegate>  _delegate;
-    CPInteger                   _implementedDelegateMethods;
+    id                      _delegate;
+    BOOL                    _finishedLaunching;
+    BOOL                    _isActive;
 
-    BOOL                        _finishedLaunching;
-    BOOL                        _isActive;
+    CPDictionary            _namedArgs;
+    CPArray                 _args;
+    CPString                _fullArgsString;
 
-    CPDictionary                _namedArgs;
-    CPArray                     _args;
-    CPString                    _fullArgsString;
+    CPImage                 _applicationIconImage;
 
-    CPImage                     _applicationIconImage;
+    CPPanel                 _aboutPanel;
 
-    CPPanel                     _aboutPanel;
-
-    CPThemeBlend                _themeBlend @accessors(property=themeBlend);
+    CPThemeBlend            _themeBlend @accessors(property=themeBlend);
 }
 
 /*!
@@ -151,9 +138,10 @@ var CPApplicationDelegate_applicationShouldTerminate_           = 1 << 0,
     if (self)
     {
         _eventListeners = [];
-        _eventListenerInsertionIndex = 0;
 
-        _windows = [[CPNull null]];
+        _windows = [];
+
+        [_windows addObject:nil];
     }
 
     return self;
@@ -167,13 +155,11 @@ var CPApplicationDelegate_applicationShouldTerminate_           = 1 << 0,
     react to these events.
     @param aDelegate the delegate object
 */
-- (void)setDelegate:(id <CPApplicationDelegate>)aDelegate
+- (void)setDelegate:(id)aDelegate
 {
     if (_delegate == aDelegate)
         return;
 
-    _implementedDelegateMethods = 0;
-
     var defaultCenter = [CPNotificationCenter defaultCenter],
         delegateNotifications =
         [
@@ -183,8 +169,7 @@ var CPApplicationDelegate_applicationShouldTerminate_           = 1 << 0,
             CPApplicationDidBecomeActiveNotification, @selector(applicationDidBecomeActive:),
             CPApplicationWillResignActiveNotification, @selector(applicationWillResignActive:),
             CPApplicationDidResignActiveNotification, @selector(applicationDidResignActive:),
-            CPApplicationWillTerminateNotification, @selector(applicationWillTerminate:),
-            CPApplicationDidChangeScreenParametersNotification, @selector(applicationDidChangeScreenParameters:)
+            CPApplicationWillTerminateNotification, @selector(applicationWillTerminate:)
         ],
         count = [delegateNotifications count];
 
@@ -214,12 +199,6 @@ var CPApplicationDelegate_applicationShouldTerminate_           = 1 << 0,
         if ([_delegate respondsToSelector:selector])
             [defaultCenter addObserver:_delegate selector:selector name:notificationName object:self];
     }
-
-    if ([_delegate respondsToSelector:@selector(applicationShouldTerminate:)])
-        _implementedDelegateMethods |= CPApplicationDelegate_applicationShouldTerminate_
-
-    if ([_delegate respondsToSelector:@selector(applicationShouldTerminateMessage:)])
-        _implementedDelegateMethods |= CPApplicationDelegate_applicationShouldTerminateMessage_
 }
 
 /*!
@@ -388,32 +367,22 @@ var CPApplicationDelegate_applicationShouldTerminate_           = 1 << 0,
             applicationVersion = [options objectForKey:@"ApplicationVersion"] || [mainInfo objectForKey:@"CPBundleShortVersionString"],
             copyright = [options objectForKey:@"Copyright"] || [mainInfo objectForKey:@"CPHumanReadableCopyright"];
 
-        var windowWidth = 275,
-            windowHeight = 223,
-            imgWidth = 100,
-            imgHeight = 100,
-            interField = 8,
-            aboutPanel = [[CPWindow alloc] initWithContentRect:CGRectMake(0, 0, windowWidth, windowHeight) styleMask:CPClosableWindowMask],
-            imageView = [[CPImageView alloc] initWithFrame:CGRectMake((windowWidth / 2) - (imgWidth / 2), interField, imgWidth, imgHeight)],
-            applicationLabel = [[CPTextField alloc] initWithFrame:CGRectMake(17, imgHeight + 16, windowWidth - 34, 24)],
-            versionLabel = [[CPTextField alloc] initWithFrame:CGRectMake(17, imgHeight + 48, windowWidth - 34, 16)],
-            copyrightLabel = [[CPTextField alloc] initWithFrame:CGRectMake(17, imgHeight + 72, windowWidth - 34, 32)],
-            contentView = [aboutPanel contentView];
+        var aboutPanelPath = [[CPBundle bundleForClass:[CPWindowController class]] pathForResource:@"AboutPanel.cib"],
+            aboutPanelController = [CPWindowController alloc],
+            aboutPanelController = [aboutPanelController initWithWindowCibPath:aboutPanelPath owner:aboutPanelController],
+            aboutPanel = [aboutPanelController window],
+            contentView = [aboutPanel contentView],
+            imageView = [contentView viewWithTag:1],
+            applicationLabel = [contentView viewWithTag:2],
+            versionLabel = [contentView viewWithTag:3],
+            copyrightLabel = [contentView viewWithTag:4],
+            standardPath = [[CPBundle bundleForClass:[self class]] pathForResource:@"standardApplicationIcon.png"];
 
+        // FIXME move this into the CIB eventually
         [applicationLabel setFont:[CPFont boldSystemFontOfSize:[CPFont systemFontSize] + 2]];
         [applicationLabel setAlignment:CPCenterTextAlignment];
-        [versionLabel setFont:[CPFont systemFontOfSize:[CPFont systemFontSize] - 1]];
         [versionLabel setAlignment:CPCenterTextAlignment];
-        [copyrightLabel setFont:[CPFont systemFontOfSize:[CPFont systemFontSize] - 1]];
         [copyrightLabel setAlignment:CPCenterTextAlignment];
-        [copyrightLabel setLineBreakMode:CPLineBreakByWordWrapping];
-
-        [contentView addSubview:imageView];
-        [contentView addSubview:applicationLabel];
-        [contentView addSubview:versionLabel];
-        [contentView addSubview:copyrightLabel];
-
-        var standardPath = [[CPBundle bundleForClass:[self class]] pathForResource:@"standardApplicationIcon.png"];
 
         [imageView setImage:applicationIcon || [[CPImage alloc] initWithContentsOfFile:standardPath
                                                                                   size:CGSizeMake(256, 256)]];
@@ -427,7 +396,7 @@ var CPApplicationDelegate_applicationShouldTerminate_           = 1 << 0,
         else
             [versionLabel setStringValue:@""];
 
-        [copyrightLabel setStringValue:copyright || @""];
+        [copyrightLabel setStringValue:copyright || ""];
         [aboutPanel center];
 
         _aboutPanel = aboutPanel;
@@ -437,11 +406,16 @@ var CPApplicationDelegate_applicationShouldTerminate_           = 1 << 0,
 }
 
 
-- (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)
-        [self replyToApplicationShouldTerminate:[self _sendDelegateApplicationShouldTerminate]];
+    {
+        if ([_delegate respondsToSelector:@selector(applicationShouldTerminate:)])
+            [self replyToApplicationShouldTerminate:[_delegate applicationShouldTerminate:self]];
+        else
+            [self replyToApplicationShouldTerminate:YES];
+    }
 }
 
 - (void)replyToApplicationShouldTerminate:(BOOL)terminate
@@ -455,22 +429,16 @@ var CPApplicationDelegate_applicationShouldTerminate_           = 1 << 0,
 
 - (void)activateIgnoringOtherApps:(BOOL)shouldIgnoreOtherApps
 {
-    if (_isActive)
-        return;
-
     [self _willBecomeActive];
 
     [CPPlatform activateIgnoringOtherApps:shouldIgnoreOtherApps];
     _isActive = YES;
 
-    [self _didBecomeActive];
+    [self _willResignActive];
 }
 
 - (void)deactivate
 {
-    if (!_isActive)
-        return;
-
     [self _willResignActive];
 
     [CPPlatform deactivate];
@@ -496,15 +464,6 @@ var CPApplicationDelegate_applicationShouldTerminate_           = 1 << 0,
 - (void)run
 {
     [self finishLaunching];
-    [self sendEvent:[CPEvent otherEventWithType:CPAppKitDefined
-                                       location:CGPointMakeZero()
-                                  modifierFlags:0
-                                      timestamp:[CPEvent currentTimestamp]
-                                   windowNumber:[_keyWindow windowNumber]
-                                        context:nil
-                                        subtype:nil
-                                          data1:nil
-                                          data2:nil]];
 }
 
 // Managing the Event Loop
@@ -546,8 +505,6 @@ var CPApplicationDelegate_applicationShouldTerminate_           = 1 << 0,
         if (_eventListeners[count]._callback === _CPRunModalLoop)
         {
             _eventListeners.splice(count, 1);
-            if (count <= _eventListenerInsertionIndex)
-                _eventListenerInsertionIndex--;
 
             return;
         }
@@ -595,7 +552,7 @@ var CPApplicationDelegate_applicationShouldTerminate_           = 1 << 0,
 
 //    [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];
 }
 
 /*!
@@ -613,8 +570,8 @@ var CPApplicationDelegate_applicationShouldTerminate_           = 1 << 0,
 /* @ignore */
 - (BOOL)_handleKeyEquivalent:(CPEvent)anEvent
 {
-    return [[self keyWindow] performKeyEquivalent:anEvent] ||
-           [[self mainMenu] performKeyEquivalent:anEvent];
+    return  [[self keyWindow] performKeyEquivalent:anEvent] ||
+            [[self mainMenu] performKeyEquivalent:anEvent];
 }
 
 /*!
@@ -626,51 +583,43 @@ var CPApplicationDelegate_applicationShouldTerminate_           = 1 << 0,
     _currentEvent = anEvent;
     CPEventModifierFlags = [anEvent modifierFlags];
 
-    var theWindow = [anEvent window];
+#if PLATFORM(DOM)
+    var willPropagate = [[[anEvent window] platformWindow] _willPropagateCurrentDOMEvent];
+
+    // temporarily pretend we won't propagate the event. we'll restore the saved value later
+    // we do this outside the if so that changes user code might make in _handleKeyEquiv. are preserved
+    [[[anEvent window] platformWindow] _propagateCurrentDOMEvent:NO];
+#endif
 
     // Check if this is a candidate for key equivalent...
     if ([anEvent _couldBeKeyEquivalent] && [self _handleKeyEquivalent:anEvent])
-        // The key equivalent was handled.
+    {
+#if PLATFORM(DOM)
+        var characters = [anEvent characters],
+            modifierFlags = [anEvent modifierFlags];
+
+        // Unconditionally propagate on these keys to solve browser copy paste bugs
+        if ((characters == "c" || characters == "x" || characters == "v") && (modifierFlags & CPPlatformActionKeyMask))
+            [[[anEvent window] platformWindow] _propagateCurrentDOMEvent:YES];
+#endif
+
         return;
-
-    if ([anEvent type] == CPMouseMoved)
-    {
-        if (theWindow !== _lastMouseMoveWindow)
-            [_lastMouseMoveWindow _mouseExitedResizeRect];
-
-        _lastMouseMoveWindow = theWindow;
     }
 
-    /*
-        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--)
+#if PLATFORM(DOM)
+    // if we make it this far, then restore the original willPropagate value
+    [[[anEvent window] platformWindow] _propagateCurrentDOMEvent:willPropagate];
+#endif
+
+    if (_eventListeners.length)
     {
-        var listener = _eventListeners[i];
+        if (_eventListeners[_eventListeners.length - 1]._mask & (1 << [anEvent type]))
+            _eventListeners.pop()._callback(anEvent);
 
-        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;
-            }
-        }
+        return;
     }
 
-    _eventListenerInsertionIndex = _eventListeners.length;
-
-    if (theWindow)
-        [theWindow sendEvent:anEvent];
+    [[anEvent window] sendEvent:anEvent];
 }
 
 /*!
@@ -706,10 +655,6 @@ var CPApplicationDelegate_applicationShouldTerminate_           = 1 << 0,
 */
 - (CPWindow)windowWithWindowNumber:(int)aWindowNumber
 {
-    // Never allow _windows[0] to be returned - it's an internal CPNull placeholder.
-    if (!aWindowNumber)
-        return nil;
-
     return _windows[aWindowNumber];
 }
 
@@ -718,8 +663,7 @@ var CPApplicationDelegate_applicationShouldTerminate_           = 1 << 0,
 */
 - (CPArray)windows
 {
-    // Return all windows, but not the CPNull placeholder in _windows[0].
-    return [_windows subarrayWithRange:CPMakeRange(1, [_windows count] - 1)];
+    return _windows;
 }
 
 /*!
@@ -947,44 +891,31 @@ var CPApplicationDelegate_applicationShouldTerminate_           = 1 << 0,
 
 /*!
     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) { if (aTarget != null) aTarget.isa.objj_msgSend1(aTarget, aSelector, anEvent); }, shouldDequeue));
+    _eventListeners.push(_CPEventListenerMake(aMask, function (anEvent) { objj_msgSend(aTarget, aSelector, anEvent); }));
 }
 
 /*!
@@ -1002,10 +933,10 @@ var CPApplicationDelegate_applicationShouldTerminate_           = 1 << 0,
     @param aSheet the window to display as a sheet
     @param aWindow the window that will hold the sheet as a child
     @param aModalDelegate
-    @param didEndSelector
-    @param contextInfo
+    @param aDidEndSelector
+    @param aContextInfo
 */
-- (void)beginSheet:(CPWindow)aSheet modalForWindow:(CPWindow)aWindow modalDelegate:(id)aModalDelegate didEndSelector:(SEL)didEndSelector contextInfo:(id)contextInfo
+- (void)beginSheet:(CPWindow)aSheet modalForWindow:(CPWindow)aWindow modalDelegate:(id)aModalDelegate didEndSelector:(SEL)aDidEndSelector contextInfo:(id)aContextInfo
 {
     if ([aWindow isSheet])
     {
@@ -1013,10 +944,16 @@ var CPApplicationDelegate_applicationShouldTerminate_           = 1 << 0,
         return;
     }
 
-    if (![aWindow attachedSheet])
-        [aSheet._windowView _enableSheet:YES inWindow:aWindow];
+    [aSheet._windowView _enableSheet:YES];
 
-    [aWindow _attachSheet:aSheet modalDelegate:aModalDelegate didEndSelector:didEndSelector contextInfo:contextInfo];
+    // -dw- if a sheet is already visible, we skip this since it serves no purpose and causes
+    // orderOut: to be called on the sheet, which is not what we want.
+    if (![aWindow isVisible])
+    {
+        [aWindow orderFront:self];
+        [aSheet setPlatformWindow:[aWindow platformWindow]];
+    }
+    [aWindow _attachSheet:aSheet modalDelegate:aModalDelegate didEndSelector:aDidEndSelector contextInfo:aContextInfo];
 }
 
 /*!
@@ -1041,7 +978,7 @@ var CPApplicationDelegate_applicationShouldTerminate_           = 1 << 0,
         var aWindow = [_windows objectAtIndex:count],
             context = aWindow._sheetContext;
 
-        if (context && context["sheet"] === sheet)
+        if (context != nil && context["sheet"] === sheet)
         {
             context["returnCode"] = returnCode;
             [aWindow _endSheet];
@@ -1105,9 +1042,9 @@ var CPApplicationDelegate_applicationShouldTerminate_           = 1 << 0,
     if (!args || args.length == 0)
     {
         _args = [];
-        // Don't use if PLATFORM(DOM) here - the unit test fakes window.location so we should play along.
-        if (window && window.location)
-            window.location.hash = @"#";
+#if PLATFORM(DOM)
+        window.location.hash = @"#";
+#endif
         return;
     }
 
@@ -1122,9 +1059,9 @@ var CPApplicationDelegate_applicationShouldTerminate_           = 1 << 0,
 
     var hash = [toEncode componentsJoinedByString:@"/"];
 
-    // Don't use if PLATFORM(DOM) here - the unit test fakes window.location so we should play along.
-    if (window && window.location)
-        window.location.hash = @"#" + hash;
+#if PLATFORM(DOM)
+    window.location.hash = @"#" + hash;
+#endif
 }
 
 - (void)_reloadArguments
@@ -1202,7 +1139,7 @@ var CPApplicationDelegate_applicationShouldTerminate_           = 1 << 0,
         [[self keyWindow] orderFront:self];
     else if ([self mainWindow])
         [[self mainWindow] makeKeyAndOrderFront:self];
-    else if ([self mainMenu])
+    else
         [[self mainMenu]._menuWindow makeKeyWindow]; //FIXME this may not actually work
 
     _previousKeyWindow = nil;
@@ -1220,22 +1157,6 @@ var CPApplicationDelegate_applicationShouldTerminate_           = 1 << 0,
                                                       userInfo:nil];
 }
 
-- (BOOL)_sendDelegateApplicationShouldTerminate
-{
-    if (!(_implementedDelegateMethods & CPApplicationDelegate_applicationShouldTerminate_))
-        return YES;
-
-    return [_delegate applicationShouldTerminate:self];
-}
-
-- (CPString)_sendDelegateApplicationShouldTerminateMessage
-{
-    if (!(_implementedDelegateMethods & CPApplicationDelegate_applicationShouldTerminateMessage_))
-        return @"You have attempted to leave this page. Are you sure you want to exit this page?";
-
-    return [_delegate applicationShouldTerminateMessage:self];
-}
-
 - (void)_didResignActive
 {
     if (self._activeMenu)
@@ -1260,7 +1181,7 @@ var CPApplicationDelegate_applicationShouldTerminate_           = 1 << 0,
 
 + (CPString)defaultThemeName
 {
-    return ([[CPBundle mainBundle] objectForInfoDictionaryKey:"CPDefaultTheme"] || @"Aristo2");
+    return ([[CPBundle mainBundle] objectForInfoDictionaryKey:"CPDefaultTheme"] || @"Aristo");
 }
 
 @end
@@ -1270,29 +1191,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];
-    }
 };
 
 /*!
@@ -1358,7 +1278,7 @@ var _CPAppBootstrapperActions = nil;
     {
         var action = _CPAppBootstrapperActions.shift();
 
-        if (self.isa.objj_msgSend0(self, action))
+        if (objj_msgSend(self, action))
             return;
     }
 
@@ -1375,7 +1295,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"];
@@ -1402,8 +1322,8 @@ var _CPAppBootstrapperActions = nil;
     if (mainCibFile)
     {
         [mainBundle loadCibFile:mainCibFile
-              externalNameTable:@{ CPCibOwner: CPApp }
-                   loadDelegate:self];
+            externalNameTable:[CPDictionary dictionaryWithObject:CPApp forKey:CPCibOwner]
+                 loadDelegate:self];
 
         return YES;
     }
@@ -1420,25 +1340,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]];
@@ -1480,7 +1401,7 @@ var _CPAppBootstrapperActions = nil;
 
 + (void)cibDidFailToLoad:(CPCib)aCib
 {
-    throw new Error("Could not load main cib file. Did you forget to nib2cib it?");
+    throw new Error("Could not load main cib file (Did you forget to nib2cib it?).");
 }
 
 + (void)reset

AppKit/CPApplication_Constants.j

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

AppKit/CPArrayController.j

@@ -23,7 +23,7 @@
  */
 
 @import <Foundation/CPIndexSet.j>
-@import <Foundation/CPPredicate.j>
+
 @import "CPObjectController.j"
 @import "CPKeyValueBinding.j"
 
@@ -65,51 +65,51 @@
 
 + (CPSet)keyPathsForValuesAffectingContentArray
 {
-    return [CPSet setWithObjects:@"content"];
+    return [CPSet setWithObjects:"content"];
 }
 
 + (CPSet)keyPathsForValuesAffectingArrangedObjects
 {
     // Also depends on "filterPredicate" but we'll handle that manually.
-    return [CPSet setWithObjects:@"content", @"sortDescriptors"];
+    return [CPSet setWithObjects:"content", "sortDescriptors"];
 }
 
 + (CPSet)keyPathsForValuesAffectingSelection
 {
-    return [CPSet setWithObjects:@"selectionIndexes"];
+    return [CPSet setWithObjects:"selectionIndexes"];
 }
 
 + (CPSet)keyPathsForValuesAffectingSelectionIndex
 {
-    return [CPSet setWithObjects:@"selectionIndexes"];
+    return [CPSet setWithObjects:"selectionIndexes"];
 }
 
 + (CPSet)keyPathsForValuesAffectingSelectionIndexes
 {
     // When the arranged objects change, selection preservation may cause the indexes
     // to change.
-    return [CPSet setWithObjects:@"arrangedObjects"];
+    return [CPSet setWithObjects:"arrangedObjects"];
 }
 
 + (CPSet)keyPathsForValuesAffectingSelectedObjects
 {
     // Don't need to depend on arrangedObjects here because selectionIndexes already does.
-    return [CPSet setWithObjects:@"selectionIndexes"];
+    return [CPSet setWithObjects:"selectionIndexes"];
 }
 
 + (CPSet)keyPathsForValuesAffectingCanRemove
 {
-    return [CPSet setWithObjects:@"selectionIndexes"];
+    return [CPSet setWithObjects:"selectionIndexes"];
 }
 
 + (CPSet)keyPathsForValuesAffectingCanSelectNext
 {
-    return [CPSet setWithObjects:@"selectionIndexes"];
+    return [CPSet setWithObjects:"selectionIndexes"];
 }
 
 + (CPSet)keyPathsForValuesAffectingCanSelectPrevious
 {
-    return [CPSet setWithObjects:@"selectionIndexes"];
+    return [CPSet setWithObjects:"selectionIndexes"];
 }
 
 
@@ -744,7 +744,6 @@
         return;
 
     var willClearPredicate = NO;
-
     if (_clearsFilterPredicateOnInsertion && _filterPredicate)
     {
         [self willChangeValueForKey:@"filterPredicate"];
@@ -793,18 +792,10 @@
     // not appear in arrangedObjects and we do not have to update at all.
     */
 
-    // TODO: Remove these lines when granular notifications are implemented
-    var proxy = [_CPKVOProxy proxyForObject:self];
-    [proxy setAdding:YES];
-
-    // This will also send notifications for arrangedObjects.
+    // This will also send notificaitons for arrangedObjects.
     [self didChangeValueForKey:@"content"];
-
     if (willClearPredicate)
         [self didChangeValueForKey:@"filterPredicate"];
-
-    // TODO: Remove this line when granular notifications are implemented
-    [proxy setAdding:NO];
 }
 
 /*!
@@ -820,7 +811,6 @@
         return;
 
     var willClearPredicate = NO;
-
     if (_clearsFilterPredicateOnInsertion && _filterPredicate)
     {
         [self willChangeValueForKey:@"filterPredicate"];
@@ -858,15 +848,9 @@
     if ([self avoidsEmptySelection] && [[self selectionIndexes] count] <= 0 && [_contentObject count] > 0)
         [self __setSelectionIndexes:[CPIndexSet indexSetWithIndex:0]];
 
-    var proxy = [_CPKVOProxy proxyForObject:self];
-    [proxy setAdding:YES];
-
     [self didChangeValueForKey:@"content"];
-
     if (willClearPredicate)
         [self didChangeValueForKey:@"filterPredicate"];
-
-    [proxy setAdding:NO];
 }
 
 /*!
@@ -913,9 +897,7 @@
     if (![self canAdd])
         return;
 
-    var newObject = [self automaticallyPreparesContent] ? [self newObject] : [self _defaultNewObject];
-
-    [self addObject:newObject];
+    [self insert:sender];
 }
 
 /*!
@@ -927,13 +909,9 @@
     if (![self canInsert])
         return;
 
-    var newObject = [self automaticallyPreparesContent] ? [self newObject] : [self _defaultNewObject],
-        lastSelectedIndex = [_selectionIndexes lastIndex];
+    var newObject = [self automaticallyPreparesContent] ? [self newObject] : [self _defaultNewObject];
 
-    if (lastSelectedIndex !== CPNotFound)
-        [self insertObject:newObject atArrangedObjectIndex:lastSelectedIndex];
-    else
-        [self addObject:newObject];
+    [self addObject:newObject];
 }
 
 /*!
@@ -986,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];
@@ -1095,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
@@ -1115,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)
     {
@@ -1136,7 +1113,6 @@
     }
 
     var isPlaceholder = CPIsControllerMarker(newValue);
-
     if (isPlaceholder)
     {
         if (newValue === CPNotApplicableMarker && [options objectForKey:CPRaisesForNotApplicableKeysBindingOption])

AppKit/CPBezierPath.j

@@ -48,8 +48,6 @@ var DefaultLineWidth = 1.0;
 {
     CGPath  _path;
     float   _lineWidth;
-    CPArray _lineDashes;
-    float   _lineDashesPhase;
 }
 
 /*!
@@ -63,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;
 }
@@ -75,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;
 }
@@ -147,8 +136,6 @@ var DefaultLineWidth = 1.0;
     {
         _path = CGPathCreateMutable();
         _lineWidth = [[self class] defaultLineWidth];
-        _lineDashesPhase = 0;
-        _lineDashes = [];
     }
 
     return self;
@@ -181,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];
 }
@@ -209,7 +196,6 @@ var DefaultLineWidth = 1.0;
     CGContextBeginPath(ctx);
     CGContextAddPath(ctx, _path);
     CGContextSetLineWidth(ctx, [self lineWidth]);
-    CGContextSetLineDash(ctx, _lineDashesPhase, _lineDashes);
     CGContextStrokePath(ctx);
 }
 
@@ -223,50 +209,10 @@ var DefaultLineWidth = 1.0;
     CGContextBeginPath(ctx);
     CGContextAddPath(ctx, _path);
     CGContextSetLineWidth(ctx, [self lineWidth]);
-    CGContextSetLineDash(ctx, _lineDashesPhase, _lineDashes);
     CGContextClosePath(ctx);
     CGContextFillPath(ctx);
 }
 
-/*!
-    Cocoa compatibility.
-*/
-- (void)getLineDash:(CPArrayRef)patternRef count:(NSInteger)count phase:(CGFloatRef)phaseRef
-{
-    return [self getLineDash:patternRef phase:phaseRef];
-}
-
-/*!
-    Retrieve the line dash pattern and phase and write them into the provided references.
-*/
-- (void)getLineDash:(CPArrayRef)patternRef phase:(CGFloatRef)phaseRef
-{
-    if (patternRef)
-        @deref(patternRef) = [_lineDashes copy];
-    if (phaseRef)
-        @deref(phaseRef) = _lineDashesPhase;
-}
-
-/*!
-    Cocoa compatibility.
-*/
-- (void)setLineDash:(CPArray)aPattern count:(NSInteger)count phase:(CGFloat)aPhase
-{
-    [self setLineDash:aPattern phase:aPhase];
-}
-
-/*!
-    Set stroke line dash pattern.
-
-    @param aPattern an array of stroke-skip lengths such as [2, 2, 4, 4]
-    @param aPhase amount of shift for the starting position of the first stroke
-*/
-- (void)setLineDash:(CPArray)aPattern phase:(CGFloat)aPhase
-{
-    _lineDashes = aPattern;
-    _lineDashesPhase = aPhase;
-}
-
 /*!
     Get the line width.
 */

AppKit/CPBox.j

@@ -20,11 +20,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-@import "CPTextField.j"
 @import "CPView.j"
 
 // CPBoxType
-@typedef CPBoxType
 CPBoxPrimary    = 0;
 CPBoxSecondary  = 1;
 CPBoxSeparator  = 2;
@@ -32,14 +30,12 @@ CPBoxOldStyle   = 3;
 CPBoxCustom     = 4;
 
 // CPBorderType
-@typedef CPBorderType
 CPNoBorder      = 0;
 CPLineBorder    = 1;
 CPBezelBorder   = 2;
 CPGrooveBorder  = 3;
 
 // CPTitlePosition
-@typedef CPTitlePosition
 CPNoTitle     = 0;
 CPAboveTop    = 1;
 CPAtTop       = 2;
@@ -59,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);
@@ -66,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";
-}
-
-+ (CPDictionary)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()],
@@ -108,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:@""];
@@ -136,7 +118,7 @@ CPBelowBottom = 6;
 
     @return the border rectangle of the box
 */
-- (CGRect)borderRect
+- (CPRect)borderRect
 {
     return [self bounds];
 }
@@ -226,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
@@ -286,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
@@ -383,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;
 
@@ -391,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;
     }
@@ -403,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
@@ -430,17 +411,12 @@ 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)
     {
@@ -448,9 +424,9 @@ CPBelowBottom = 6;
             // 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];
+                return [self _drawVerticalSeperatorInRect:bounds];
             else if (CGRectGetHeight(bounds) === 5.0)
-                return [self _drawHorizontalSeparatorInRect:bounds];
+                return [self _drawHorizontalSeperatorInRect:bounds];
 
             break;
     }
@@ -465,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";
@@ -611,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];
@@ -632,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

@@ -20,111 +20,63 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-@import <Foundation/CPObject.j>
 @import <Foundation/CPIndexSet.j>
 
 @import "CPControl.j"
 @import "CPImage.j"
-@import "CPScrollView.j"
 @import "CPTableView.j"
 @import "CPTextField.j"
-
-@global CPApp
-
-@protocol CPBrowserDelegate <CPObject>
-
-@optional
-- (BOOL)browser:(CPBrowser)browser acceptDrop:(id)info atRow:(CPInteger)row column:(CPInteger)column dropOperation:(CPTableViewDropOperation)dropOperation;
-- (BOOL)browser:(CPBrowser)browser canDragRowsWithIndexes:(CPIndexSet)rowIndexes inColumn:(CPInteger)column withEvent:(CPEvent )event;
-- (BOOL)browser:(CPBrowser)browser isLeafItem:(id)item;
-- (BOOL)browser:(CPBrowser)browser shouldSelectRowIndexes:(CPIndexSet)anIndexSet inColumn:(CPInteger)column;
-- (BOOL)browser:(CPBrowser)browser writeRowsWithIndexes:(CPIndexSet)rowIndexes inColumn:(CPInteger)column toPasteboard:(CPPasteboard)pasteboard;
-- (CPDragOperation)browser:(CPBrowser)browser validateDrop:(id)info proposedRow:(CPInteger)row column:(CPInteger)column dropOperation:(CPTableViewDropOperation)dropOperation;
-- (CPImage)browser:(CPBrowser)browser imageValueForItem:(id)anItem;
-- (CPImage)browser:(CPBrowser)browser draggingImageForRowsWithIndexes:(CPIndexSet)rowIndexes inColumn:(CPInteger)column withEvent:(CPEvent)event offset:(CGPoint)dragImageOffset;
-- (CPImage)browser:(CPBrowser)browser imageValueForItem:(id)item;
-- (CPIndexSet)browser:(CPBrowser)browser selectionIndexesForProposedSelection:(CPIndexSet)proposedSelectionIndexes inColumn:(CPInteger)column;
-- (CPInteger)browser:(CPBrowser)browser numberOfChildrenOfItem:(id)item;
-- (CPView)browser:(CPBrowser)browser draggingViewForRowsWithIndexes:(CPIndexSet)rowIndexes inColumn:(CPInteger)column withEvent:(CPEvent)event offset:(CGPoint)dragImageOffset;
-- (id)browser:(CPBrowser)browser child:(CPInteger)index ofItem:(id)item;
-- (id)browser:(CPBrowser)browser objectValueForItem:(id)item;
-- (id)rootItemForBrowser:(CPBrowser)browser;
-- (void)browser:(CPBrowser)browser didChangeLastColumn:(CPInteger)oldLastColumn toColumn:(CPInteger)column;
-- (void)browser:(CPBrowser)browser didResizeColumn:(CPInteger)column;
-- (void)browserSelectionIsChanging:(CPBrowser)browser;
-- (void)browserSelectionDidChange:(CPBrowser)browser;
-
-@end
-
-var CPBrowserDelegate_browser_acceptDrop_atRow_column_dropOperation_                        = 1 << 1,
-    CPBrowserDelegate_browser_canDragRowsWithIndexes_inColumn_withEvent_                    = 1 << 2,
-    CPBrowserDelegate_browser_isLeafItem_                                                   = 1 << 3,
-    CPBrowserDelegate_browser_shouldSelectRowIndexes_inColumn_                              = 1 << 4,
-    CPBrowserDelegate_browser_writeRowsWithIndexes_inColumn_toPasteboard_                   = 1 << 5,
-    CPBrowserDelegate_browser_validateDrop_proposedRow_column_dropOperation_                = 1 << 6,
-    CPBrowserDelegate_browser_imageValueForItem_                                            = 1 << 7,
-    CPBrowserDelegate_browser_draggingImageForRowsWithIndexes_inColumn_withEvent_offset_    = 1 << 8,
-    CPBrowserDelegate_browser_imageValueForItem_                                            = 1 << 9,
-    CPBrowserDelegate_browser_selectionIndexesForProposedSelection_inColumn_                = 1 << 10,
-    CPBrowserDelegate_browser_numberOfChildrenOfItem_                                       = 1 << 11,
-    CPBrowserDelegate_browser_draggingViewForRowsWithIndexes_inColumn_withEvent_offset_     = 1 << 12,
-    CPBrowserDelegate_browser_child_ofItem_                                                 = 1 << 13,
-    CPBrowserDelegate_browser_objectValueForItem_                                           = 1 << 14,
-    CPBrowserDelegate_rootItemForBrowser_                                                   = 1 << 15,
-    CPBrowserDelegate_browser_didChangeLastColumn_toColumn_                                 = 1 << 16,
-    CPBrowserDelegate_browser_didResizeColumn_                                              = 1 << 17,
-    CPBrowserDelegate_browserSelectionIsChanging_                                           = 1 << 18,
-    CPBrowserDelegate_browserSelectionDidChange_                                            = 1 << 19;
+@import "CPScrollView.j"
 
 /*!
     @ingroup appkit
     @class CPBrowser
 */
+
 @implementation CPBrowser : CPControl
 {
-    id <CPBrowserDelegate>  _delegate;
-    CPString                _pathSeparator;
-    unsigned                _implementedDelegateMethods;
+    id              _delegate;
+    CPString        _pathSeparator;
 
-    CPView                  _contentView;
-    CPScrollView            _horizontalScrollView;
-    CPView                  _prototypeView;
+    CPView          _contentView;
+    CPScrollView    _horizontalScrollView;
+    CPView          _prototypeView;
 
-    CPArray                 _tableViews;
-    CPArray                 _tableDelegates;
+    CPArray         _tableViews;
+    CPArray         _tableDelegates;
 
-    id                      _rootItem;
+    id              _rootItem;
 
-    BOOL                    _delegateSupportsImages;
+    BOOL            _delegateSupportsImages;
 
-    SEL                     _doubleAction @accessors(property=doubleAction);
+    SEL             _doubleAction @accessors(property=doubleAction);
 
-    BOOL                    _allowsMultipleSelection;
-    BOOL                    _allowsEmptySelection;
+    BOOL            _allowsMultipleSelection;
+    BOOL            _allowsEmptySelection;
 
-    Class                   _tableViewClass @accessors(property=tableViewClass);
+    Class           _tableViewClass @accessors(property=tableViewClass);
 
-    float                   _rowHeight;
-    float                   _imageWidth;
-    float                   _leafWidth;
-    float                   _minColumnWidth;
-    float                   _defaultColumnWidth @accessors(property=defaultColumnWidth);
+    float           _rowHeight;
+    float           _imageWidth;
+    float           _leafWidth;
+    float           _minColumnWidth;
+    float           _defaultColumnWidth @accessors(property=defaultColumnWidth);
 
-    CPArray                 _columnWidths;
+    CPArray         _columnWidths;
 }
 
-+ (CPString)defaultThemeClass
++ (CPImage)branchImage
 {
-    return "browser";
+    return [[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:[CPBrowser class]]
+                                                    pathForResource:"browser-leaf.png"]
+                                              size:CGSizeMake(9,9)];
 }
 
-+ (CPDictionary)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
@@ -184,74 +136,10 @@ var CPBrowserDelegate_browser_acceptDrop_atRow_column_dropOperation_
             [CPKeyedArchiver archivedDataWithRootObject:_prototypeView]];
 }
 
-- (void)setDelegate:(id <CPBrowserDelegate>)anObject
+- (void)setDelegate:(id)anObject
 {
-    if (_delegate === anObject)
-        return;
-
     _delegate = anObject;
-    _implementedDelegateMethods = 0;
-    _delegateSupportsImages = NO;
-
-    if ([_delegate respondsToSelector:@selector(browser:acceptDrop:atRow:column:dropOperation:)])
-        _implementedDelegateMethods |= CPBrowserDelegate_browser_acceptDrop_atRow_column_dropOperation_;
-
-    if ([_delegate respondsToSelector:@selector(browser:canDragRowsWithIndexes:inColumn:withEvent:)])
-        _implementedDelegateMethods |= CPBrowserDelegate_browser_canDragRowsWithIndexes_inColumn_withEvent_;
-
-    if ([_delegate respondsToSelector:@selector(browser:isLeafItem:)])
-        _implementedDelegateMethods |= CPBrowserDelegate_browser_isLeafItem_;
-
-    if ([_delegate respondsToSelector:@selector(browser:shouldSelectRowIndexes:inColumn:)])
-        _implementedDelegateMethods |= CPBrowserDelegate_browser_shouldSelectRowIndexes_inColumn_;
-
-    if ([_delegate respondsToSelector:@selector(browser:writeRowsWithIndexes:inColumn:toPasteboard:)])
-        _implementedDelegateMethods |= CPBrowserDelegate_browser_writeRowsWithIndexes_inColumn_toPasteboard_;
-
-    if ([_delegate respondsToSelector:@selector(browser:validateDrop:proposedRow:column:dropOperation:)])
-        _implementedDelegateMethods |= CPBrowserDelegate_browser_validateDrop_proposedRow_column_dropOperation_;
-
-    if ([_delegate respondsToSelector:@selector(browser:imageValueForItem:)])
-        _implementedDelegateMethods |= CPBrowserDelegate_browser_imageValueForItem_;
-
-    if ([_delegate respondsToSelector:@selector(browser:draggingImageForRowsWithIndexes:inColumn:withEvent:offset:)])
-        _implementedDelegateMethods |= CPBrowserDelegate_browser_draggingImageForRowsWithIndexes_inColumn_withEvent_offset_;
-
-    if ([_delegate respondsToSelector:@selector(browser:imageValueForItem:)])
-    {
-        _delegateSupportsImages = YES;
-        _implementedDelegateMethods |= CPBrowserDelegate_browser_imageValueForItem_;
-    }
-
-    if ([_delegate respondsToSelector:@selector(browser:selectionIndexesForProposedSelection:inColumn:)])
-        _implementedDelegateMethods |= CPBrowserDelegate_browser_selectionIndexesForProposedSelection_inColumn_;
-
-    if ([_delegate respondsToSelector:@selector(browser:numberOfChildrenOfItem:)])
-        _implementedDelegateMethods |= CPBrowserDelegate_browser_numberOfChildrenOfItem_;
-
-    if ([_delegate respondsToSelector:@selector(browser:draggingViewForRowsWithIndexes:inColumn:withEvent:offset:)])
-        _implementedDelegateMethods |= CPBrowserDelegate_browser_draggingViewForRowsWithIndexes_inColumn_withEvent_offset_;
-
-    if ([_delegate respondsToSelector:@selector(browser:child:ofItem:)])
-        _implementedDelegateMethods |= CPBrowserDelegate_browser_child_ofItem_;
-
-    if ([_delegate respondsToSelector:@selector(browser:objectValueForItem:)])
-        _implementedDelegateMethods |= CPBrowserDelegate_browser_objectValueForItem_;
-
-    if ([_delegate respondsToSelector:@selector(rootItemForBrowser:)])
-        _implementedDelegateMethods |= CPBrowserDelegate_rootItemForBrowser_;
-
-    if ([_delegate respondsToSelector:@selector(browser:didChangeLastColumn:toColumn:)])
-        _implementedDelegateMethods |= CPBrowserDelegate_browser_didChangeLastColumn_toColumn_;
-
-    if ([_delegate respondsToSelector:@selector(browser:didChangeLastColumn:)])
-        _implementedDelegateMethods |= CPBrowserDelegate_browser_didResizeColumn_;
-
-    if ([_delegate respondsToSelector:@selector(browserSelectionIsChanging:)])
-        _implementedDelegateMethods |= CPBrowserDelegate_browserSelectionIsChanging_;
-
-    if ([_delegate respondsToSelector:@selector(browserSelectionDidChange:)])
-        _implementedDelegateMethods |= CPBrowserDelegate_browserSelectionDidChange_;
+    _delegateSupportsImages = [_delegate respondsToSelector:@selector(browser:imageValueForItem:)];
 
     [self loadColumnZero];
 }
@@ -273,13 +161,16 @@ var CPBrowserDelegate_browser_acceptDrop_atRow_column_dropOperation_
 
 - (void)loadColumnZero
 {
-    _rootItem = [self _sendDelegateRootItemForBrowser];
+    if ([_delegate respondsToSelector:@selector(rootItemForBrowser:)])
+        _rootItem = [_delegate rootItemForBrowser:self];
+    else
+        _rootItem = nil;
 
     [self setLastColumn:-1];
     [self addColumn];
 }
 
-- (void)setLastColumn:(CPInteger)columnIndex
+- (void)setLastColumn:(int)columnIndex
 {
     if (columnIndex >= _tableViews.length)
         return;
@@ -287,18 +178,14 @@ var CPBrowserDelegate_browser_acceptDrop_atRow_column_dropOperation_
     var oldValue = _tableViews.length - 1,
         indexPlusOne = columnIndex + 1; // unloads all later columns.
 
-    if (columnIndex > 0)
-        [_tableViews[columnIndex - 1] setNeedsDisplay:YES];
-
-    [_tableViews[columnIndex] setNeedsDisplay:YES];
-
     [[_tableViews.slice(indexPlusOne) valueForKey:"enclosingScrollView"]
       makeObjectsPerformSelector:@selector(removeFromSuperview)];
 
     _tableViews = _tableViews.slice(0, indexPlusOne);
     _tableDelegates = _tableDelegates.slice(0, indexPlusOne);
 
-    [self _sendDelegateBrowserDidChangeLastColumn:oldValue toColumn:columnIndex];
+    if ([_delegate respondsToSelector:@selector(browser:didChangeLastColumn:toColumn:)])
+        [_delegate browser:self didChangeLastColumn:oldValue toColumn:columnIndex];
 
     [self tile];
 }
@@ -389,8 +276,8 @@ var CPBrowserDelegate_browser_acceptDrop_atRow_column_dropOperation_
     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];
@@ -398,7 +285,7 @@ var CPBrowserDelegate_browser_acceptDrop_atRow_column_dropOperation_
     [aTableView addTableColumn:column];
 }
 
-- (void)reloadColumn:(CPInteger)column
+- (void)reloadColumn:(int)column
 {
     [[self tableViewInColumn:column] reloadData];
 }
@@ -466,17 +353,17 @@ var CPBrowserDelegate_browser_acceptDrop_atRow_column_dropOperation_
 
 // ITEMS
 
-- (id)itemAtRow:(CPInteger)row inColumn:(CPInteger)column
+- (id)itemAtRow:(int)row inColumn:(int)column
 {
     return [_tableDelegates[column] childAtIndex:row];
 }
 
 - (BOOL)isLeafItem:(id)item
 {
-    return (_implementedDelegateMethods & CPBrowserDelegate_browser_isLeafItem_) && [_delegate browser:self isLeafItem:item];
+    return [_delegate respondsToSelector:@selector(browser:isLeafItem:)] && [_delegate browser:self isLeafItem:item];
 }
 
-- (id)parentForItemsInColumn:(CPInteger)column
+- (id)parentForItemsInColumn:(int)column
 {
     return [_tableDelegates[column] _item];
 }
@@ -538,26 +425,11 @@ var CPBrowserDelegate_browser_acceptDrop_atRow_column_dropOperation_
 
 - (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
@@ -600,7 +472,9 @@ var CPBrowserDelegate_browser_acceptDrop_atRow_column_dropOperation_
 {
     _columnWidths[column] = aWidth;
 
-    [self _sendDelegateBrowserDidResizeColumn:column];
+    if ([_delegate respondsToSelector:@selector(browser:didResizeColumn:)])
+        [_delegate browser:self didResizeColumn:column];
+
     [self tile];
 }
 
@@ -715,12 +589,15 @@ var CPBrowserDelegate_browser_acceptDrop_atRow_column_dropOperation_
     if (column < 0 || column > [self lastColumn] + 1)
         return;
 
-    indexSet = [self _sendDelegateBrowserSelectionIndexesForProposedSelection:indexSet inColumn:column];
+    if ([_delegate respondsToSelector:@selector(browser:selectionIndexesForProposedSelection:inColumn:)])
+        indexSet = [_delegate browser:self selectionIndexesForProposedSelection:indexSet inColumn:column];
 
-    if (![self _sendDelegateBrowserShouldSelectRowIndexes:indexSet inColumn:column])
+    if ([_delegate respondsToSelector:@selector(browser:shouldSelectRowIndexes:inColumn:)] &&
+       ![_delegate browser:self shouldSelectRowIndexes:indexSet inColumn:column])
         return;
 
-    [self _sendDelegateBrowserSelectionIsChanging];
+    if ([_delegate respondsToSelector:@selector(browserSelectionIsChanging:)])
+        [_delegate browserSelectionIsChanging:self];
 
     if (column > [self lastColumn])
         [self addColumn];
@@ -731,7 +608,8 @@ var CPBrowserDelegate_browser_acceptDrop_atRow_column_dropOperation_
 
     [self scrollColumnToVisible:column];
 
-    [self _sendDelegateBrowserSelectionDidChange];
+    if ([_delegate respondsToSelector:@selector(browserSelectionDidChange:)])
+        [_delegate browserSelectionDidChange:self];
 }
 
 - (void)setBackgroundColor:(CPColor)aColor
@@ -753,6 +631,30 @@ var CPBrowserDelegate_browser_acceptDrop_atRow_column_dropOperation_
     [_tableViews makeObjectsPerformSelector:@selector(registerForDraggedTypes:) withObject:types];
 }
 
+- (BOOL)canDragRowsWithIndexes:(CPIndexSet)rowIndexes inColumn:(int)columnIndex withEvent:(CPEvent)dragEvent
+{
+    if ([_delegate respondsToSelector:@selector(browser:canDragRowsWithIndexes:inColumn:withEvent:)])
+        return [_delegate browser:self canDragRowsWithIndexes:rowIndexes inColumn:columnIndex withEvent:dragEvent];
+
+    return YES;
+}
+
+- (CPImage)draggingImageForRowsWithIndexes:(CPIndexSet)rowIndexes inColumn:(int)columnIndex withEvent:(CPEvent)dragEvent offset:(CGPoint)dragImageOffset
+{
+    if ([_delegate respondsToSelector:@selector(browser:draggingImageForRowsWithIndexes:inColumn:withEvent:offset:)])
+        return [_delegate browser:self draggingImageForRowsWithIndexes:rowIndexes inColumn:columnIndex withEvent:dragEvent offset:dragImageOffset];
+
+    return nil;
+}
+
+- (CPView)draggingViewForRowsWithIndexes:(CPIndexSet)rowIndexes inColumn:(int)columnIndex withEvent:(CPEvent)dragEvent offset:(CGPoint)dragImageOffset
+{
+    if ([_delegate respondsToSelector:@selector(browser:draggingViewForRowsWithIndexes:inColumn:withEvent:offset:)])
+        return [_delegate browser:self draggingViewForRowsWithIndexes:rowIndexes inColumn:columnIndex withEvent:dragEvent offset:dragImageOffset];
+
+    return nil;
+}
+
 @end
 
 @implementation CPBrowser (CPCoding)
@@ -802,6 +704,8 @@ var CPBrowserDelegate_browser_acceptDrop_atRow_column_dropOperation_
 @end
 
 
+var _CPBrowserResizeControlBackgroundImage = nil;
+
 @implementation _CPBrowserResizeControl : CPView
 {
     CGPoint     _mouseDownX;
@@ -810,14 +714,22 @@ var CPBrowserDelegate_browser_acceptDrop_atRow_column_dropOperation_
     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;
 }
@@ -848,7 +760,7 @@ var CPBrowserDelegate_browser_acceptDrop_atRow_column_dropOperation_
     CPBrowser                _browser @accessors;
 }
 
-- (id)initWithFrame:(CGRect)aFrame
+- (void)initWithFrame:(CGRect)aFrame
 {
     if (self = [super initWithFrame:aFrame])
     {
@@ -902,26 +814,18 @@ var CPBrowserDelegate_browser_acceptDrop_atRow_column_dropOperation_
     return _browser;
 }
 
-/*!
-    @ignore
-*/
-- (BOOL)_isFocused
-{
-    return ([super _isFocused] || [_browser tableViewInColumn:[_browser selectedColumn]] === self);
-}
-
 - (BOOL)canDragRowsWithIndexes:(CPIndexSet)rowIndexes atPoint:(CGPoint)mouseDownPoint
 {
     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--)
@@ -934,9 +838,35 @@ var CPBrowserDelegate_browser_acceptDrop_atRow_column_dropOperation_
            [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
 
+@import <Foundation/CPObject.j>
+
 @implementation _CPBrowserTableDelegate : CPObject
 {
     CPBrowser   _browser @accessors;
@@ -977,22 +907,22 @@ var CPBrowserDelegate_browser_acceptDrop_atRow_column_dropOperation_
     [_browser selectRowIndexes:selectedIndexes inColumn:_index];
 }
 
-- (id)childAtIndex:(CPUInteger)index
+- (id)childAtIndex:(unsigned)index
 {
     return [_delegate browser:_browser child:index ofItem:_item];
 }
 
-- (BOOL)tableView:(CPTableView)aTableView acceptDrop:(id)info row:(CPInteger)row dropOperation:(CPTableViewDropOperation)operation
+- (BOOL)tableView:(CPTableView)aTableView acceptDrop:(id)info row:(int)row dropOperation:(CPTableViewDropOperation)operation
 {
-    if (_browser._implementedDelegateMethods & CPBrowserDelegate_browser_acceptDrop_atRow_column_dropOperation_)
+    if ([_delegate respondsToSelector:@selector(browser:acceptDrop:atRow:column:dropOperation:)])
         return [_delegate browser:_browser acceptDrop:info atRow:row column:_index dropOperation:operation];
     else
         return NO;
 }
 
-- (CPDragOperation)tableView:(CPTableView)aTableView validateDrop:(id)info proposedRow:(CPInteger)row proposedDropOperation:(CPTableViewDropOperation)operation
+- (CPDragOperation)tableView:(CPTableView)aTableView validateDrop:(id)info proposedRow:(int)row proposedDropOperation:(CPTableViewDropOperation)operation
 {
-    if (_browser._implementedDelegateMethods & CPBrowserDelegate_browser_validateDrop_proposedRow_column_dropOperation_)
+    if ([_delegate respondsToSelector:@selector(browser:validateDrop:proposedRow:column:dropOperation:)])
         return [_delegate browser:_browser validateDrop:info proposedRow:row column:_index dropOperation:operation];
     else
         return CPDragOperationNone;
@@ -1000,7 +930,7 @@ var CPBrowserDelegate_browser_acceptDrop_atRow_column_dropOperation_
 
 - (BOOL)tableView:(CPTableView)aTableView writeRowsWithIndexes:(CPIndexSet)rowIndexes toPasteboard:(CPPasteboard)pboard
 {
-    if (_browser._implementedDelegateMethods & CPBrowserDelegate_browser_writeRowsWithIndexes_inColumn_toPasteboard_)
+    if ([_delegate respondsToSelector:@selector(browser:writeRowsWithIndexes:inColumn:toPasteboard:)])
         return [_delegate browser:_browser writeRowsWithIndexes:rowIndexes inColumn:_index toPasteboard:pboard];
     else
         return NO;
@@ -1055,7 +985,7 @@ var CPBrowserDelegate_browser_acceptDrop_atRow_column_dropOperation_
     var imageView = [self layoutEphemeralSubviewNamed:@"image-view"
                                            positioned:CPWindowAbove
                       relativeToEphemeralSubviewNamed:nil],
-        isHighlighted = [self hasThemeState:CPThemeStateSelectedDataView];
+        isHighlighted = [self themeState] & CPThemeStateSelectedDataView;
 
     [imageView setImage: _isLeaf ? (isHighlighted ? _highlightedBranchImage : _branchImage) : nil];
     [imageView setImageScaling:CPImageScaleNone];
@@ -1070,7 +1000,7 @@ var CPBrowserDelegate_browser_acceptDrop_atRow_column_dropOperation_
     [aCoder encodeObject:_highlightedBranchImage forKey:"_CPBrowserLeafViewHighlightedBranchImageKey"];
 }
 
-- (id)initWithCoder:(CPCoder)aCoder
+- (void)initWithCoder:(CPCoder)aCoder
 {
     if (self = [super initWithCoder:aCoder])
     {
@@ -1083,115 +1013,3 @@ var CPBrowserDelegate_browser_acceptDrop_atRow_column_dropOperation_
 }
 
 @end
-
-@implementation CPBrowser (CPBrowserDelegate)
-
-/*!
-    @ignore
-    Call delegate rootItemForBrowser:
-*/
-- (id)_sendDelegateRootItemForBrowser
-{
-    if (!(_implementedDelegateMethods & CPBrowserDelegate_rootItemForBrowser_))
-        return nil;
-
-    return [_delegate rootItemForBrowser:self];
-}
-
-/*!
-    @ignore
-    Call delegate browser:didChangeLastColumn:toColumn:
-*/
-- (void)_sendDelegateBrowserDidChangeLastColumn:(CPInteger)lastColumn toColumn:(CPInteger)newColumn
-{
-    if (!(_implementedDelegateMethods & CPBrowserDelegate_browser_didChangeLastColumn_toColumn_))
-        return;
-
-    [_delegate browser:self didChangeLastColumn:lastColumn toColumn:newColumn];
-}
-
-/*!
-    @ignore
-    Call delegate browser:didResizeColumn:
-*/
-- (void)_sendDelegateBrowserDidResizeColumn:(CPInteger)column
-{
-    if (!(_implementedDelegateMethods & CPBrowserDelegate_browser_didResizeColumn_))
-        return;
-
-    [_delegate browser:self didResizeColumn:column];
-}
-
-/*!
-    @ignore
-    Call delegate browserSelectionIsChanging:
-*/
-- (void)_sendDelegateBrowserSelectionIsChanging
-{
-    if (!(_implementedDelegateMethods & CPBrowserDelegate_browserSelectionIsChanging_))
-        return;
-
-    [_delegate browserSelectionIsChanging:self];
-}
-
-/*!
-    @ignore
-    Call delegate browser:shouldSelectRowIndexes:inColumn:
-*/
-- (BOOL)_sendDelegateBrowserShouldSelectRowIndexes:(CPIndexSet)anIndexSet inColumn:(CPInteger)aColumn
-{
-    if (!(_implementedDelegateMethods & CPBrowserDelegate_browser_shouldSelectRowIndexes_inColumn_))
-        return YES;
-
-    return [_delegate browser:self shouldSelectRowIndexes:anIndexSet inColumn:aColumn];
-}
-
-/*!
-    @ignore
-    Call delegate browser:selectionIndexesForProposedSelection:inColumn:
-*/
-- (CPIndexSet)_sendDelegateBrowserSelectionIndexesForProposedSelection:(CPIndexSet)anIndexSet inColumn:(CPInteger)aColumn
-{
-    if (!(_implementedDelegateMethods & CPBrowserDelegate_browser_selectionIndexesForProposedSelection_inColumn_))
-        return anIndexSet;
-
-    return [_delegate browser:self selectionIndexesForProposedSelection:anIndexSet inColumn:aColumn];
-}
-
-/*!
-    @ignore
-    Call delegate browserSelectionDidChange
-*/
-- (void)_sendDelegateBrowserSelectionDidChange
-{
-    if (!(_implementedDelegateMethods & CPBrowserDelegate_browserSelectionDidChange_))
-        return;
-
-    [_delegate browserSelectionDidChange:self];
-}
-
-- (BOOL)canDragRowsWithIndexes:(CPIndexSet)rowIndexes inColumn:(CPInteger)columnIndex withEvent:(CPEvent)dragEvent
-{
-    if (_implementedDelegateMethods & CPBrowserDelegate_browser_canDragRowsWithIndexes_inColumn_withEvent_)
-        return [_delegate browser:self canDragRowsWithIndexes:rowIndexes inColumn:columnIndex withEvent:dragEvent];
-
-    return YES;
-}
-
-- (CPImage)draggingImageForRowsWithIndexes:(CPIndexSet)rowIndexes inColumn:(CPInteger)columnIndex withEvent:(CPEvent)dragEvent offset:(CGPoint)dragImageOffset
-{
-    if (_implementedDelegateMethods & CPBrowserDelegate_browser_draggingImageForRowsWithIndexes_inColumn_withEvent_offset_)
-        return [_delegate browser:self draggingImageForRowsWithIndexes:rowIndexes inColumn:columnIndex withEvent:dragEvent offset:dragImageOffset];
-
-    return nil;
-}
-
-- (CPView)draggingViewForRowsWithIndexes:(CPIndexSet)rowIndexes inColumn:(CPInteger)columnIndex withEvent:(CPEvent)dragEvent offset:(CGPoint)dragImageOffset
-{
-    if (_implementedDelegateMethods & CPBrowserDelegate_browser_draggingViewForRowsWithIndexes_inColumn_withEvent_offset_)
-        return [_delegate browser:self draggingViewForRowsWithIndexes:rowIndexes inColumn:columnIndex withEvent:dragEvent offset:dragImageOffset];
-
-    return nil;
-}
-
-@end

AppKit/CPButton.j

@@ -25,11 +25,11 @@
 
 @import "CPControl.j"
 @import "CPStringDrawing.j"
-@import "CPText.j"
-@import "CPWindow_Constants.j"
+
 
 /* @group CPBezelStyle */
-@typedef CPBezelStyle
+
+                                       // IB style
 CPRoundedBezelStyle             = 1;   // Push
 CPRegularSquareBezelStyle       = 2;   // Bevel
 CPThickSquareBezelStyle         = 3;
@@ -48,7 +48,6 @@ CPHUDBezelStyle                 = -1;
 
 
 /* @group CPButtonType */
-@typedef CPButtonType
 CPMomentaryLightButton  = 0;
 CPPushOnPushOffButton   = 1;
 CPToggleButton          = 2;
@@ -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;
@@ -74,18 +73,14 @@ CPChangeBackgroundCellMask  = CPBackgroundButtonMask;
 
 CPButtonStateMixed                  = CPThemeState("mixed");
 CPButtonStateBezelStyleRounded      = CPThemeState("rounded");
-CPButtonStateBezelStyleRoundRect    = CPThemeState("roundRect");
 
 // add all future correspondance between bezel styles and theme state here.
-var CPButtonBezelStyleStateMap = @{
-        CPRoundedBezelStyle: CPButtonStateBezelStyleRounded,
-        CPRoundRectBezelStyle: CPButtonStateBezelStyleRoundRect,
-    };
+var CPButtonBezelStyleStateMap = [CPDictionary dictionaryWithObjects:[CPButtonStateBezelStyleRounded, nil]
+                                                             forKeys:[CPRoundedBezelStyle, CPRoundRectBezelStyle]];
 
-/// @cond IGNORE
-CPButtonDefaultHeight = 25.0;
+
+CPButtonDefaultHeight = 24.0;
 CPButtonImageOffset   = 3.0;
-/// @endcond
 
 /*!
     @ingroup appkit
@@ -108,6 +103,7 @@ CPButtonImageOffset   = 3.0;
 
     // NS-style Display Properties
     CPBezelStyle        _bezelStyle;
+    CPControlSize       _controlSize;
 
     CPString            _keyEquivalent;
     unsigned            _keyEquivalentModifierMask;
@@ -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]];
@@ -149,15 +137,10 @@ CPButtonImageOffset   = 3.0;
     return @"button";
 }
 
-+ (CPDictionary)themeAttributes
++ (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"]];
 }
 
 /*!
@@ -188,6 +171,8 @@ CPButtonImageOffset   = 3.0;
 
 - (void)_init
 {
+    _controlSize = CPRegularControlSize;
+
     _keyEquivalent = @"";
     _keyEquivalentModifierMask = 0;
 
@@ -198,20 +183,6 @@ CPButtonImageOffset   = 3.0;
     [self setButtonType:CPMomentaryPushInButton];
 }
 
-#pragma mark -
-#pragma mark Control Size
-
-- (void)setControlSize:(CPControlSize)aControlSize
-{
-    [super setControlSize:aControlSize];
-
-    if ([self isBordered])
-        [self _sizeToControlSize];
-}
-
-
-#pragma mark -
-
 // Setting the state
 /*!
     Returns a Boolean value indicating whether the button allows a mixed state.
@@ -250,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;
@@ -280,7 +251,7 @@ CPButtonImageOffset   = 3.0;
             break;
 
         case CPOffState:
-            [self unsetThemeStates:[CPThemeStateSelected, CPButtonStateMixed, CPThemeStateHighlighted]];
+            [self unsetThemeState:CPThemeStateSelected | CPButtonStateMixed | CPThemeStateHighlighted];
     }
 }
 
@@ -304,7 +275,7 @@ CPButtonImageOffset   = 3.0;
 }
 
 /*!
-    Sets the button's state to the next available state.
+    Sets the button's next state to \c aState.
     @param aState Possible states are any of the CPButton globals:
     \c CPOffState, \c CPOnState, \c CPMixedState
 */
@@ -460,47 +431,38 @@ CPButtonImageOffset   = 3.0;
 {
     switch (aButtonType)
     {
-        case CPMomentaryLightButton:
-            [self setHighlightsBy:CPChangeGrayCellMask | CPChangeBackgroundCellMask];
-            [self setShowsStateBy:CPNoCellMask];
-            break;
+        case CPMomentaryLightButton:    [self setHighlightsBy:CPChangeGrayCellMask | CPChangeBackgroundCellMask];
+                                        [self setShowsStateBy:CPNoCellMask];
+                                        break;
 
-        case CPMomentaryPushInButton:
-            [self setHighlightsBy:CPPushInCellMask | CPChangeGrayCellMask | CPChangeBackgroundCellMask];
-            [self setShowsStateBy:CPNoCellMask];
-            break;
+        case CPMomentaryPushInButton:   [self setHighlightsBy:CPPushInCellMask | CPChangeGrayCellMask | CPChangeBackgroundCellMask];
+                                        [self setShowsStateBy:CPNoCellMask];
+                                        break;
 
-        case CPMomentaryChangeButton:
-            [self setHighlightsBy:CPContentsCellMask];
-            [self setShowsStateBy:CPNoCellMask];
-            break;
+        case CPMomentaryChangeButton:   [self setHighlightsBy:CPContentsCellMask];
+                                        [self setShowsStateBy:CPNoCellMask];
+                                        break;
 
-        case CPPushOnPushOffButton:
-            [self setHighlightsBy:CPPushInCellMask | CPChangeGrayCellMask | CPChangeBackgroundCellMask];
-            [self setShowsStateBy:CPChangeBackgroundCellMask | CPChangeGrayCellMask];
-            break;
+        case CPPushOnPushOffButton:     [self setHighlightsBy:CPPushInCellMask | CPChangeGrayCellMask | CPChangeBackgroundCellMask];
+                                        [self setShowsStateBy:CPChangeBackgroundCellMask | CPChangeGrayCellMask];
+                                        break;
 
-        case CPOnOffButton:
-            [self setHighlightsBy:CPChangeGrayCellMask | CPChangeBackgroundCellMask];
-            [self setShowsStateBy:CPChangeGrayCellMask | CPChangeBackgroundCellMask];
-            break;
+        case CPOnOffButton:             [self setHighlightsBy:CPChangeGrayCellMask | CPChangeBackgroundCellMask];
+                                        [self setShowsStateBy:CPChangeGrayCellMask | CPChangeBackgroundCellMask];
+                                        break;
 
-        case CPToggleButton:
-            [self setHighlightsBy:CPPushInCellMask | CPContentsCellMask];
-            [self setShowsStateBy:CPContentsCellMask];
-            break;
+        case CPToggleButton:            [self setHighlightsBy:CPPushInCellMask | CPContentsCellMask];
+                                        [self setShowsStateBy:CPContentsCellMask];
+                                        break;
 
-        case CPSwitchButton:
-            [CPException raise:CPInvalidArgumentException
-                        reason:"The CPSwitchButton type is not supported in Cappuccino, use the CPCheckBox class instead."];
+        case CPSwitchButton:            [CPException raise:CPInvalidArgumentException
+                                                    reason:"The CPSwitchButton type is not supported in Cappuccino, use the CPCheckBox class instead."];
 
-        case CPRadioButton:
-            [CPException raise:CPInvalidArgumentException
-                        reason:"The CPRadioButton type is not supported in Cappuccino, use the CPRadio class instead."];
+        case CPRadioButton:             [CPException raise:CPInvalidArgumentException
+                                                    reason:"The CPRadioButton type is not supported in Cappuccino, use the CPRadio class instead."];
 
-        default:
-            [CPException raise:CPInvalidArgumentException
-                        reason:"Unknown button type."];
+        default:                        [CPException raise:CPInvalidArgumentException
+                                                    reason:"Unknown button type."];
     }
 
     [self setImageDimsWhenDisabled:YES];
@@ -560,7 +522,6 @@ CPButtonImageOffset   = 3.0;
     _isTracking = YES;
 
     var startedTracking = [super startTrackingAt:aPoint];
-
     if (_highlightsBy & (CPPushInCellMask | CPChangeGrayCellMask))
     {
         if (_showsStateBy & (CPChangeGrayCellMask | CPChangeBackgroundCellMask))
@@ -575,7 +536,6 @@ CPButtonImageOffset   = 3.0;
         else
             [self highlight:NO];
     }
-
     return startedTracking;
 }
 
@@ -617,7 +577,7 @@ CPButtonImageOffset   = 3.0;
 {
     var contentInset = [self currentValueForThemeAttribute:@"content-inset"];
 
-    return CGRectInsetByInset(bounds, contentInset);
+    return _CGRectInsetByInset(bounds, contentInset);
 }
 
 - (CGRect)bezelRectForBounds:(CGRect)bounds
@@ -628,7 +588,7 @@ CPButtonImageOffset   = 3.0;
 
     var bezelInset = [self currentValueForThemeAttribute:@"bezel-inset"];
 
-    return CGRectInsetByInset(bounds, bezelInset);
+    return _CGRectInsetByInset(bounds, bezelInset);
 }
 
 - (CGSize)_minimumFrameSize
@@ -688,14 +648,14 @@ CPButtonImageOffset   = 3.0;
 {
     if (aName === "bezel-view")
     {
-        var view = [[CPView alloc] initWithFrame:CGRectMakeZero()];
+        var view = [[CPView alloc] initWithFrame:_CGRectMakeZero()];
 
         [view setHitTests:NO];
 
         return view;
     }
     else
-        return [[_CPImageAndTextView alloc] initWithFrame:CGRectMakeZero()];
+        return [[_CPImageAndTextView alloc] initWithFrame:_CGRectMakeZero()];
 }
 
 - (void)layoutSubviews
@@ -1028,3 +988,6 @@ var CPButtonImageKey                    = @"CPButtonImageKey",
 }
 
 @end
+
+@import "CPCheckBox.j"
+@import "CPRadio.j"

AppKit/CPButtonBar.j

@@ -1,35 +1,6 @@
-/*
- * 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
-@global CPKeyValueChangeOldKey
-@global CPKeyValueChangeNewKey
-@global CPKeyValueObservingOptionNew
-@global CPKeyValueObservingOptionOld
 
 @implementation CPButtonBar : CPView
 {
@@ -41,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];
@@ -53,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];
@@ -65,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];
@@ -82,19 +53,10 @@
     return @"button-bar";
 }
 
-+ (CPDictionary)themeAttributes
++ (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
@@ -112,8 +74,6 @@
 
 - (void)awakeFromCib
 {
-    [super awakeFromCib];
-
     var view = [self superview],
         subview = self;
 
@@ -134,20 +94,10 @@
 
 - (void)setButtons:(CPArray)buttons
 {
-    for (var i = [_buttons count] - 1; i >= 0; i--)
-    {
-        [_buttons[i] removeFromSuperview];
-        [_buttons[i] removeObserver:self forKeyPath:@"hidden"];
-    }
-
-
     _buttons = [CPArray arrayWithArray:buttons];
 
-    for (var i = [_buttons count] - 1; i >= 0; i--)
-    {
-        [_buttons[i] addObserver:self forKeyPath:@"hidden" options:CPKeyValueObservingOptionNew | CPKeyValueObservingOptionOld context:nil];
+    for (var i = 0, count = [_buttons count]; i < count; i++)
         [_buttons[i] setBordered:YES];
-    }
 
     [self setNeedsLayout];
 }
@@ -233,15 +183,8 @@
         count = [buttonsNotHidden count];
 
     while (count--)
-    {
-        var button = buttonsNotHidden[count];
-
-        if ([button isHidden])
-        {
-            [button removeFromSuperview];
-            [buttonsNotHidden removeObject:button];
-        }
-    }
+        if ([buttonsNotHidden[count] isHidden])
+            [buttonsNotHidden removeObject:buttonsNotHidden[count]];
 
     var currentButtonOffset = _resizeControlIsLeftAligned ? CGRectGetMaxX([self bounds]) + 1 : -1,
         bounds = [self bounds],
@@ -272,15 +215,15 @@
             currentButtonOffset += width - 1;
         }
 
-        [button setValue:normalColor forThemeAttribute:@"bezel-color" inStates:[CPThemeStateNormal, CPThemeStateBordered]];
-        [button setValue:highlightedColor forThemeAttribute:@"bezel-color" inStates:[CPThemeStateHighlighted,  CPThemeStateBordered, ]];
-        [button setValue:disabledColor forThemeAttribute:@"bezel-color" inStates:[CPThemeStateDisabled, CPThemeStateBordered]];
+        [button setValue:normalColor forThemeAttribute:@"bezel-color" inState:CPThemeStateNormal | CPThemeStateBordered];
+        [button setValue:highlightedColor forThemeAttribute:@"bezel-color" inState:CPThemeStateHighlighted | CPThemeStateBordered];
+        [button setValue:disabledColor forThemeAttribute:@"bezel-color" inState:CPThemeStateDisabled | CPThemeStateBordered];
         [button setValue:textColor forThemeAttribute:@"text-color" inState:CPThemeStateBordered];
 
         // FIXME shouldn't need this
-        [button setValue:normalColor forThemeAttribute:@"bezel-color" inStates:[CPThemeStateNormal, CPThemeStateBordered, CPPopUpButtonStatePullsDown]];
-        [button setValue:highlightedColor forThemeAttribute:@"bezel-color" inStates:[CPThemeStateHighlighted, CPThemeStateBordered, CPPopUpButtonStatePullsDown]];
-        [button setValue:disabledColor forThemeAttribute:@"bezel-color" inStates:[CPThemeStateDisabled, CPThemeStateBordered, CPPopUpButtonStatePullsDown]];
+        [button setValue:normalColor forThemeAttribute:@"bezel-color" inState:CPThemeStateNormal | CPThemeStateBordered | CPPopUpButtonStatePullsDown];
+        [button setValue:highlightedColor forThemeAttribute:@"bezel-color" inState:CPThemeStateHighlighted | CPThemeStateBordered | CPPopUpButtonStatePullsDown];
+        [button setValue:disabledColor forThemeAttribute:@"bezel-color" inState:CPThemeStateDisabled | CPThemeStateBordered | CPPopUpButtonStatePullsDown];
 
         [self addSubview:button];
     }
@@ -296,14 +239,6 @@
     }
 }
 
-- (void)observeValueForKeyPath:(CPString)keyPath ofObject:(id)object change:(CPDictionary)change context:(id)context
-{
-    if ([change objectForKey:CPKeyValueChangeOldKey] == [change objectForKey:CPKeyValueChangeNewKey])
-        return;
-
-    [self setNeedsLayout];
-}
-
 - (void)setFrameSize:(CGSize)aSize
 {
     [super setFrameSize:aSize];

AppKit/CPCheckBox.j

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

AppKit/CPClipView.j

@@ -22,7 +22,6 @@
 
 @import "CPView.j"
 
-@class CPScrollView
 
 /*!
     @ingroup appkit
@@ -45,13 +44,44 @@
     if (_documentView == aView)
         return;
 
+    var defaultCenter = [CPNotificationCenter defaultCenter];
+
     if (_documentView)
+    {
+        [defaultCenter
+            removeObserver:self
+                      name:CPViewFrameDidChangeNotification
+                    object:_documentView];
+
+        [defaultCenter
+            removeObserver:self
+                      name:CPViewBoundsDidChangeNotification
+                    object:_documentView];
+
         [_documentView removeFromSuperview];
+    }
 
     _documentView = aView;
 
     if (_documentView)
+    {
         [self addSubview:_documentView];
+
+        [_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];
+    }
 }
 
 /*!
@@ -71,19 +101,19 @@
 - (CGPoint)constrainScrollPoint:(CGPoint)aPoint
 {
     if (!_documentView)
-        return CGPointMakeZero();
+        return _CGPointMakeZero();
 
     var documentFrame = [_documentView frame];
 
-    aPoint.x = MAX(0.0, MIN(aPoint.x, MAX(CGRectGetWidth(documentFrame) - CGRectGetWidth(_bounds), 0.0)));
-    aPoint.y = MAX(0.0, MIN(aPoint.y, MAX(CGRectGetHeight(documentFrame) - CGRectGetHeight(_bounds), 0.0)));
+    aPoint.x = MAX(0.0, MIN(aPoint.x, MAX(_CGRectGetWidth(documentFrame) - _CGRectGetWidth(_bounds), 0.0)));
+    aPoint.y = MAX(0.0, MIN(aPoint.y, MAX(_CGRectGetHeight(documentFrame) - _CGRectGetHeight(_bounds), 0.0)));
 
     return aPoint;
 }
 
 - (void)setBoundsOrigin:(CGPoint)aPoint
 {
-    if (CGPointEqualToPoint(_bounds.origin, aPoint))
+    if (_CGPointEqualToPoint(_bounds.origin, aPoint))
         return;
 
     [super setBoundsOrigin:aPoint];
@@ -193,11 +223,6 @@
     return [self scrollToPoint:CGPointMake(bounds.origin.x - deltaX, bounds.origin.y - deltaY)];
 }
 
-- (CGRect)documentVisibleRect
-{
-    return [_documentView visibleRect];
-}
-
 @end
 
 
@@ -208,11 +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 setDocumentView:[aCoder decodeObjectForKey:CPClipViewDocumentViewKey]];
 
     return self;
 }

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,25 +21,12 @@
  */
 
 @import <Foundation/CPObject.j>
-@import "CPGraphicsContext.j"
 
 @import "CGColor.j"
 
-@import "_CPObject+Theme.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,
@@ -66,11 +53,68 @@ var cachedBlackColor,
     cachedOrangeColor,
     cachedPurpleColor,
     cachedShadowColor,
-    cachedClearColor,
-    cachedThemeColor;
+    cachedClearColor;
 
 /// @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
 
@@ -80,7 +124,7 @@ var cachedBlackColor,
     <p>It also provides some class helper methods that
     returns instances of commonly used colors.</p>
 */
-@implementation CPColor : CPObject <CPTheme>
+@implementation CPColor : CPObject
 {
     CPArray     _components;
 
@@ -88,27 +132,6 @@ var cachedBlackColor,
     CPString    _cssString;
 }
 
-
-#pragma mark -
-#pragma mark Theming
-
-+ (CPString)defaultThemeClass
-{
-    return "color";
-}
-
-+ (CPDictionary)themeAttributes
-{
-    return @{
-            @"alternate-selected-control-color": [CPNull null],
-            @"secondary-selected-control-color" : [CPNull null]
-        };
-}
-
-
-#pragma mark -
-#pragma mark Static methods
-
 /*!
     Creates a color in the RGB colorspace, with an alpha value.
     Each component should be between the range of 0.0 to 1.0. For
@@ -179,15 +202,11 @@ var cachedBlackColor,
 }
 
 /*!
-    Creates a new color based on the given HSB components.
+    Creates a new color in HSB space.
 
-    Note: earlier versions of this method took a hue component as degrees between 0-360,
-    and saturation and brightness components as percent between 0-100. This method has
-    now been corrected to take all components in the 0-1 range as in Cocoa.
-
-    @param hue the hue component (0.0-1.0)
-    @param saturation the saturation component (0.0-1.0)
-    @param brightness the brightness component (0.0-1.0)
+    @param hue the hue value
+    @param saturation the saturation value
+    @param brightness the brightness value
 
     @return the initialized color
 */
@@ -196,61 +215,25 @@ var cachedBlackColor,
     return [self colorWithHue:hue saturation:saturation brightness:brightness alpha:1.0];
 }
 
-/*!
-    Calibrated colors are not supported in Cappuccino.
-
-    This method has the same result as [CPColor colorWithHue:saturation:brightness:alpha:].
-*/
-+ (CPColor)colorWithCalibratedHue:(float)hue saturation:(float)saturation brightness:(float)brightness alpha:(float)alpha
-{
-    return [self colorWithHue:hue saturation:saturation brightness:brightness alpha:alpha];
-}
-
-/*!
-    Creates a new color based on the given HSB components.
-
-    Note: earlier versions of this method took a hue component as degrees between 0-360,
-    and saturation and brightness components as percent between 0-100. This method has
-    now been corrected to take all components in the 0-1 range as in Cocoa.
-
-    @param hue the hue component (0.0-1.0)
-    @param saturation the saturation component (0.0-1.0)
-    @param brightness the brightness component (0.0-1.0)
-    @param alpha the opacity component (0.0-1.0)
-
-    @return the initialized color
-*/
 + (CPColor)colorWithHue:(float)hue saturation:(float)saturation brightness:(float)brightness alpha:(float)alpha
 {
-    // Clamp values.
-    hue = MAX(MIN(hue, 1.0), 0.0);
-    saturation = MAX(MIN(saturation, 1.0), 0.0);
-    brightness = MAX(MIN(brightness, 1.0), 0.0);
-
     if (saturation === 0.0)
-        return [CPColor colorWithCalibratedWhite:brightness alpha:alpha];
+        return [CPColor colorWithCalibratedWhite:brightness / 100.0 alpha:alpha];
 
-    var f = (hue * 360) % 60,
-        p = (brightness * (1 - saturation)),
-        q = (brightness * (60 - saturation * f)) / 60,
-        t = (brightness * (60 - saturation * (60 - f))) / 60,
-        b = brightness;
+    var f = hue % 60,
+        p = (brightness * (100 - saturation)) / 10000,
+        q = (brightness * (6000 - saturation * f)) / 600000,
+        t = (brightness * (6000 - saturation * (60 -f))) / 600000,
+        b =  brightness / 100.0;
 
-    switch (FLOOR(hue * 6))
+    switch (FLOOR(hue / 60))
     {
-        case 0:
-        case 6:
-            return [CPColor colorWithCalibratedRed:b green:t blue:p alpha:alpha];
-        case 1:
-            return [CPColor colorWithCalibratedRed:q green:b blue:p alpha:alpha];
-        case 2:
-            return [CPColor colorWithCalibratedRed:p green:b blue:t alpha:alpha];
-        case 3:
-            return [CPColor colorWithCalibratedRed:p green:q blue:b alpha:alpha];
-        case 4:
-            return [CPColor colorWithCalibratedRed:t green:p blue:b alpha:alpha];
-        case 5:
-            return [CPColor colorWithCalibratedRed:b green:p blue:q alpha:alpha];
+        case 0: return [CPColor colorWithCalibratedRed:b green:t blue:p alpha:alpha];
+        case 1: return [CPColor colorWithCalibratedRed:q green:b blue:p alpha:alpha];
+        case 2: return [CPColor colorWithCalibratedRed:p green:b blue:t alpha:alpha];
+        case 3: return [CPColor colorWithCalibratedRed:p green:q blue:b alpha:alpha];
+        case 4: return [CPColor colorWithCalibratedRed:t green:p blue:b alpha:alpha];
+        case 5: return [CPColor colorWithCalibratedRed:b green:p blue:q alpha:alpha];
     }
 }
 
@@ -459,22 +442,14 @@ var cachedBlackColor,
     return cachedClearColor;
 }
 
-+ (CPColor)_cachedThemeColor
-{
-    if (!cachedThemeColor)
-        cachedThemeColor = [self colorWithCalibratedWhite:0.0 alpha:0.0];
-
-    return cachedThemeColor;
-}
-
 + (CPColor)alternateSelectedControlColor
 {
-    return [[self _cachedThemeColor] valueForThemeAttribute:@"alternate-selected-control-color"];
+    return [[CPColor alloc] _initWithRGBA:[0.22, 0.46, 0.84, 1.0]];
 }
 
 + (CPColor)secondarySelectedControlColor
 {
-    return [[self _cachedThemeColor] valueForThemeAttribute:@"secondary-selected-control-color"];
+    return [[CPColor alloc] _initWithRGBA:[0.83, 0.83, 0.83, 1.0]];
 }
 
 /*!
@@ -520,10 +495,6 @@ var cachedBlackColor,
     // use it (issue #1413.)
     [self _initCSSStringFromComponents];
 
-    _theme = [CPTheme defaultTheme];
-    _themeState = CPThemeStateNormal;
-    [self _loadThemeAttributes];
-
     return self;
 }
 
@@ -537,10 +508,6 @@ var cachedBlackColor,
         _components = components;
 
         [self _initCSSStringFromComponents];
-
-        _theme = [CPTheme defaultTheme];
-        _themeState = CPThemeStateNormal;
-        [self _loadThemeAttributes];
     }
 
     return self;
@@ -567,10 +534,6 @@ var cachedBlackColor,
         _patternImage = anImage;
         _cssString = "url(\"" + [_patternImage filename] + "\")";
         _components = [0.0, 0.0, 0.0, 1.0];
-
-        _theme = [CPTheme defaultTheme];
-        _themeState = CPThemeStateNormal;
-        [self _loadThemeAttributes];
     }
 
     return self;
@@ -658,9 +621,6 @@ var cachedBlackColor,
 
 /*!
     Returns an array with the HSB values for this color.
-
-    The values are expressed as fractions between 0.0-1.0.
-
     The index values are ordered as:
 <pre>
 <b>Index</b>   <b>Component</b>
@@ -707,36 +667,12 @@ var cachedBlackColor,
     }
 
     return [
-        hue,
-        saturation,
-        brightness
+        ROUND(hue * 360.0),
+        ROUND(saturation * 100.0),
+        ROUND(brightness * 100.0)
     ];
 }
 
-/*!
-    Returns the hue component, the H in HSB, of the receiver.
-*/
-- (float)hueComponent
-{
-    return [self hsbComponents][0];
-}
-
-/*!
-    Returns the saturation component, the S in HSB, of the receiver.
-*/
-- (float)saturationComponent
-{
-    return [self hsbComponents][1];
-}
-
-/*!
-    Returns the brightness component, the B in HSB, of the receiver.
-*/
-- (float)brightnessComponent
-{
-    return [self hsbComponents][2];
-}
-
 /*!
     Returns the CSS representation of this color. The color will
     be in one of the following forms:
@@ -803,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";
         }
@@ -811,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;
 }
@@ -856,12 +792,6 @@ url("data:image/png;base64,BASE64ENCODEDDATA")  // if there is a pattern image
     return [CPColor colorWithRed:RAND() green:RAND() blue:RAND() alpha:1.0];
 }
 
-+ (CPColor)checkerBoardColor
-{
-    // Thanks to cocco http://stackoverflow.com/a/18368212/76900.
-    return [CPColor colorWithPatternImage:[[CPImage alloc] initWithContentsOfFile:"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQAQMAAAAlPW0iAAAABlBMVEX////MzMw46qqDAAAAEElEQVQImWNg+M+AFeEQBgB+vw/xfUUZkgAAAABJRU5ErkJggg=="]];
-}
-
 @end
 
 /// @cond IGNORE
@@ -878,13 +808,9 @@ var CPColorComponentsKey    = @"CPColorComponentsKey",
 - (id)initWithCoder:(CPCoder)aCoder
 {
     if ([aCoder containsValueForKey:CPColorPatternImageKey])
-        self = [self _initWithPatternImage:[aCoder decodeObjectForKey:CPColorPatternImageKey]];
-    else
-        self = [self _initWithRGBA:[aCoder decodeObjectForKey:CPColorComponentsKey]];
+        return [self _initWithPatternImage:[aCoder decodeObjectForKey:CPColorPatternImageKey]];
 
-    [self _decodeThemeObjectsWithCoder:aCoder];
-
-    return self;
+    return [self _initWithRGBA:[aCoder decodeObjectForKey:CPColorComponentsKey]];
 }
 
 /*!
@@ -897,8 +823,6 @@ var CPColorComponentsKey    = @"CPColorComponentsKey",
         [aCoder encodeObject:_patternImage forKey:CPColorPatternImageKey];
     else
         [aCoder encodeObject:_components forKey:CPColorComponentsKey];
-
-    [self _encodeThemeObjectsWithCoder:aCoder];
 }
 
 @end
@@ -948,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,35 +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
-@class _CPColorPanelToolbar
-@class _CPColorPanelSwatches
-@class _CPColorPanelPreview
-
-@global CPApp
-
-/*
-    A color wheel
-    @global
-    @group CPColorPanelMode
-*/
-CPWheelColorPickerMode = 1;
-
-/*
-    Slider based picker
-    @global
-    @group CPColorPanelMode
-*/
-CPSliderColorPickerMode = 2;
-
-CPColorPickerViewWidth  = 265;
-CPColorPickerViewHeight = 370;
 
 CPColorPanelColorDidChangeNotification = @"CPColorPanelColorDidChangeNotification";
 
@@ -61,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
@@ -71,6 +64,7 @@ var SharedColorPanel = nil,
 */
 @implementation CPColorPanel : CPPanel
 {
+    _CPColorPanelToolbar    _toolbar;
     _CPColorPanelSwatches   _swatchView;
     _CPColorPanelPreview    _previewView;
 
@@ -129,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];
@@ -254,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];
@@ -425,7 +419,7 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
     CPCookie        _swatchCookie;
 }
 
-- (id)initWithFrame:(CGRect)aFrame
+- (id)initWithFrame:(CPRect)aFrame
 {
     self = [super initWithFrame:aFrame];
 
@@ -443,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];
@@ -578,7 +572,7 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
         [aPasteboard setData:[CPKeyedArchiver archivedDataWithRootObject:_dragColor] forType:aType];
 }
 
-- (void)performDragOperation:(id /*<CPDraggingInfo>*/)aSender
+- (void)performDragOperation:(id <CPDraggingInfo>)aSender
 {
     var location = [self convertPoint:[aSender draggingLocation] fromView:nil],
         pasteboard = [aSender draggingPasteboard],
@@ -598,7 +592,7 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
     CPColorPanel    _colorPanel;
 }
 
-- (id)initWithFrame:(CGRect)aFrame
+- (id)initWithFrame:(CPRect)aFrame
 {
     self = [super initWithFrame:aFrame];
 
@@ -617,7 +611,7 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
     return _colorPanel;
 }
 
-- (void)performDragOperation:(id /*<CPDraggingInfo>*/)aSender
+- (void)performDragOperation:(id <CPDraggingInfo>)aSender
 {
     var pasteboard = [aSender draggingPasteboard];
 
@@ -639,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],
@@ -651,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,14 +24,6 @@
 
 @import "CPView.j"
 
-@class CPSlider
-@class CPColorPanel
-@class __CPColorWheel
-
-@global CPColorPickerViewWidth
-@global CPColorPickerViewHeight
-@global CPWheelColorPickerMode
-
 
 /*!
     @ingroup appkit
@@ -117,12 +109,12 @@
 
 - (id)initView
 {
-    var aFrame = CGRectMake(0, 0, CPColorPickerViewWidth, CPColorPickerViewHeight);
+    var aFrame = _CGRectMake(0, 0, CPColorPickerViewWidth, CPColorPickerViewHeight);
 
     _pickerView = [[CPView alloc] initWithFrame:aFrame];
     [_pickerView setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
 
-    _brightnessSlider = [[CPSlider alloc] initWithFrame:CGRectMake(0, (aFrame.size.height - 34), aFrame.size.width, 15)];
+    _brightnessSlider = [[CPSlider alloc] initWithFrame:_CGRectMake(0, (aFrame.size.height - 34), aFrame.size.width, 15)];
 
     [_brightnessSlider setValue:15.0 forThemeAttribute:@"track-width"];
     [_brightnessSlider setValue:[CPColor colorWithPatternImage:[[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:[CPColorPicker class]] pathForResource:@"brightness_bar.png"]]] forThemeAttribute:@"track-color"];
@@ -135,7 +127,7 @@
     [_brightnessSlider setAction:@selector(brightnessSliderDidChange:)];
     [_brightnessSlider setAutoresizingMask:CPViewWidthSizable | CPViewMinYMargin];
 
-    _hueSaturationView = [[__CPColorWheel alloc] initWithFrame:CGRectMake(0, 0, aFrame.size.width, aFrame.size.height - 38)];
+    _hueSaturationView = [[__CPColorWheel alloc] initWithFrame:_CGRectMake(0, 0, aFrame.size.width, aFrame.size.height - 38)];
     [_hueSaturationView setDelegate:self];
     [_hueSaturationView setAutoresizingMask:(CPViewWidthSizable | CPViewHeightSizable)];
 
@@ -160,12 +152,12 @@
         brightness = [_brightnessSlider floatValue];
 
     [_hueSaturationView setWheelBrightness:brightness / 100.0];
-    [_brightnessSlider setBackgroundColor:[CPColor colorWithHue:hue / 360.0 saturation:saturation / 100.0 brightness:1]];
+    [_brightnessSlider setBackgroundColor:[CPColor colorWithHue:hue saturation:saturation brightness:100]];
 
     var colorPanel = [self colorPanel],
         opacity = [colorPanel opacity];
 
-    _cachedColor = [CPColor colorWithHue:hue / 360.0 saturation:saturation / 100.0 brightness:brightness / 100.0 alpha:opacity];
+    _cachedColor = [CPColor colorWithHue:hue saturation:saturation brightness:brightness alpha:opacity];
 
     [[self colorPanel] setColor:_cachedColor];
 }
@@ -196,10 +188,10 @@
     var hsb = [newColor hsbComponents];
 
     [_hueSaturationView setPositionToColor:newColor];
-    [_brightnessSlider setFloatValue:hsb[2] * 100.0];
-    [_hueSaturationView setWheelBrightness:hsb[2]];
+    [_brightnessSlider setFloatValue:hsb[2]];
+    [_hueSaturationView setWheelBrightness:hsb[2] / 100.0];
 
-    [_brightnessSlider setBackgroundColor:[CPColor colorWithHue:hsb[0] saturation:hsb[1] brightness:1]];
+    [_brightnessSlider setBackgroundColor:[CPColor colorWithHue:hsb[0] saturation:hsb[1] brightness:100]];
 }
 
 - (CPImage)provideNewButtonImage
@@ -230,7 +222,7 @@
     float       _radius;
 }
 
-- (id)initWithFrame:(CGRect)aFrame
+- (id)initWithFrame:(CPRect)aFrame
 {
     if (self = [super initWithFrame:aFrame])
     {
@@ -277,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);
 
@@ -361,15 +353,15 @@
     _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
 {
     var hsb    = [aColor hsbComponents],
         bounds = [self bounds],
-        angle    = [self degreesToRadians:hsb[0] * 360.0],
-        distance = hsb[1] * _radius;
+        angle    = [self degreesToRadians:hsb[0]],
+        distance = (hsb[1] / 100.0) * _radius;
 
     [self setAngle:angle distance:distance];
 }

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
@@ -58,15 +58,10 @@ var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiv
     return @"colorwell";
 }
 
-+ (CPDictionary)themeAttributes
++ (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
@@ -86,12 +81,14 @@ var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiv
         _active = NO;
         _color = [CPColor whiteColor];
         [self setBordered:YES];
+
+        [self _registerForNotifications];
     }
 
     return self;
 }
 
-- (void)_registerNotifications
+- (void)_registerForNotifications
 {
     var defaultCenter = [CPNotificationCenter defaultCenter];
 
@@ -108,22 +105,6 @@ var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiv
              object:[CPColorPanel sharedColorPanel]];
 }
 
-- (void)_removeNotifications
-{
-    var defaultCenter = [CPNotificationCenter defaultCenter];
-
-    [defaultCenter
-        removeObserver:self
-                  name:_CPColorWellDidBecomeExclusiveNotification
-                object:nil];
-
-    [defaultCenter
-        removeObserver:self
-                  name:CPWindowWillCloseNotification
-                object:[CPColorPanel sharedColorPanel]];
-
-}
-
 /*!
     Sets whether the color well is bordered.
 */
@@ -263,21 +244,21 @@ var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiv
 {
     var contentInset = [self currentValueForThemeAttribute:@"content-inset"];
 
-    return CGRectInsetByInset(bounds, contentInset);
+    return _CGRectInsetByInset(bounds, contentInset);
 }
 
 - (CGRect)bezelRectForBounds:(CGRect)bounds
 {
     var bezelInset = [self currentValueForThemeAttribute:@"bezel-inset"];
 
-    return CGRectInsetByInset(bounds, bezelInset);
+    return _CGRectInsetByInset(bounds, bezelInset);
 }
 
 - (CGRect)contentBorderRectForBounds:(CGRect)bounds
 {
     var contentBorderInset = [self currentValueForThemeAttribute:@"content-border-inset"];
 
-    return CGRectInsetByInset(bounds, contentBorderInset);
+    return _CGRectInsetByInset(bounds, contentBorderInset);
 }
 
 - (CGRect)rectForEphemeralSubviewNamed:(CPString)aName
@@ -297,7 +278,7 @@ var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiv
 
 - (CPView)createEphemeralSubviewNamed:(CPString)aName
 {
-    var view = [[CPView alloc] initWithFrame:CGRectMakeZero()];
+    var view = [[CPView alloc] initWithFrame:_CGRectMakeZero()];
 
     [view setHitTests:NO];
 
@@ -326,28 +307,6 @@ var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiv
     [contentBorderView setBackgroundColor:[self currentValueForThemeAttribute:@"content-border-color"]];
 }
 
-
-#pragma mark -
-#pragma mark Observers method
-
-- (void)_addObservers
-{
-    if (_isObserving)
-        return;
-
-    [super _addObservers];
-    [self _registerNotifications];
-}
-
-- (void)_removeObservers
-{
-    if (!_isObserving)
-        return;
-
-    [super _removeObservers];
-    [self _removeNotifications];
-}
-
 @end
 
 @implementation CPColorWellValueBinder : CPBinder
@@ -356,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];
@@ -364,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
@@ -399,6 +369,8 @@ var CPColorWellColorKey     = "CPColorWellColorKey",
         _active = NO;
         _color = [aCoder decodeObjectForKey:CPColorWellColorKey];
         [self setBordered:[aCoder decodeBoolForKey:CPColorWellBorderedKey]];
+
+        [self _registerForNotifications];
     }
 
     return self;

AppKit/CPComboBox.j

@@ -20,32 +20,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-@import "CPText.j"
 @import "CPTextField.j"
 @import "_CPPopUpList.j"
 
 
-// TODO : should conform to protocol CPTextFieldDelegate
-@protocol CPComboBoxDelegate <CPObject>
-
-@optional
-- (void)comboBoxSelectionIsChanging:(CPNotification)aNotification;
-- (void)comboBoxSelectionDidChange:(CPNotification)aNotification;
-- (void)comboBoxWillPopUp:(CPNotification)aNotification;
-- (void)comboBoxWillDismiss:(CPNotification)aNotification;
-
-@end
-
-@protocol CPComboBoxDataSource <CPObject>
-
-@optional
-- (CPString)comboBox:(CPComboBox)aComboBox completedString:(CPString)uncompletedString;
-- (id)comboBox:(CPComboBox)aComboBox objectValueForItemAtIndex:(int)index;
-- (int)comboBox:(CPComboBox)aComboBox indexOfItemWithStringValue:(CPString)stringValue;
-- (int)numberOfItemsInComboBox:(CPComboBox)aComboBox;
-
-@end
-
 CPComboBoxSelectionDidChangeNotification  = @"CPComboBoxSelectionDidChangeNotification";
 CPComboBoxSelectionIsChangingNotification = @"CPComboBoxSelectionIsChangingNotification";
 CPComboBoxWillDismissNotification         = @"CPComboBoxWillDismissNotification";
@@ -53,11 +31,6 @@ CPComboBoxWillPopUpNotification           = @"CPComboBoxWillPopUpNotification";
 
 CPComboBoxStateButtonBordered = CPThemeState("button-bordered");
 
-var CPComboBoxDelegate_comboBoxSelectionIsChanging_ = 1 << 0,
-    CPComboBoxDelegate_comboBoxSelectionDidChange_  = 1 << 1,
-    CPComboBoxDelegate_comboBoxWillPopUp_           = 1 << 2,
-    CPComboBoxDelegate_comboBoxWillDismiss_         = 1 << 3;
-
 var CPComboBoxTextSubview = @"text",
     CPComboBoxButtonSubview = @"button",
     CPComboBoxDefaultNumberOfVisibleItems = 5,
@@ -66,20 +39,17 @@ var CPComboBoxTextSubview = @"text",
 
 @implementation CPComboBox : CPTextField
 {
-    BOOL                        _canComplete;
-    BOOL                        _completes;
-    BOOL                        _forceSelection;
-    BOOL                        _hasVerticalScroller;
-    BOOL                        _popUpButtonCausedResign;
-    BOOL                        _usesDataSource;
-    CGSize                      _intercellSpacing;
-    CPArray                     _items;
-    id <CPComboBoxDataSource>   _dataSource;
-    CPInteger                   _implementedDelegateComboBoxMethods;
-    CPString                    _selectedStringValue;
-    float                       _itemHeight;
-    int                         _numberOfVisibleItems;
-    _CPPopUpList                _listDelegate;
+    CPArray                 _items;
+    _CPPopUpList            _listDelegate;
+    CPComboBoxDataSource    _dataSource;
+    BOOL                    _usesDataSource;
+    BOOL                    _completes;
+    BOOL                    _canComplete;
+    int                     _numberOfVisibleItems;
+    BOOL                    _forceSelection;
+    BOOL                    _hasVerticalScroller;
+    CPString                _selectedStringValue;
+    BOOL                    _popUpButtonCausedResign;
 }
 
 + (CPString)defaultThemeClass
@@ -87,20 +57,17 @@ var CPComboBoxTextSubview = @"text",
     return "combobox";
 }
 
-+ (CPDictionary)themeAttributes
++ (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
@@ -116,7 +83,7 @@ var CPComboBoxTextSubview = @"text",
 - (void)_initComboBox
 {
     _items = [CPArray array];
-//    _listClass = [_CPPopUpList class];
+    _listClass = [_CPPopUpList class];
     _usesDataSource = NO;
     _completes = NO;
     _canComplete = NO;
@@ -148,9 +115,7 @@ var CPComboBoxTextSubview = @"text",
         return;
 
     _hasVerticalScroller = flag;
-
-    if (_listDelegate)
-        [[_listDelegate scrollView] setHasVerticalScroller:_hasVerticalScroller];
+    [[_listDelegate scrollView] setHasVerticalScroller:flag];
 }
 
 - (CGSize)intercellSpacing
@@ -160,13 +125,7 @@ var CPComboBoxTextSubview = @"text",
 
 - (void)setIntercellSpacing:(CGSize)aSize
 {
-    if (_intercellSpacing && CGSizeEqualToSize(aSize, _intercellSpacing))
-        return;
-
-    _intercellSpacing = aSize;
-
-    if (_listDelegate)
-        [[_listDelegate tableView] setIntercellSpacing:_intercellSpacing];
+    [[_listDelegate tableView] setIntercellSpacing:aSize];
 }
 
 - (BOOL)isButtonBordered
@@ -189,18 +148,10 @@ var CPComboBoxTextSubview = @"text",
 
 - (void)setItemHeight:(float)itemHeight
 {
-    if (itemHeight === _itemHeight)
-        return;
+    [[_listDelegate tableView] setRowHeight:itemHeight];
 
-    _itemHeight = itemHeight;
-
-    if (_listDelegate)
-    {
-        [[_listDelegate tableView] setRowHeight:_itemHeight];
-
-        // FIXME: This shouldn't be necessary, but CPTableView does not tile after setRowHeight
-        [[_listDelegate tableView] reloadData];
-    }
+    // FIXME: This shouldn't be necessary, but CPTableView does not tile after setRowHeight
+    [[_listDelegate tableView] reloadData];
 }
 
 - (int)numberOfVisibleItems
@@ -216,7 +167,7 @@ var CPComboBoxTextSubview = @"text",
 
 #pragma mark Setting a Delegate
 
-- (id <CPComboBoxDelegate>)delegate
+- (id < CPComboBoxDelegate >)delegate
 {
     return [super delegate];
 }
@@ -227,28 +178,48 @@ var CPComboBoxTextSubview = @"text",
     protocol, in actual fact it doesn't. Also note that the same
     delegate may conform to the NSTextFieldDelegate protocol.
 */
-- (void)setDelegate:(id <CPComboBoxDelegate>)aDelegate
+- (void)setDelegate:(id < CPComboBoxDelegate >)aDelegate
 {
     var delegate = [self delegate];
 
     if (aDelegate === delegate)
         return;
 
-    _implementedDelegateComboBoxMethods = 0;
+    var defaultCenter = [CPNotificationCenter defaultCenter];
+
+    if (delegate)
+    {
+        [defaultCenter removeObserver:delegate name:CPComboBoxSelectionIsChangingNotification object:self];
+        [defaultCenter removeObserver:delegate name:CPComboBoxSelectionDidChangeNotification object:self];
+        [defaultCenter removeObserver:delegate name:CPComboBoxWillDismissNotification object:self];
+        [defaultCenter removeObserver:delegate name:CPComboBoxWillPopUpNotification object:self];
+    }
 
     if (aDelegate)
     {
         if ([aDelegate respondsToSelector:@selector(comboBoxSelectionIsChanging:)])
-            _implementedDelegateComboBoxMethods |= CPComboBoxDelegate_comboBoxSelectionIsChanging_;
+            [defaultCenter addObserver:delegate
+                              selector:@selector(comboBoxSelectionIsChanging:)
+                                  name:CPComboBoxSelectionIsChangingNotification
+                                object:self];
 
         if ([aDelegate respondsToSelector:@selector(comboBoxSelectionDidChange:)])
-            _implementedDelegateComboBoxMethods |= CPComboBoxDelegate_comboBoxSelectionDidChange_;
+            [defaultCenter addObserver:delegate
+                              selector:@selector(comboBoxSelectionDidChange:)
+                                  name:CPComboBoxSelectionDidChangeNotification
+                                object:self];
 
         if ([aDelegate respondsToSelector:@selector(comboBoxWillPopUp:)])
-            _implementedDelegateComboBoxMethods |= CPComboBoxDelegate_comboBoxWillPopUp_;
+            [defaultCenter addObserver:delegate
+                              selector:@selector(comboBoxWillPopUp:)
+                                  name:CPComboBoxWillPopUpNotification
+                                object:self];
 
         if ([aDelegate respondsToSelector:@selector(comboBoxWillDismiss:)])
-            _implementedDelegateComboBoxMethods |= CPComboBoxDelegate_comboBoxWillDismiss_;
+            [defaultCenter addObserver:delegate
+                              selector:@selector(comboBoxWillDissmis:)
+                                  name:CPComboBoxWillDismissNotification
+                                object:self];
     }
 
     [super setDelegate:aDelegate];
@@ -256,7 +227,7 @@ var CPComboBoxTextSubview = @"text",
 
 #pragma mark Setting a Data Source
 
-- (id <CPComboBoxDataSource>)dataSource
+- (id < CPComboBoxDataSource >)dataSource
 {
     if (!_usesDataSource)
         [self _dataSourceWarningForMethod:_cmd condition:NO];
@@ -264,12 +235,10 @@ var CPComboBoxTextSubview = @"text",
     return _dataSource;
 }
 
-- (void)setDataSource:(id <CPComboBoxDataSource>)aSource
+- (void)setDataSource:(id < CPComboBoxDataSource >)aSource
 {
     if (!_usesDataSource)
-    {
         [self _dataSourceWarningForMethod:_cmd condition:NO];
-    }
     else if (_dataSource !== aSource)
     {
         if (![aSource respondsToSelector:@selector(numberOfItemsInComboBox:)] ||
@@ -278,9 +247,7 @@ var CPComboBoxTextSubview = @"text",
             CPLog.warn("Illegal %s data source (%s). Must implement numberOfItemsInComboBox: and comboBox:objectValueForItemAtIndex:", [self className], [aSource description]);
         }
         else
-        {
             _dataSource = aSource;
-        }
     }
 }
 
@@ -398,57 +365,49 @@ var CPComboBoxTextSubview = @"text",
     if (_listDelegate === aDelegate)
         return;
 
-    [self _removeObserversForListDelegate:_listDelegate];
+    var defaultCenter = [CPNotificationCenter defaultCenter];
+
+    if (_listDelegate)
+    {
+        [defaultCenter removeObserver:self name:_CPPopUpListWillPopUpNotification object:_listDelegate];
+        [defaultCenter removeObserver:self name:_CPPopUpListWillDismissNotification object:_listDelegate];
+        [defaultCenter removeObserver:self name:_CPPopUpListDidDismissNotification object:_listDelegate];
+        [defaultCenter removeObserver:self name:_CPPopUpListItemWasClickedNotification object:_listDelegate];
+
+        var oldTableView = [_listDelegate tableView];
+
+        if (oldTableView)
+        {
+            [defaultCenter removeObserver:self name:CPTableViewSelectionIsChangingNotification object:oldTableView];
+            [defaultCenter removeObserver:self name:CPTableViewSelectionDidChangeNotification object:oldTableView];
+        }
+    }
 
     _listDelegate = aDelegate;
 
-    // We only add the observers if the CPComboBox is displayed
-    if ([self window])
-        [self _addObserversForListDelegate:_listDelegate]
-
-    // Apply our text style to the list
-    [_listDelegate setFont:[self font]];
-    [_listDelegate setAlignment:[self alignment]];
-
-    [[_listDelegate scrollView] setHasVerticalScroller:_hasVerticalScroller];
-
-    if (_intercellSpacing)
-        [[_listDelegate tableView] setIntercellSpacing:_intercellSpacing];
-
-    if (_itemHeight)
-        [[_listDelegate tableView] setRowHeight:_itemHeight];
-}
-
-- (void)_addObserversForListDelegate:(_CPPopUpList)aDelegate
-{
-    if (!aDelegate)
-        return;
-
-    var defaultCenter = [CPNotificationCenter defaultCenter];
-
     [defaultCenter addObserver:self
                       selector:@selector(comboBoxWillPopUp:)
                           name:_CPPopUpListWillPopUpNotification
-                        object:aDelegate];
+                        object:_listDelegate];
 
     [defaultCenter addObserver:self
                       selector:@selector(comboBoxWillDismiss:)
                           name:_CPPopUpListWillDismissNotification
-                        object:aDelegate];
+                        object:_listDelegate];
 
     [defaultCenter addObserver:self
                       selector:@selector(listDidDismiss:)
                           name:_CPPopUpListDidDismissNotification
-                        object:aDelegate];
+                        object:_listDelegate];
 
     [defaultCenter addObserver:self
                       selector:@selector(itemWasClicked:)
                           name:_CPPopUpListItemWasClickedNotification
-                        object:aDelegate];
+                        object:_listDelegate];
 
-    [[aDelegate scrollView] setHasVerticalScroller:_hasVerticalScroller];
+    [[_listDelegate scrollView] setHasVerticalScroller:_hasVerticalScroller];
 
-    var tableView = [aDelegate tableView];
+    var tableView = [_listDelegate tableView];
 
     [defaultCenter addObserver:self
                       selector:@selector(comboBoxSelectionIsChanging:)
@@ -459,27 +418,10 @@ var CPComboBoxTextSubview = @"text",
                       selector:@selector(comboBoxSelectionDidChange:)
                           name:CPTableViewSelectionDidChangeNotification
                         object:tableView];
-}
 
-- (void)_removeObserversForListDelegate:(_CPPopUpList)aDelegate
-{
-    if (!aDelegate)
-        return;
-
-    var defaultCenter = [CPNotificationCenter defaultCenter];
-
-    [defaultCenter removeObserver:self name:_CPPopUpListWillPopUpNotification object:aDelegate];
-    [defaultCenter removeObserver:self name:_CPPopUpListWillDismissNotification object:aDelegate];
-    [defaultCenter removeObserver:self name:_CPPopUpListDidDismissNotification object:aDelegate];
-    [defaultCenter removeObserver:self name:_CPPopUpListItemWasClickedNotification object:aDelegate];
-
-    var oldTableView = [aDelegate tableView];
-
-    if (oldTableView)
-    {
-        [defaultCenter removeObserver:self name:CPTableViewSelectionIsChangingNotification object:oldTableView];
-        [defaultCenter removeObserver:self name:CPTableViewSelectionDidChangeNotification object:oldTableView];
-    }
+    // Apply our text style to the list
+    [_listDelegate setFont:[self font]];
+    [_listDelegate setAlignment:[self alignment]];
 }
 
 - (int)indexOfItemWithObjectValue:(id)anObject
@@ -524,6 +466,8 @@ var CPComboBoxTextSubview = @"text",
     if (!_listDelegate)
         [self setListDelegate:[[_CPPopUpList alloc] initWithDataSource:self]];
 
+    [self _selectMatchingItem];
+
     // Note the offset here is 1 less than the focus ring width because the outer edge
     // of the focus ring is very transparent and it looks better if the list is closer.
     if (CPComboBoxFocusRingWidth < 0)
@@ -534,7 +478,6 @@ var CPComboBoxTextSubview = @"text",
     }
 
     [_listDelegate popUpRelativeToRect:[self _borderFrame] view:self offset:CPComboBoxFocusRingWidth - 1];
-    [self _selectMatchingItem];
 }
 
 /*! @ignore */
@@ -843,17 +786,7 @@ var CPComboBoxTextSubview = @"text",
         // In FireFox this needs to be done in setTimeout, otherwise there is no caret
         // We have to save the input element now, when we lose focus it will change.
         var element = [self _inputElement];
-
-        [[CPRunLoop mainRunLoop] performBlock:function()
-        {
-            // This will prevent to jump to the focused element
-            var previousScrollingOrigin = [self _scrollToVisibleRectAndReturnPreviousOrigin];
-
-            element.focus();
-
-            [self _restorePreviousScrollingOrigin:previousScrollingOrigin];
-
-        } argument:nil order:0 modes:[CPDefaultRunLoopMode]];
+        window.setTimeout(function() { element.focus(); }, 0);
 #endif
 
         return NO;
@@ -880,17 +813,13 @@ var CPComboBoxTextSubview = @"text",
 - (void)setFont:(CPFont)aFont
 {
     [super setFont:aFont];
-
-    if (_listDelegate)
-        [_listDelegate setFont:aFont];
+    [_listDelegate setFont:aFont];
 }
 
 - (void)setAlignment:(CPTextAlignment)alignment
 {
     [super setAlignment:alignment];
-
-    if (_listDelegate)
-        [_listDelegate setAlignment:alignment];
+    [_listDelegate setAlignment:alignment];
 }
 
 #pragma mark Pop Up Button Layout
@@ -921,7 +850,7 @@ var CPComboBoxTextSubview = @"text",
 {
     if (aName === "popup-button-view")
     {
-        var view = [[_CPComboBoxPopUpButton alloc] initWithFrame:CGRectMakeZero() comboBox:self];
+        var view = [[_CPComboBoxPopUpButton alloc] initWithFrame:_CGRectMakeZero() comboBox:self];
 
         return view;
     }
@@ -961,9 +890,7 @@ var CPComboBoxTextSubview = @"text",
             index = [_dataSource comboBox:self indexOfItemWithStringValue:stringValue]
     }
     else
-    {
         index = [self indexOfItemWithObjectValue:stringValue];
-    }
 
     [_listDelegate selectRow:index];
 
@@ -1015,28 +942,6 @@ var CPComboBoxTextSubview = @"text",
     }
 }
 
-
-#pragma mark -
-#pragma mark Observers method
-
-- (void)_addObservers
-{
-    if (_isObserving)
-        return;
-
-    [super _addObservers];
-    [self _addObserversForListDelegate:_listDelegate];
-}
-
-- (void)_removeObservers
-{
-    if (!_isObserving)
-        return;
-
-    [super _removeObservers];
-    [self _removeObserversForListDelegate:_listDelegate];
-}
-
 @end
 
 @implementation CPComboBox (CPComboBoxDelegate)
@@ -1044,36 +949,24 @@ var CPComboBoxTextSubview = @"text",
 /*! @ignore */
 - (void)comboBoxSelectionIsChanging:(CPNotification)aNotification
 {
-    if (_implementedDelegateComboBoxMethods & CPComboBoxDelegate_comboBoxSelectionIsChanging_)
-        [_delegate comboBoxSelectionIsChanging:[[CPNotification alloc] initWithName:CPComboBoxSelectionIsChangingNotification object:self userInfo:nil]];
-
     [[CPNotificationCenter defaultCenter] postNotificationName:CPComboBoxSelectionIsChangingNotification object:self];
 }
 
 /*! @ignore */
 - (void)comboBoxSelectionDidChange:(CPNotification)aNotification
 {
-    if (_implementedDelegateComboBoxMethods & CPComboBoxDelegate_comboBoxSelectionDidChange_)
-        [_delegate comboBoxSelectionDidChange:[[CPNotification alloc] initWithName:CPComboBoxSelectionDidChangeNotification object:self userInfo:nil]];
-
     [[CPNotificationCenter defaultCenter] postNotificationName:CPComboBoxSelectionDidChangeNotification object:self];
 }
 
 /*! @ignore */
 - (void)comboBoxWillPopUp:(CPNotification)aNotification
 {
-    if (_implementedDelegateComboBoxMethods & CPComboBoxDelegate_comboBoxWillPopUp_)
-        [_delegate comboBoxWillPopUp:[[CPNotification alloc] initWithName:CPComboBoxWillPopUpNotification object:self userInfo:nil]];
-
     [[CPNotificationCenter defaultCenter] postNotificationName:CPComboBoxWillPopUpNotification object:self];
 }
 
 /*! @ignore */
 - (void)comboBoxWillDismiss:(CPNotification)aNotification
 {
-    if (_implementedDelegateComboBoxMethods & CPComboBoxDelegate_comboBoxWillDismiss_)
-        [_delegate comboBoxWillDismiss:[[CPNotification alloc] initWithName:CPComboBoxWillDismissNotification object:self userInfo:nil]];
-
     [[CPNotificationCenter defaultCenter] postNotificationName:CPComboBoxWillDismissNotification object:self];
 }
 
@@ -1217,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],
@@ -1259,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,71 +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;
-// In onpaste, oncopy and oncut events, the event has an event.clipboardData from which the current pasteboard contents can be read with event.clipboardData.getData.
-CPJavaScriptClipboardEventsFeature      = 11;
-// window.clipboardData exists and can be read and written to at any time using window.clipboardData.getData/setData.
-CPJavaScriptClipboardAccessFeature      = 12;
-CPJavaScriptCanvasDrawFeature           = 13;
-CPJavaScriptCanvasTransformFeature      = 14;
+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;
-
-CPAltEnterTextAreaFeature               = 32;
-
-
-
-/*
-    When an absolutely positioned div (CPView) with an absolutely positioned canvas in it (CPView with drawRect:) moves things on top of the canvas (subviews) don't redraw correctly. E.g. if you have a bunch of text fields in a CPBox in a sheet which animates in, some of the text fields might not be visible because the CPBox has a canvas at the bottom and the box moved form offscreen to onscreen. This bug is probably very related: https://bugs.webkit.org/show_bug.cgi?id=67203
-*/
+// When an absolutely positioned div (CPView) with an absolutely positioned canvas in it (CPView with drawRect:) moves things on top of the canvas
+// (subviews) don't redraw correctly. E.g. if you have a bunch of text fields in a CPBox in a sheet which animates in, some of the text fields might
+// not be visible because the CPBox has a canvas at the bottom and the box moved form offscreen to onscreen.
+// This bug is probably very related: https://bugs.webkit.org/show_bug.cgi?id=67203
 CPCanvasParentDrawErrorsOnMovementBug   = 1 << 0;
 
-// The paste event is only sent if an input or textarea has focus.
-CPJavaScriptPasteRequiresEditableTarget   = 1 << 1;
-// Redirecting the focus of the browser on keydown to an input for Cmd-V or Ctrl-V makes the paste fail.
-CPJavaScriptPasteCantRefocus            = 1 << 2;
-
-
 var USER_AGENT                          = "",
     PLATFORM_ENGINE                     = CPUnknownBrowserEngine,
-    PLATFORM_FEATURES                   = [],
+    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[CPAltEnterTextAreaFeature] = YES;
+
+PLATFORM_FEATURES |= CPInputTypeCanBeChangedFeature;
+PLATFORM_FEATURES |= CPInputSetFontOutsideOfDOM;
 
 if (typeof window !== "undefined" && typeof window.navigator !== "undefined")
     USER_AGENT = window.navigator.userAgent;
@@ -112,7 +99,7 @@ if (typeof window !== "undefined" && window.opera)
 {
     PLATFORM_ENGINE = CPOperaBrowserEngine;
 
-    PLATFORM_FEATURES[CPJavaScriptCanvasDrawFeature] = YES;
+    PLATFORM_FEATURES |= CPJavaScriptCanvasDrawFeature;
 }
 
 // Internet Explorer
@@ -121,19 +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;
-
-    // IE allows free clipboard access.
-    PLATFORM_FEATURES[CPJavaScriptClipboardAccessFeature] = YES;
+    PLATFORM_FEATURES &= ~CPInputSetFontOutsideOfDOM;
 }
 
 // WebKit
@@ -142,12 +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;
 
-    PLATFORM_FEATURES[CPJavaScriptClipboardEventsFeature] = YES;
-    PLATFORM_FEATURES[CPJavaScriptClipboardAccessFeature] = NO;
-    PLATFORM_FEATURES[CPJavaScriptShadowFeature] = YES;
+    if (USER_AGENT.indexOf("Chrome") === -1)
+        PLATFORM_FEATURES |= CPHTMLDragAndDropFeature;
+
+    PLATFORM_FEATURES |= CPJavaScriptClipboardEventsFeature;
+    PLATFORM_FEATURES |= CPJavaScriptClipboardAccessFeature;
+    PLATFORM_FEATURES |= CPJavaScriptShadowFeature;
 
     var versionStart = USER_AGENT.indexOf("AppleWebKit/") + "AppleWebKit/".length,
         versionEnd = USER_AGENT.indexOf(" ", versionStart),
@@ -157,29 +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[CPHTMLDragAndDropFeature] = YES;
-        // https://bugs.webkit.org/show_bug.cgi?id=75891
-        PLATFORM_BUGS |= CPJavaScriptPasteRequiresEditableTarget;
-        // https://bugs.webkit.org/show_bug.cgi?id=39689
-        PLATFORM_BUGS |= CPJavaScriptPasteCantRefocus;
-    }
+        PLATFORM_FEATURES |= CPSOPDisabledFromFileURLs;
 
     // Assume this bug was introduced around Safari 5.1/Chrome 16. This could probably be tighter.
     if (majorVersion > 533)
@@ -197,86 +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[CPAltEnterTextAreaFeature] = NO;
-    // This was supposed to be added in Firefox 22, but when testing with the latest beta as of 2013-06-14
-    // it does not seem to work. It seems to exhibit the CPJavaScriptPasteRequiresEditableTarget problem,
-    // and in addition doesn't seem to work with our native copy code either.
-    /*if (version >= 22.0)
-    {
-        PLATFORM_FEATURES[CPJavaScriptClipboardEventsFeature] = YES;
-        // TODO File a bug at https://bugzilla.mozilla.org/. In other browsers, one can return "false" from the
-        // beforepaste event to indicate a paste should be enabled even that the DOMEvent.target is not editable.
-        PLATFORM_BUGS |= CPJavaScriptPasteRequiresEditableTarget;
-    }*/
+    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)
@@ -355,34 +308,13 @@ function CPBrowserStyleProperty(aProperty)
 
                 r = candidates[PLATFORM_STYLE_JS_PROPERTIES['transition']] || nil;
                 break;
-
-            case 'transformorigin':
-
-                var candidates = {
-                        'WebkitTransform' : 'WebkitTransformOrigin',
-                        'MozTransform'    : 'MozTransformOrigin',
-                        'OTransform'      : 'OTransformOrigin',
-                        'msTransform'     : 'MSTransformOrigin',
-                        'transform'       : 'transformOrigin'
-                    };
-
-                r = candidates[PLATFORM_STYLE_JS_PROPERTIES['transform']] || nil;
-                break;
-
             default:
                 var prefixes = ["Webkit", "Moz", "O", "ms"],
-                    strippedProperty = aProperty.split('-').join(' '),
-                    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;
@@ -420,30 +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();
 }
-
-function CPBrowserBackingStorePixelRatio(context)
-{
-    return  context.webkitBackingStorePixelRatio ||
-            context.mozBackingStorePixelRatio ||
-            context.msBackingStorePixelRatio ||
-            context.oBackingStorePixelRatio ||
-            context.backingStorePixelRatio || 1;
-}

AppKit/CPControl.j

@@ -20,35 +20,24 @@
  * 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"
-@import "CPTrackingArea.j"
 
-@global CPApp
+CPLeftTextAlignment      = 0;
+CPRightTextAlignment     = 1;
+CPCenterTextAlignment    = 2;
+CPJustifiedTextAlignment = 3;
+CPNaturalTextAlignment   = 4;
 
-@protocol CPControlTextEditingDelegate <CPObject>
-
-@optional
-- (void)controlTextDidBeginEditing:(CPNotification)aNotification;
-- (void)controlTextDidChange:(CPNotification)aNotification;
-- (void)controlTextDidEndEditing:(CPNotification)aNotification;
-- (void)controlTextDidFocus:(CPNotification)aNotification;
-- (void)controlTextDidBlur:(CPNotification)aNotification;
-- (BOOL)control:(CPControl)control didFailToFormatString:(CPString)string errorDescription:(CPString)error;
-
-@end
-
-@typedef CPControlSize
 CPRegularControlSize = 0;
 CPSmallControlSize   = 1;
 CPMiniControlSize    = 2;
 
-@typedef CPLineBreakMode
 CPLineBreakByWordWrapping     = 0;
 CPLineBreakByCharWrapping     = 1;
 CPLineBreakByClipping         = 2;
@@ -56,13 +45,11 @@ CPLineBreakByTruncatingHead   = 3;
 CPLineBreakByTruncatingTail   = 4;
 CPLineBreakByTruncatingMiddle = 5;
 
-@typedef CPVerticalTextAlignment
 CPTopVerticalTextAlignment    = 1;
 CPCenterVerticalTextAlignment = 2;
 CPBottomVerticalTextAlignment = 3;
 
 // Deprecated for use with images, use the CPImageScale constants
-@typedef CPImageScaling
 CPScaleProportionally = 0;
 CPScaleToFit          = 1;
 CPScaleNone           = 2;
@@ -72,7 +59,6 @@ CPImageScaleAxesIndependently      = 1;
 CPImageScaleNone                   = 2;
 CPImageScaleProportionallyUpOrDown = 3;
 
-@typedef CPCellImagePosition
 CPNoImage       = 0;
 CPImageOnly     = 1;
 CPImageLeft     = 2;
@@ -118,28 +104,32 @@ var CPControlBlackColor = [CPColor blackColor];
     BOOL                _trackingWasWithinFrame;
     unsigned            _trackingMouseDownFlags;
     CGPoint             _previousTrackingLocation;
-
-    CPControlSize       _controlSize;
-
-    CPWritingDirection  _baseWritingDirection   @accessors(property=baseWritingDirection);
 }
 
 + (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),
-            @"nib2cib-adjustment-frame": CGRectMakeZero()
-        };
+    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
@@ -158,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];
 }
 
 /*!
@@ -194,94 +182,13 @@ var CPControlBlackColor = [CPColor blackColor];
 
     if (self)
     {
-        _sendActionOn           = CPLeftMouseUpMask;
+        _sendActionOn = CPLeftMouseUpMask;
         _trackingMouseDownFlags = 0;
     }
 
     return self;
 }
 
-#pragma mark -
-#pragma mark Control Size
-
-/*!
-    Returns the control's control size
-*/
-- (CPControlSize)controlSize
-{
-    return _controlSize;
-}
-
-/*!
-    Sets the control's size.
-    @param aControlSize the control's size
-*/
-- (void)setControlSize:(CPControlSize)aControlSize
-{
-    if (_controlSize === aControlSize)
-        return;
-
-    [self unsetThemeState:[self _controlSizeThemeState]];
-    _controlSize = aControlSize;
-    [self setThemeState:[self _controlSizeThemeState]];
-
-    [self setNeedsLayout];
-    [self setNeedsDisplay:YES];
-}
-
-/*!
-    Gets the current theme state according to the current controlSize.
-    @return a CPThemeState
-*/
-- (ThemeState)_controlSizeThemeState
-{
-    switch (_controlSize)
-    {
-        case CPSmallControlSize:
-            return CPThemeStateControlSizeSmall;
-
-        case CPMiniControlSize:
-            return CPThemeStateControlSizeMini;
-
-        case CPRegularControlSize:
-        default:
-            return CPThemeStateControlSizeRegular;
-    }
-}
-
-/*!
-    @ignore
-    Change frame size according to the theme control size theme constraints
-    Basically for height to min-size.
-*/
-- (void)_sizeToControlSize
-{
-    var frameSize = [self frameSize],
-        minSize = [self currentValueForThemeAttribute:@"min-size"],
-        maxSize = [self currentValueForThemeAttribute:@"max-size"];
-
-    if (minSize.width > 0)
-    {
-        frameSize.width = MAX(minSize.width, frameSize.width);
-
-        if (maxSize.width > 0)
-            frameSize.width = MIN(maxSize.width, frameSize.width);
-    }
-
-    if (minSize.height > 0)
-    {
-        frameSize.height = MAX(minSize.height, frameSize.height);
-
-        if (maxSize.height > 0)
-            frameSize.height = MIN(maxSize.height, frameSize.height);
-    }
-
-    [self setFrameSize:frameSize];
-}
-
-
-#pragma mark -
-
 /*!
     Sets the receiver's target action.
 
@@ -328,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];
 }
 
@@ -420,11 +324,11 @@ var CPControlBlackColor = [CPColor blackColor];
     _previousTrackingLocation = currentLocation;
 }
 
-- (void)setState:(CPInteger)state
+- (void)setState:(int)state
 {
 }
 
-- (CPInteger)nextState
+- (int)nextState
 {
     return 0;
 }
@@ -493,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])
@@ -628,7 +524,7 @@ var CPControlBlackColor = [CPColor blackColor];
             return formattedValue;
     }
 
-    return (_value === undefined || _value === nil) ? @"" : String(_value);
+    return (_value === undefined || _value === nil) ? "" : String(_value);
 }
 
 /*!
@@ -649,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
         }
     }
@@ -705,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
@@ -714,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
@@ -725,49 +621,7 @@ var CPControlBlackColor = [CPColor blackColor];
 
     [self _reverseSetBinding];
 
-    [[CPNotificationCenter defaultCenter] postNotificationName:CPControlTextDidEndEditingNotification object:self userInfo:[note userInfo]];
-}
-
-/*!
-    @ignore
-    Return the currentTextMovement needed by the delegate textDidEndEditing
-    This is going to check the currentEvent of the CPApp
-*/
-- (unsigned)_currentTextMovement
-{
-    var currentEvent = [CPApp currentEvent],
-        keyCode = [currentEvent keyCode],
-        modifierFlags = [currentEvent modifierFlags];
-
-    switch (keyCode)
-    {
-        case CPEscapeKeyCode:
-            return CPCancelTextMovement;
-
-        case CPLeftArrowKeyCode:
-            return CPLeftTextMovement;
-
-        case CPRightArrowKeyCode:
-            return CPRightTextMovement;
-
-        case CPUpArrowKeyCode:
-            return CPUpTextMovement;
-
-        case CPDownArrowKeyCode:
-            return CPDownTextMovement;
-
-        case CPReturnKeyCode:
-            return CPReturnTextMovement;
-
-        case CPTabKeyCode:
-            if (modifierFlags & CPShiftKeyMask)
-                return CPBacktabTextMovement;
-
-            return CPTabTextMovement;
-
-        default:
-            return CPOtherTextMovement;
-    }
+    [[CPNotificationCenter defaultCenter] postNotificationName:CPControlTextDidEndEditingNotification object:self userInfo:[CPDictionary dictionaryWithObject:[note object] forKey:"CPFieldEditor"]];
 }
 
 /*!
@@ -953,7 +807,7 @@ var CPControlBlackColor = [CPColor blackColor];
 /*!
     Returns the image scaling of the control.
 */
-- (CPUInteger)imageScaling
+- (CPImageScaling)imageScaling
 {
     return [self valueForThemeAttribute:@"image-scaling"];
 }
@@ -1011,74 +865,16 @@ var CPControlBlackColor = [CPColor blackColor];
     return [self hasThemeState:CPThemeStateHighlighted];
 }
 
-
-#pragma mark -
-#pragma mark Base writing direction
-
-/*!
-    Sets the initial writing direction of the receiver
-    @param writingDirection - It could be CPWritingDirectionNatural, CPWritingDirectionLeftToRight, CPWritingDirectionRightToLeft
-*/
-- (void)setBaseWritingDirection:(CPWritingDirection)writingDirection
-{
-    if (writingDirection == _baseWritingDirection)
-        return;
-
-    [self willChangeValueForKey:@"baseWritingDirection"];
-    _baseWritingDirection = writingDirection;
-    [self didChangeValueForKey:@"baseWritingDirection"];
-
-#if PLATFORM(DOM)
-
-    var style;
-
-    switch (_baseWritingDirection)
-    {
-        case CPWritingDirectionNatural:
-            style = "initial";
-            break;
-
-        case CPWritingDirectionLeftToRight:
-            style = "ltr";
-            break;
-
-        case CPWritingDirectionRightToLeft:
-            style = "rtl";
-            break;
-
-        default:
-            style = "initial";
-    }
-
-    _DOMElement.style.direction = style;
-#endif
-}
-
 @end
 
-@implementation CPControl (CPTrackingArea)
-
-- (void)updateTrackingAreas
-{
-    [self removeAllTrackingAreas];
-    [self addTrackingArea:[[CPTrackingArea alloc] initWithRect:CGRectMakeZero()
-                                                       options:CPTrackingMouseEnteredAndExited | CPTrackingActiveInKeyWindow | CPTrackingInVisibleRect
-                                                         owner:self
-                                                      userInfo:nil]];
-}
-
-@end
-
-var CPControlActionKey                  = @"CPControlActionKey",
-    CPControlControlSizeKey             = @"CPControlControlSizeKey",
+var CPControlValueKey                   = @"CPControlValueKey",
     CPControlControlStateKey            = @"CPControlControlStateKey",
-    CPControlFormatterKey               = @"CPControlFormatterKey",
     CPControlIsEnabledKey               = @"CPControlIsEnabledKey",
-    CPControlSendActionOnKey            = @"CPControlSendActionOnKey",
-    CPControlSendsActionOnEndEditingKey = @"CPControlSendsActionOnEndEditingKey",
     CPControlTargetKey                  = @"CPControlTargetKey",
-    CPControlValueKey                   = @"CPControlValueKey",
-    CPControlBaseWrittingDirectionKey   = @"CPControlBaseWrittingDirectionKey";
+    CPControlActionKey                  = @"CPControlActionKey",
+    CPControlSendActionOnKey            = @"CPControlSendActionOnKey",
+    CPControlFormatterKey               = @"CPControlFormatterKey",
+    CPControlSendsActionOnEndEditingKey = @"CPControlSendsActionOnEndEditingKey",
 
     __Deprecated__CPImageViewImageKey   = @"CPImageViewImageKey";
 
@@ -1105,10 +901,6 @@ var CPControlActionKey                  = @"CPControlActionKey",
         [self setSendsActionOnEndEditing:[aCoder decodeBoolForKey:CPControlSendsActionOnEndEditingKey]];
 
         [self setFormatter:[aCoder decodeObjectForKey:CPControlFormatterKey]];
-
-        [self setControlSize:[aCoder decodeIntForKey:CPControlControlSizeKey]];
-
-        [self setBaseWritingDirection:[aCoder decodeIntForKey:CPControlBaseWrittingDirectionKey]];
     }
 
     return self;
@@ -1141,11 +933,6 @@ var CPControlActionKey                  = @"CPControlActionKey",
 
     if (_formatter !== nil)
         [aCoder encodeObject:_formatter forKey:CPControlFormatterKey];
-
-    [aCoder encodeInt:_controlSize forKey:CPControlControlSizeKey];
-
-    [aCoder encodeInt:_baseWritingDirection forKey:CPControlBaseWrittingDirectionKey];
-
 }
 
 @end

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

@@ -22,14 +22,10 @@ Cursor support by browser:
 */
 
 @import <Foundation/CPObject.j>
-@import "CPImage.j"
-
-@global CPApp
 
 var currentCursor = nil,
     cursorStack = [],
-    cursors = {},
-    ieCursorMap = {};
+    cursors = {};
 
 @implementation CPCursor : CPObject
 {
@@ -40,20 +36,6 @@ var currentCursor = nil,
     BOOL     _isSetOnMouseExited @accessors(readwrite, getter=isSetOnMouseExited, setter=setOnMouseExited:);
 }
 
-+ (void)initialize
-{
-    if (self !== CPCursor)
-        return;
-
-    // IE < 9 does not support some CSS cursors, we map them to supported ones
-    ieCursorMap = {
-        "ew-resize":   "e-resize",
-        "ns-resize":   "n-resize",
-        "nesw-resize": "ne-resize",
-        "nwse-resize": "nw-resize"
-    };
-}
-
 - (id)initWithCSSString:(CPString)aString
 {
     if (self = [super init])
@@ -62,30 +44,23 @@ var currentCursor = nil,
     return self;
 }
 
-/*!
-    Init a cursor with the given image and hotspot.
-    hotspot is supported in CSS3 (but not IE).
-*/
-- (id)initWithImage:(CPImage)image hotSpot:(CGPoint)hotSpot
+// hotspot is supported in CSS3 (but not IE).
+- (id)initWithImage:(CPImage)image hotSpot:(CPPoint)hotSpot
 {
     _hotSpot = hotSpot;
     _image = image;
     return [self initWithCSSString:"url(" + [_image filename] + ")" + hotSpot.x + " " + hotSpot.y + ", auto"];
 }
 
-/*!
-    Init a cursor with the given image and hotspot. This is provided
-    for compliance with Cocoa. Note that foregroundColor and backgroundColor are ignored
-    (as they are in Cocoa). See http://developer.apple.com/library/mac/#documentation/Cocoa/Reference/ApplicationKit/Classes/NSCursor_Class/Reference/Reference.html
-*/
-- (id)initWithImage:(CPImage)image foregroundColorHint:(CPColor)foregroundColor backgroundColorHint:(CPColor)backgroundColor hotSpot:(CGPoint)aHotSpot
+// foregroundColor and backgroundColor are ignored in Cocoa as well.  See http://developer.apple.com/library/mac/#documentation/Cocoa/Reference/ApplicationKit/Classes/NSCursor_Class/Reference/Reference.html
+- (id)initWithImage:(CPImage)image foregroundColorHint:(CPColor)foregroundColor backgroundColorHint:(CPColor)backgroundColor hotSpot:(CPPoint)aHotSpot
 {
-    return [self initWithImage:image hotSpot:aHotSpot];
+    return [self initWithImage:image hotSpot:hotSpot];
 }
 
 + (void)hide
 {
-    [self _setCursorCSS:@"none"]; // Not supported in IE < 9
+    [self _setCursorCSS:"none"]; // Not supported in IE
 }
 
 + (void)unhide
@@ -117,15 +92,11 @@ var currentCursor = nil,
 
 - (void)push
 {
-    cursorStack.push(self);
-    currentCursor = self;
+    currentCursor = cursorStack.push(self);
 }
 
 - (void)set
 {
-    if (currentCursor === self)
-        return;
-    
     currentCursor = self;
 
 #if PLATFORM(DOM)
@@ -150,7 +121,6 @@ var currentCursor = nil,
 {
 #if PLATFORM(DOM)
     var platformWindows = [[CPPlatformWindow visiblePlatformWindows] allObjects];
-
     for (var i = 0, count = [platformWindows count]; i < count; i++)
         platformWindows[i]._DOMBodyElement.style.cursor = aString;
 #endif
@@ -160,40 +130,22 @@ var currentCursor = nil,
 + (CPCursor)_systemCursorWithName:(CPString)cursorName cssString:(CPString)aString hasImage:(BOOL)doesHaveImage
 {
     var cursor = cursors[cursorName];
-
-    if (typeof cursor === "undefined")
+    if (typeof cursor === 'undefined')
     {
         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 = @"url(" + [[CPBundle bundleForClass:self] resourcePath] + @"/CPCursor/" + cursorName + ".cur), " + aString;
         else
-        {
-            // IE <= 8 does not support some cursors, map them to supported cursors
-            var ieLessThan9 = CPBrowserIsEngine(CPInternetExplorerBrowserEngine) && !CPFeatureIsCompatible(CPHTMLCanvasFeature);
-
-            if (ieLessThan9)
-                cssString = ieCursorMap[aString] || aString;
-            else
-                cssString = aString;
-        }
-
+            cssString = aString
         cursor = [[CPCursor alloc] initWithCSSString:cssString];
         cursors[cursorName] = cursor;
     }
-
     return cursor;
 }
 
 + (CPCursor)arrowCursor
 {
-    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"default" hasImage:NO];
+    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:"default" hasImage:NO];
 }
 
 + (CPCursor)crosshairCursor
@@ -211,36 +163,6 @@ var currentCursor = nil,
     return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"pointer" hasImage:NO];
 }
 
-+ (CPCursor)resizeNorthwestCursor
-{
-    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"nw-resize" hasImage:NO];
-}
-
-+ (CPCursor)resizeNorthwestSoutheastCursor
-{
-    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"nwse-resize" hasImage:NO];
-}
-
-+ (CPCursor)resizeNortheastCursor
-{
-    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"ne-resize" hasImage:NO];
-}
-
-+ (CPCursor)resizeNortheastSouthwestCursor
-{
-    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"nesw-resize" hasImage:NO];
-}
-
-+ (CPCursor)resizeSouthwestCursor
-{
-    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"sw-resize" hasImage:NO];
-}
-
-+ (CPCursor)resizeSoutheastCursor
-{
-    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"se-resize" hasImage:NO];
-}
-
 + (CPCursor)resizeDownCursor
 {
     return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"s-resize" hasImage:NO];
@@ -266,21 +188,11 @@ var currentCursor = nil,
     return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"col-resize" hasImage:NO];
 }
 
-+ (CPCursor)resizeEastWestCursor
-{
-    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"ew-resize" hasImage:NO];
-}
-
 + (CPCursor)resizeUpDownCursor
 {
     return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"row-resize" hasImage:NO];
 }
 
-+ (CPCursor)resizeNorthSouthCursor
-{
-    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"ns-resize" hasImage:NO];
-}
-
 + (CPCursor)operationNotAllowedCursor
 {
     return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"not-allowed" hasImage:NO];

AppKit/CPDatePicker/CPDatePicker.j

@@ -1,738 +0,0 @@
-/* CPDatePicker.j
-* AppKit
-*
-* Created by Alexandre Wilhelm
-* Copyright 2012 <alexandre.wilhelmfr@gmail.com>
-*
-* 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 "CPFont.j"
-@import "CPTextField.j"
-@import "_CPDatePickerTextField.j"
-@import "_CPDatePickerCalendar.j"
-
-@import <Foundation/CPArray.j>
-@import <Foundation/CPObject.j>
-@import <Foundation/CPDate.j>
-@import <Foundation/CPLocale.j>
-@import <Foundation/CPTimeZone.j>
-
-@class CPStepper
-@class CPApp
-
-@global CPLocaleLanguageCode
-@global CPDateFormatterShortStyle
-
-var CPDatePicker_validateProposedDateValue_timeInterval = 1 << 1;
-
-CPSingleDateMode = 0;
-CPRangeDateMode = 1;
-
-CPTextFieldAndStepperDatePickerStyle    = 0;
-CPClockAndCalendarDatePickerStyle       = 1;
-CPTextFieldDatePickerStyle              = 2;
-
-CPHourMinuteDatePickerElementFlag       = 0x000c;
-CPHourMinuteSecondDatePickerElementFlag = 0x000e;
-CPTimeZoneDatePickerElementFlag         = 0x0010;
-CPYearMonthDatePickerElementFlag        = 0x00c0;
-CPYearMonthDayDatePickerElementFlag     = 0x00e0;
-CPEraDatePickerElementFlag              = 0x0100;
-
-/*!
-    @ingroup appkit
-    This control displays a datepicker in a Cappuccino application
-*/
-@implementation CPDatePicker : CPControl
-{
-    BOOL            _isBordered         @accessors(getter=isBordered, setter=setBordered:);
-    BOOL            _isBezeled          @accessors(getter=isBezeled, setter=setBezeled:);
-    BOOL            _drawsBackground    @accessors(property=drawsBackground);
-    CPDate          _dateValue          @accessors(property=dateValue);
-    CPDate          _minDate            @accessors(property=minDate);
-    CPDate          _maxDate            @accessors(property=maxDate);
-    CPFont          _textFont           @accessors(property=textFont);
-    CPLocale        _locale             @accessors(property=locale);
-    //CPCalendar  _calendar           @accessors(property=calendar);
-    CPTimeZone      _timeZone           @accessors(property=timeZone);
-    id              _delegate           @accessors(property=delegate);
-    CPInteger       _datePickerElements @accessors(property=datePickerElements);
-    CPInteger       _datePickerMode     @accessors(property=datePickerMode);
-    CPInteger       _datePickerStyle    @accessors(property=datePickerStyle);
-    CPInteger       _timeInterval       @accessors(property=timeInterval);
-
-    BOOL                    _invokedByUserEvent;
-    _CPDatePickerTextField  _datePickerTextfield;
-    _CPDatePickerCalendar   _datePickerCalendar;
-    unsigned                _implementedCDatePickerDelegateMethods;
-}
-
-
-#pragma mark -
-#pragma mark Theme methods
-
-+ (CPString)defaultThemeClass
-{
-    return @"datePicker";
-}
-
-+ (CPDictionary)themeAttributes
-{
-    return @{
-            @"bezel-color": [CPColor clearColor],
-            @"border-width" : 1.0,
-            @"border-color": [CPColor clearColor],
-            @"content-inset": CGInsetMakeZero(),
-            @"bezel-inset": CGInsetMakeZero(),
-            @"datepicker-textfield-bezel-color": [CPColor clearColor],
-            @"min-size-datepicker-textfield": CGSizeMakeZero(),
-            @"content-inset-datepicker-textfield": CGInsetMakeZero(),
-            @"content-inset-datepicker-textfield-separator": CGInsetMakeZero(),
-            @"separator-content-inset": CGInsetMakeZero(),
-            @"date-hour-margin": 5.0,
-            @"stepper-margin": 5.0,
-            @"bezel-color-calendar": [CPColor clearColor],
-            @"title-text-color": [CPColor blackColor],
-            @"title-text-shadow-color": [CPColor clearColor],
-            @"title-text-shadow-offset": CGSizeMakeZero(),
-            @"title-font": [CPNull null],
-            @"weekday-text-color": [CPColor blackColor],
-            @"weekday-text-shadow-color": [CPColor clearColor],
-            @"weekday-text-shadow-offset": CGSizeMakeZero(),
-            @"weekday-font": [CPNull null],
-            @"arrow-image-left": [CPNull null],
-            @"arrow-image-right": [CPNull null],
-            @"arrow-image-left-highlighted": [CPNull null],
-            @"arrow-image-right-highlighted": [CPNull null],
-            @"arrow-inset": CGInsetMakeZero(),
-            @"circle-image": [CPNull null],
-            @"circle-image-highlighted": [CPNull null],
-            @"tile-text-color": [CPColor blackColor],
-            @"tile-text-shadow-color": [CPColor clearColor],
-            @"tile-text-shadow-offset": CGSizeMakeZero(),
-            @"tile-font": [CPNull null],
-            @"size-tile": CGSizeMakeZero(),
-            @"size-calendar": CGSizeMakeZero(),
-            @"size-header": CGSizeMakeZero(),
-            @"min-size-calendar": CGSizeMakeZero(),
-            @"max-size-calendar": CGSizeMakeZero(),
-            @"bezel-color-clock": [CPColor clearColor],
-            @"clock-text-color": [CPColor blackColor],
-            @"clock-text-shadow-color": [CPColor clearColor],
-            @"clock-text-shadow-offset": CGSizeMakeZero(),
-            @"clock-font": [CPNull null],
-            @"second-hand-image": [CPNull null],
-            @"hour-hand-image": [CPNull null],
-            @"middle-hand-image": [CPNull null],
-            @"minute-hand-image": [CPNull null],
-            @"size-clock": CGSizeMakeZero(),
-            @"second-hand-size": CGSizeMakeZero(),
-            @"hour-hand-size": CGSizeMakeZero(),
-            @"middle-hand-size": CGSizeMakeZero(),
-            @"minute-hand-size": CGSizeMakeZero(),
-    };
-}
-
-
-#pragma mark -
-#pragma mark Binding methods
-
-+ (Class)_binderClassForBinding:(CPString)theBinding
-{
-    if (theBinding == CPValueBinding || theBinding == CPMinValueBinding || theBinding == CPMaxValueBinding)
-        return [_CPDatePickerValueBinder class];
-
-    return [super _binderClassForBinding:theBinding];
-}
-
-- (CPString)_replacementKeyPathForBinding:(CPString)aBinding
-{
-    if (aBinding == CPValueBinding)
-        return @"dateValue";
-
-    if (aBinding == CPMinValueBinding)
-        return @"minDate";
-
-    if (aBinding == CPMaxValueBinding)
-        return @"maxDate";
-
-    return [super _replacementKeyPathForBinding:aBinding];
-}
-
-
-#pragma mark -
-#pragma mark Init methods
-
-- (id)initWithFrame:(CGRect)aFrame
-{
-    if (self = [super initWithFrame:aFrame])
-    {
-        _drawsBackground = YES;
-        _datePickerStyle = CPTextFieldAndStepperDatePickerStyle;
-        _datePickerMode = CPSingleDateMode;
-        _datePickerElements = CPYearMonthDayDatePickerElementFlag | CPHourMinuteSecondDatePickerElementFlag;
-        _timeInterval = 0;
-        _implementedCDatePickerDelegateMethods = 0;
-
-        [self setObjectValue:[CPDate date]];
-        _minDate = [CPDate distantPast];
-        _maxDate = [CPDate distantFuture];
-
-        [self setBezeled:YES];
-        [self setBordered:YES];
-
-        [self _init];
-    }
-
-    return self
-}
-
-- (void)_init
-{
-    if (!_locale)
-        _locale = [CPLocale currentLocale];
-
-    _datePickerTextfield = [[_CPDatePickerTextField alloc] initWithFrame:[self bounds] withDatePicker:self];
-    [_datePickerTextfield setDateValue:_dateValue];
-
-    _datePickerCalendar = [[_CPDatePickerCalendar alloc] initWithFrame:[self bounds] withDatePicker:self];
-    [_datePickerCalendar setDateValue:_dateValue];
-
-    // We might have been unarchived in a disabled state.
-    [_datePickerTextfield setEnabled:[self isEnabled]];
-
-    [self setNeedsDisplay:YES];
-    [self setNeedsLayout];
-}
-
-
-#pragma mark -
-#pragma mark Control Size
-
-- (void)setControlSize:(CPControlSize)aControlSize
-{
-    [super setControlSize:aControlSize];
-
-    if ([self datePickerStyle] == CPTextFieldAndStepperDatePickerStyle || [self datePickerStyle] == CPTextFieldDatePickerStyle)
-        [self _sizeToControlSize];
-}
-
-
-#pragma mark -
-#pragma mark Delegate methods
-
-/*! Set the delegate of the datePicker
-    @param aDelegate delegate of the datePicker
-*/
-- (void)setDelegate:(id)aDelegate
-{
-    _delegate = aDelegate;
-    _implementedCDatePickerDelegateMethods = 0;
-
-    // Look if the delegate implements or not the delegate methods
-    if ([_delegate respondsToSelector:@selector(datePicker:validateProposedDateValue:timeInterval:)])
-        _implementedCDatePickerDelegateMethods |= CPDatePicker_validateProposedDateValue_timeInterval;
-}
-
-
-#pragma mark -
-#pragma mark Layout method
-
-/*! Layout the subviews
-*/
-- (void)layoutSubviews
-{
-    [super layoutSubviews];
-
-    if (_datePickerStyle == CPTextFieldAndStepperDatePickerStyle || _datePickerStyle == CPTextFieldDatePickerStyle)
-    {
-        if (![_datePickerTextfield superview])
-            [self addSubview:_datePickerTextfield];
-
-        if ([_datePickerCalendar superview])
-            [_datePickerCalendar removeFromSuperview];
-
-        [_datePickerTextfield setControlSize:[self controlSize]];
-        [_datePickerTextfield setNeedsLayout];
-        [_datePickerTextfield setNeedsDisplay:YES];
-    }
-    else
-    {
-        if (![_datePickerCalendar superview])
-            [self addSubview:_datePickerCalendar];
-
-        if ([_datePickerTextfield superview])
-            [_datePickerTextfield removeFromSuperview];
-
-        [_datePickerCalendar setNeedsLayout];
-        [_datePickerCalendar setNeedsDisplay:YES];
-    }
-}
-
-#pragma mark -
-#pragma mark Setter
-
-/*! Return the objectValue of the datePicker. The objectValue should take the timeZoneEffect
-*/
-- (id)objectValue
-{
-    // TODO : add timeZone effect. How to do it because js ???
-    return _dateValue
-}
-
-/*! Set the objectValue of the datePicker. It has to be a CPDate
-    @param aDateValue the dateValue
-*/
-- (void)setObjectValue:(CPDate)aValue
-{
-    if (![aValue isKindOfClass:[CPDate class]])
-        return;
-
-    [self setDateValue:aValue];
-}
-
-/* Set the dateValue of the datePicker
-    @param aDateValue the dateValue
-*/
-- (void)setDateValue:(CPDate)aDateValue
-{
-    if (aDateValue == nil)
-        return;
-
-    _invokedByUserEvent = NO;
-    [self _setDateValue:aDateValue timeInterval:_timeInterval];
-}
-
-/*! Set the dateValue and the timeInterval. This method checks the min and max date of the datePicker also. It will call the delegate if possible.
-    @param aDateValue the dateValue
-    @param aTimeInterval the timeInterval
-*/
-- (void)_setDateValue:(CPDate)aDateValue timeInterval:(CPTimeInterval)aTimeInterval
-{
-    // Make sure to have a valid date and avoid NaN values
-    if (!isFinite(aDateValue))
-    {
-        [CPException raise:CPInvalidArgumentException
-                    reason:@"aDateValue is not valid"];
-        return;
-    }
-
-    if (_minDate)
-        aDateValue = new Date (MAX(aDateValue, _minDate));
-
-    if (_maxDate)
-        aDateValue = new Date (MIN(aDateValue, _maxDate));
-
-    aTimeInterval = MAX(MIN(aTimeInterval, [_maxDate timeIntervalSinceDate:aDateValue]), [_minDate timeIntervalSinceDate:aDateValue]);
-
-    if ([aDateValue isEqualToDate:_dateValue] && aTimeInterval == _timeInterval)
-    {
-        if (_datePickerStyle == CPTextFieldAndStepperDatePickerStyle || _datePickerStyle == CPTextFieldDatePickerStyle)
-            [_datePickerTextfield setDateValue:_dateValue];
-        else
-            [_datePickerCalendar setDateValue:_dateValue];
-
-        return;
-    }
-
-    if (_implementedCDatePickerDelegateMethods & CPDatePicker_validateProposedDateValue_timeInterval)
-    {
-        // constrain timeInterval also
-        var aStartDateRef = function(x){if (typeof x == 'undefined') return aDateValue; aDateValue = x;}
-        var aTimeIntervalRef = function(x){if (typeof x == 'undefined') return aTimeInterval; aTimeInterval = x;}
-
-        [_delegate datePicker:self validateProposedDateValue:aStartDateRef timeInterval:aTimeIntervalRef];
-    }
-
-    [self willChangeValueForKey:@"objectValue"];
-    [self willChangeValueForKey:@"dateValue"];
-    _dateValue = aDateValue;
-    [super setObjectValue:_dateValue];
-    [self didChangeValueForKey:@"objectValue"];
-    [self didChangeValueForKey:@"dateValue"];
-
-    [self willChangeValueForKey:@"timeInterval"];
-    _timeInterval = (_datePickerMode == CPSingleDateMode)? 0 : aTimeInterval;
-    [self didChangeValueForKey:@"timeInterval"];
-
-    if (_invokedByUserEvent)
-        [self sendAction:[self action] to:[self target]];
-
-    if (_datePickerStyle == CPTextFieldAndStepperDatePickerStyle || _datePickerStyle == CPTextFieldDatePickerStyle)
-        [_datePickerTextfield setDateValue:_dateValue];
-    else
-        [_datePickerCalendar setDateValue:_dateValue];
-}
-
-/*! Set the minDate of the datePicker
-    @param aMinDate the minDate
-*/
-- (void)setMinDate:(CPDate)aMinDate
-{
-    [self willChangeValueForKey:@"minDate"];
-    _minDate = aMinDate;
-    [self didChangeValueForKey:@"minDate"];
-
-    [self _setDateValue:_dateValue timeInterval:_timeInterval];
-}
-
-/*! Set the maxDate of the datePicker
-    @param aMaxDate the maxDate
-*/
-- (void)setMaxDate:(CPDate)aMaxDate
-{
-    [self willChangeValueForKey:@"maxDate"];
-    _maxDate = aMaxDate;
-    [self didChangeValueForKey:@"maxDate"];
-
-    [self _setDateValue:_dateValue timeInterval:_timeInterval];
-}
-
-/*! Set the syle of the datePicker
-    @param aDatePickerStyle the datePicker style
-*/
-- (void)setDatePickerStyle:(CPInteger)aDatePickerStyle
-{
-    _datePickerStyle = aDatePickerStyle;
-
-    [self setControlSize:[self controlSize]];
-
-    [self setNeedsDisplay:YES];
-    [self setNeedsLayout];
-}
-
-/*! Set the elements of the datePicker
-    @param aDatePickerElements the datePicker elements
-*/
-- (void)setDatePickerElements:(CPInteger)aDatePickerElements
-{
-    _datePickerElements = aDatePickerElements;
-
-    [self setNeedsDisplay:YES];
-    [self setNeedsLayout];
-}
-
-/*! Set the mode of the datePicker
-    @param aDatePickerMode the datePicker mode
-*/
-- (void)setDatePickerMode:(CPInteger)aDatePickerMode
-{
-    _datePickerMode = aDatePickerMode;
-
-    if (_datePickerMode == CPSingleDateMode)
-        [self _setDateValue:[self dateValue] timeInterval:0];
-
-    [self setNeedsDisplay:YES];
-    [self setNeedsLayout];
-}
-
-/*! Set the timeInterval of the datePicker
-    @param aTimeInterval the timeInterval of the datePicker
-*/
-- (void)setTimeInterval:(CPInteger)aTimeInterval
-{
-    if (_datePickerMode == CPSingleDateMode)
-        return;
-
-    [self _setDateValue:[self dateValue] timeInterval:aTimeInterval];
-}
-
-/*! Set the locale of the datePicker. This update laso the locale of the formatter.
-    @param aLocale the locale
-*/
-- (void)setLocale:(CPLocale)aLocale
-{
-    _locale = aLocale;
-
-    if (_formatter)
-    {
-        [self willChangeValueForKey:@"locale"];
-        [_formatter setLocale:_locale];
-        [self didChangeValueForKey:@"locale"];
-    }
-
-    // This will update the textFields (usefull when changing with a date with pm and am)
-    [_datePickerTextfield setDateValue:_dateValue];
-    [self setNeedsDisplay:YES];
-    [self setNeedsLayout];
-}
-
-/*!
-    Sets whether the datepicker will have a bezeled border.
-    @param shouldBeBezeled \c YES means the datepicker will draw a bezeled border
-*/
-- (void)setBezeled:(BOOL)shouldBeBezeled
-{
-    _isBezeled = shouldBeBezeled;
-
-    if (shouldBeBezeled)
-        [self setThemeState:CPThemeStateBezeled];
-    else
-        [self unsetThemeState:CPThemeStateBezeled];
-}
-
-/*!
-    Sets whether the datepicker will have a border drawn. (actually it does nothing)
-    @param shouldBeBordered \c YES makes the datepicker draw a border
-*/
-- (void)setBordered:(BOOL)shouldBeBordered
-{
-    _isBordered = shouldBeBordered;
-
-    if (shouldBeBordered)
-        [self setThemeState:CPThemeStateBordered];
-    else
-        [self unsetThemeState:CPThemeStateBordered];
-}
-
-/*!
-    Sets the font of the control.
-    @param aFont
-*/
-- (void)setTextFont:(CPFont)aFont
-{
-    [self setFont:aFont];
-}
-
-/*! Sets the enabled status of the control. Controls that are not enabled can not be used by the user and obtain the CPThemeStateDisabled theme state.
-    @param a boolean. YES if the control should be enabled, otherwise NO.
-*/
-- (void)setEnabled:(BOOL)aBoolean
-{
-    [super setEnabled:aBoolean];
-
-    [_datePickerTextfield setEnabled:aBoolean];
-    [_datePickerCalendar setEnabled:aBoolean];
-}
-
-/*! Set the background color of the datePicker
-    @param aColor
-*/
-- (void)setBackgroundColor:(CPColor)aColor
-{
-    _backgroundColor = aColor;
-    [self setNeedsLayout];
-}
-
-/*! Set the boolean drawsBackgroundColor
-    @param aBoolean
-*/
-- (void)setDrawsBackground:(BOOL)aBoolean
-{
-    [self willChangeValueForKey:@"drawsBackground"];
-    _drawsBackground = aBoolean;
-    [self didChangeValueForKey:@"drawsBackground"];
-
-    [self setNeedsLayout];
-}
-
-/*! Set the timeZone
-    @param aTimeZone
-*/
-- (void)setTimeZone:(CPTimeZone)aTimeZone
-{
-    [self willChangeValueForKey:@"timeZone"];
-    _timeZone = aTimeZone;
-    [self didChangeValueForKey:@"timeZone"];
-
-    [self setNeedsLayout];
-
-    if (_datePickerStyle == CPTextFieldAndStepperDatePickerStyle || _datePickerStyle == CPTextFieldDatePickerStyle)
-        [_datePickerTextfield setDateValue:_dateValue];
-    else
-        [_datePickerCalendar setDateValue:_dateValue];
-}
-
-
-#pragma mark -
-#pragma mark First responder methods
-
-/*! Return YES if style is set to CPTextFieldAndStepperDatePickerStyle or CPTextFieldDatePickerStyle
-*/
-- (BOOL)becomeFirstResponder
-{
-    if (_datePickerStyle == CPTextFieldAndStepperDatePickerStyle || _datePickerStyle == CPTextFieldDatePickerStyle)
-    {
-        if (![super becomeFirstResponder])
-            return NO;
-
-        [_datePickerTextfield _selectTextFieldWithFlags:[[CPApp currentEvent] modifierFlags]];
-
-        return YES;
-    }
-
-    return NO;
-}
-
-/*! Return YES
-*/
-- (BOOL)acceptsFirstResponder
-{
-    return YES;
-}
-
-/*! Return YES
-*/
-- (BOOL)resignFirstResponder
-{
-    if (_datePickerStyle == CPTextFieldAndStepperDatePickerStyle || _datePickerStyle == CPTextFieldDatePickerStyle)
-        [_datePickerTextfield resignFirstResponder];
-
-    return YES;
-}
-
-
-#pragma mark -
-#pragma mark getter
-
-/*!
-    Returns \c YES if the textfield is bezeled.
-*/
-- (BOOL)isBezeled
-{
-    return [self hasThemeState:CPThemeStateBezeled];
-}
-
-/*!
-    Returns \c YES if the textfield has a border.
-*/
-- (BOOL)isBordered
-{
-    return [self hasThemeState:CPThemeStateBordered];
-}
-
-/*!
-    Returns the font of the control.
-*/
-- (CPFont)textFont
-{
-    return [self font];
-}
-
-/*! Check if we are in the american format or not. Depending on the locale
-*/
-- (BOOL)_isAmericanFormat
-{
-    return [[_locale objectForKey:CPLocaleCountryCode] isEqualToString:@"US"];
-}
-
-#pragma mark -
-#pragma mark Key event
-
-/*! Key down event
-    @param anEvent
-*/
-- (void)keyDown:(CPEvent)anEvent
-{
-    if (_datePickerStyle == CPTextFieldAndStepperDatePickerStyle || _datePickerStyle == CPTextFieldDatePickerStyle)
-        [_datePickerTextfield keyDown:anEvent];
-}
-
-@end
-
-var CPDatePickerModeKey         = @"CPDatePickerModeKey",
-    CPIntervalKey               = @"CPIntervalKey",
-    CPMinDateKey                = @"CPMinDateKey",
-    CPMaxDateKey                = @"CPMaxDateKey",
-    CPBackgroundColorKey        = @"CPBackgroundColorKey",
-    CPDrawsBackgroundKey        = @"CPDrawsBackgroundKey",
-    CPTextFontKey               = @"CPTextFontKey",
-    CPDatePickerElementsKey     = @"CPDatePickerElementsKey",
-    CPDatePickerStyleKey        = @"CPDatePickerStyleKey",
-    CPLocaleKey                 = @"CPLocaleKey",
-    CPBorderedKey               = @"CPBorderedKey",
-    CPDateValueKey              = @"CPDateValueKey";
-
-@implementation CPDatePicker (CPCoding)
-
-- (id)initWithCoder:(CPCoder)aCoder
-{
-    self = [super initWithCoder:aCoder];
-
-    if (self)
-    {
-        _textFont = [aCoder decodeObjectForKey:CPTextFontKey];
-        _minDate = [aCoder decodeObjectForKey:CPMinDateKey] || [CPDate distantPast];
-        _maxDate = [aCoder decodeObjectForKey:CPMaxDateKey] || [CPDate distantFuture];
-        _timeInterval = [aCoder decodeDoubleForKey:CPIntervalKey];
-        _datePickerMode = [aCoder decodeIntForKey:CPDatePickerModeKey];
-        _datePickerElements = [aCoder decodeIntForKey:CPDatePickerElementsKey];
-        [self setDatePickerStyle:[aCoder decodeIntForKey:CPDatePickerStyleKey]];
-        _locale = [aCoder decodeObjectForKey:CPLocaleKey];
-        _dateValue = [aCoder decodeObjectForKey:CPDateValueKey];
-        _backgroundColor = [aCoder decodeObjectForKey:CPBackgroundColorKey];
-        _drawsBackground = [aCoder decodeBoolForKey:CPDrawsBackgroundKey];
-        _isBordered = [aCoder decodeBoolForKey:CPBorderedKey];
-
-        [self _init];
-    }
-
-    return self
-}
-
-- (void)encodeWithCoder:(CPCoder)aCoder
-{
-    // FIXME Do we need to encode _datePickerTextfield and _datePickerCalendar? As subviews they'll be encoded, but when we decode we recreate them anyhow.
-    [super encodeWithCoder:aCoder];
-
-    [aCoder encodeDouble:_timeInterval forKey:CPIntervalKey];
-    [aCoder encodeInt:_datePickerMode forKey:CPDatePickerModeKey];
-    [aCoder encodeInt:_datePickerStyle forKey:CPDatePickerStyleKey];
-    [aCoder encodeInt:_datePickerElements forKey:CPDatePickerElementsKey];
-    [aCoder encodeObject:_minDate forKey:CPMinDateKey];
-    [aCoder encodeObject:_maxDate forKey:CPMaxDateKey]
-    [aCoder encodeObject:_dateValue forKey:CPDateValueKey];;
-    [aCoder encodeObject:_textFont forKey:CPTextFontKey];
-    [aCoder encodeObject:_locale forKey:CPLocaleKey];
-    [aCoder encodeObject:_backgroundColor forKey:CPBackgroundColorKey];
-    [aCoder encodeObject:_drawsBackground forKey:CPDrawsBackgroundKey];
-    [aCoder encodeObject:_isBordered forKey:CPBorderedKey];
-
-}
-
-@end
-
-@implementation _CPDatePickerValueBinder : CPBinder
-{
-}
-
-@end
-
-@implementation CPDate (CPDatePickerAdditions)
-
-- (int)_daysInMonth
-{
-    return 32 - new Date(self.getFullYear(), self.getMonth(), 32).getDate();
-}
-
-- (void)_resetToMidnight
-{
-    self.setHours(0);
-    self.setMinutes(0);
-    self.setSeconds(0);
-    self.setMilliseconds(0);
-}
-
-- (void)_resetToLastSeconds
-{
-    self.setHours(23);
-    self.setMinutes(59);
-    self.setSeconds(59);
-    self.setMilliseconds(99);
-}
-
-@end

AppKit/CPDatePicker/_CPDatePickerClock.j

@@ -1,313 +0,0 @@
-/*
-* _CPDatePickerClock.j
-* AppKit
-*
-* Created by Alexandre Wilhelm
-* Copyright 2012 <alexandre.wilhelmfr@gmail.com>
-*
-* 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 "CPTextField.j"
-@import "CPImageView.j"
-@import "CALayer.j"
-
-@class _CPCibCustomResource
-@class CPDatePicker
-
-@global CPHourMinuteSecondDatePickerElementFlag
-@global CPTextFieldAndStepperDatePickerStyle
-@global CPTextFieldDatePickerStyle
-
-var RADIANS = Math.PI / 180;
-
-
-@implementation _CPDatePickerClock : CPView
-{
-    BOOL            _isEnabled;
-    CALayer         _rootLayer;
-    CALayer         _hourHandLayer;
-    CALayer         _minuteHandLayer;
-    CALayer         _secondHandLayer;
-    CALayer         _middleHandLayer;
-    CPDatePicker    _datePicker;
-    CPTextField     _PMAMTextField;
-}
-
-
-#pragma mark -
-#pragma mark Init methods
-
-- (id)initWithFrame:(CGRect)aFrame datePicker:(CPDatePicker)aDatePicker
-{
-    if (self = [super initWithFrame:aFrame])
-    {
-        _datePicker = aDatePicker;
-
-        _PMAMTextField = [[CPTextField alloc] initWithFrame:CGRectMakeZero()];
-
-        [_PMAMTextField setValue:[_datePicker valueForThemeAttribute:@"clock-font" inState:CPThemeStateNormal] forThemeAttribute:@"font" inState:CPThemeStateNormal];
-        [_PMAMTextField setValue:[_datePicker valueForThemeAttribute:@"clock-text-color" inState:CPThemeStateNormal] forThemeAttribute:@"text-color" inState:CPThemeStateNormal];
-        [_PMAMTextField setValue:[_datePicker valueForThemeAttribute:@"clock-text-shadow-color" inState:CPThemeStateNormal] forThemeAttribute:@"text-shadow-color" inState:CPThemeStateNormal];
-        [_PMAMTextField setValue:[_datePicker valueForThemeAttribute:@"clock-text-shadow-offset" inState:CPThemeStateNormal] forThemeAttribute:@"text-shadow-offset" inState:CPThemeStateNormal];
-
-        [_PMAMTextField setValue:[_datePicker valueForThemeAttribute:@"clock-font" inState:CPThemeStateDisabled] forThemeAttribute:@"font" inState:CPThemeStateDisabled];
-        [_PMAMTextField setValue:[_datePicker valueForThemeAttribute:@"clock-text-color" inState:CPThemeStateDisabled] forThemeAttribute:@"text-color" inState:CPThemeStateDisabled];
-        [_PMAMTextField setValue:[_datePicker valueForThemeAttribute:@"clock-text-shadow-color" inState:CPThemeStateDisabled] forThemeAttribute:@"text-shadow-color" inState:CPThemeStateDisabled];
-        [_PMAMTextField setValue:[_datePicker valueForThemeAttribute:@"clock-text-shadow-offset" inState:CPThemeStateDisabled] forThemeAttribute:@"text-shadow-offset" inState:CPThemeStateDisabled];
-
-        [self addSubview:_PMAMTextField];
-
-        var middleHandSize = [_datePicker valueForThemeAttribute:@"middle-hand-size"],
-            minuteHandSize = [_datePicker valueForThemeAttribute:@"minute-hand-size"],
-            hourHandSize = [_datePicker valueForThemeAttribute:@"hour-hand-size"],
-            secondHandSize = [_datePicker valueForThemeAttribute:@"second-hand-size"];
-
-        // We use layer to make the rotation possible
-        _hourHandLayer = [[HandLayer alloc] initWithSize:hourHandSize];
-        [_hourHandLayer setBounds:CGRectMake(0, 0, aFrame.size.width, aFrame.size.height)];
-        [_hourHandLayer setAnchorPoint:CGPointMakeZero()];
-        [_hourHandLayer setPosition:CGPointMake(0.0, 0.0)];
-
-        _minuteHandLayer = [[HandLayer alloc] initWithSize:minuteHandSize];
-        [_minuteHandLayer setBounds:CGRectMake(0, 0, aFrame.size.width, aFrame.size.height)];
-        [_minuteHandLayer setAnchorPoint:CGPointMakeZero()];
-        [_minuteHandLayer setPosition:CGPointMake(0.0, 0.0)];
-
-        _secondHandLayer = [[HandLayer alloc] initWithSize:secondHandSize];
-        [_secondHandLayer setBounds:CGRectMake(0, 0, aFrame.size.width, aFrame.size.height)];
-        [_secondHandLayer setAnchorPoint:CGPointMakeZero()];
-        [_secondHandLayer setPosition:CGPointMake(0.0, 0.0)];
-
-        _middleHandLayer = [[HandLayer alloc] initWithSize:middleHandSize];
-        [_middleHandLayer setBounds:CGRectMake(0, 0, aFrame.size.width, aFrame.size.height)];
-        [_middleHandLayer setAnchorPoint:CGPointMakeZero()];
-        [_middleHandLayer setPosition:CGPointMake(0.0, 0.0)];
-
-        _rootLayer = [CALayer layer];
-        [self setWantsLayer:YES];
-        [self setLayer:_rootLayer];
-
-        [_hourHandLayer setNeedsDisplay];
-        [_middleHandLayer setNeedsDisplay];
-        [_secondHandLayer setNeedsDisplay];
-        [_minuteHandLayer setNeedsDisplay];
-
-        [_rootLayer addSublayer:_hourHandLayer];
-        [_rootLayer addSublayer:_minuteHandLayer];
-        [_rootLayer addSublayer:_secondHandLayer];
-        [_rootLayer addSublayer:_middleHandLayer];
-
-        [_rootLayer setNeedsDisplay];
-    }
-
-    return self;
-}
-
-
-#pragma mark -
-#pragma mark Layout methods
-
-- (void)layoutSubviews
-{
-    if ([_datePicker datePickerStyle] == CPTextFieldAndStepperDatePickerStyle || [_datePicker datePickerStyle] == CPTextFieldDatePickerStyle)
-        return;
-
-    [super layoutSubviews];
-
-    var bounds = [self bounds],
-        dateValue = [[_datePicker dateValue] copy];
-
-    [dateValue _dateWithTimeZone:[_datePicker timeZone]];
-
-    [self setBackgroundColor:[_datePicker currentValueForThemeAttribute:@"bezel-color-clock"]];
-    [_middleHandLayer setImage:[_datePicker currentValueForThemeAttribute:@"middle-hand-image"]];
-    [_hourHandLayer setImage:[_datePicker currentValueForThemeAttribute:@"hour-hand-image"]];
-    [_minuteHandLayer setImage:[_datePicker currentValueForThemeAttribute:@"minute-hand-image"]];
-    [_secondHandLayer setImage:[_datePicker currentValueForThemeAttribute:@"second-hand-image"]];
-
-    if ([_datePicker _isAmericanFormat])
-    {
-        if (dateValue.getHours() > 11)
-            [_PMAMTextField setStringValue:@"PM"]
-        else
-            [_PMAMTextField setStringValue:@"AM"];
-
-        [_PMAMTextField sizeToFit];
-        [_PMAMTextField setFrameOrigin:CGPointMake(bounds.size.width / 2 - [_PMAMTextField frameSize].width / 2, bounds.size.height / 2 + 15)];
-        [_PMAMTextField setHidden:NO];
-    }
-    else
-    {
-        [_PMAMTextField setHidden:YES];
-    }
-
-    [_hourHandLayer setRotationRadians:[self _hourPositionRadianForDate:dateValue]];
-    [_minuteHandLayer setRotationRadians:[self _minutePositionRadianForDate:dateValue]];
-    [_secondHandLayer setRotationRadians:[self _secondPositionRadianForDate:dateValue]];
-
-    [_PMAMTextField setEnabled:_isEnabled];
-    [_hourHandLayer setEnabled:_isEnabled];
-    [_middleHandLayer setEnabled:_isEnabled];
-    [_secondHandLayer setEnabled:_isEnabled];
-    [_minuteHandLayer setEnabled:_isEnabled];
-
-    // Check if we have to display the hand second
-    if (([_datePicker datePickerElements] & CPHourMinuteSecondDatePickerElementFlag) == CPHourMinuteSecondDatePickerElementFlag)
-        [_secondHandLayer setHidden:NO];
-    else
-        [_secondHandLayer setHidden:YES];
-
-    [_rootLayer setNeedsDisplay];
-}
-
-
-#pragma mark -
-#pragma mark Accessors
-
-- (float)_hourPositionRadianForDate:(CPDate)aDate
-{
-    var hours = aDate.getHours() + aDate.getMinutes() / 60;
-
-    return (360 * hours / 12) * RADIANS;
-}
-
-- (float)_secondPositionRadianForDate:(CPDate)aDate
-{
-    return (360 * aDate.getSeconds() / 60) * RADIANS;
-}
-
-- (float)_minutePositionRadianForDate:(CPDate)aDate
-{
-    var minutes = aDate.getMinutes() + aDate.getSeconds() / 60;
-
-    return (360 * minutes / 60) * RADIANS;
-}
-
-- (void)setEnabled:(BOOL)shouldEnable
-{
-    shouldEnable = !!shouldEnable;
-
-    if (shouldEnable === _isEnabled)
-        return;
-
-    _isEnabled = shouldEnable;
-    [self setNeedsLayout];
-
-    // FIXME: This is a workaround for an apparent bug in CALayer.
-    // Without pumping the event loop, the sublayers of _rootLayer
-    // (the hands) are not redrawn until an event occurs.
-    [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
-}
-
-@end
-
-
-@implementation HandLayer : CALayer
-{
-    BOOL    _isEnabled      @accessors(setter=setEnabled:, getter=isEnabled);
-
-    CPImage _image;
-    CALayer _imageLayer;
-    float   _rotationRadians;
-}
-
-
-#pragma mark -
-#pragma mark Init methods
-
-- (id)initWithSize:(CGSize)aSize
-{
-    if (self = [super init])
-    {
-        _isEnabled = YES;
-        _imageLayer = [CALayer layer];
-        _rotationRadians = 0;
-
-        [_imageLayer setDelegate:self];
-        [_imageLayer setBounds:CGRectMake(0.0, 0.0, aSize.width, aSize.height)];
-
-        [self addSublayer:_imageLayer];
-    }
-
-    return self;
-}
-
-
-#pragma mark -
-#pragma mark Setter Getter methods
-
-/*!
-    Set the bounds of the layer. The imageLayer will be at the center of this bounds.
-*/
-- (void)setBounds:(CGRect)aRect
-{
-    [super setBounds:aRect];
-
-    [_imageLayer setPosition:CGPointMake(CGRectGetMidX(aRect), CGRectGetMidY(aRect))];
-}
-
-- (void)setImage:(CPImage)anImage
-{
-    if (_image === anImage)
-        return;
-
-    if ([anImage isKindOfClass:[_CPCibCustomResource class]])
-        _image = [anImage imageFromCoder:nil];
-    else
-        _image = anImage;
-
-    [_imageLayer setNeedsDisplay];
-}
-
-- (void)setRotationRadians:(float)radians
-{
-    if (_rotationRadians === radians)
-        return;
-
-    _rotationRadians = radians;
-
-    [_imageLayer setAffineTransform:CGAffineTransformScale(
-        CGAffineTransformMakeRotation(_rotationRadians),
-        1.0, 1.0)];
-}
-
-- (void)setEnabled:(BOOL)shouldEnable
-{
-    shouldEnable = !!shouldEnable;
-
-    if (_isEnabled === shouldEnable)
-        return;
-
-    _isEnabled = shouldEnable;
-    [self setNeedsDisplay];
-    [_imageLayer setNeedsDisplay];
-}
-
-- (void)imageDidLoad:(CPImage)anImage
-{
-    [_imageLayer setNeedsDisplay];
-}
-
-- (void)drawLayer:(CALayer)aLayer inContext:(CGContext)aContext
-{
-    if ([_image loadStatus] != CPImageLoadStatusCompleted)
-        [_image setDelegate:self];
-    else
-        CGContextDrawImage(aContext, [aLayer bounds], _image);
-}
-
-@end

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."];
@@ -244,6 +240,11 @@ var CPDocumentUntitledCount = 0;
 {
 }
 
+- (CPWindowController)firstEligibleExistingWindowController
+{
+    return nil;
+}
+
 // Creating and managing window controllers
 /*!
     Creates the window controller for this document.
@@ -256,7 +257,6 @@ var CPDocumentUntitledCount = 0;
 - (void)makeViewAndWindowControllers
 {
     var viewCibName = [self viewCibName],
-        windowCibName = [self windowCibName],
         viewController = nil,
         windowController = nil;
 
@@ -264,21 +264,31 @@ var CPDocumentUntitledCount = 0;
     if ([viewCibName length])
         viewController = [[CPViewController alloc] initWithCibName:viewCibName bundle:nil owner:self];
 
-    // From a cib if we have one.
-    if ([windowCibName length])
-        windowController = [[CPWindowController alloc] initWithWindowCibName:windowCibName owner:self];
+    // If we have a view controller, check if we have a free window for it.
+    if (viewController)
+        windowController = [self firstEligibleExistingWindowController];
 
-    // If not you get a standard window capable of displaying multiple documents and view
-    else if (viewController)
+    // If not, create one.
+    if (!windowController)
     {
-        var view = [viewController view],
-            viewFrame = [view frame];
+        var windowCibName = [self windowCibName];
 
-        viewFrame.origin = CGPointMake(50, 50);
+        // From a cib if we have one.
+        if ([windowCibName length])
+            windowController = [[CPWindowController alloc] initWithWindowCibName:windowCibName owner:self];
 
-        var theWindow = [[CPWindow alloc] initWithContentRect:viewFrame styleMask:CPTitledWindowMask | CPClosableWindowMask | CPMiniaturizableWindowMask | CPResizableWindowMask];
+        // If not you get a standard window capable of displaying multiple documents and view
+        else if (viewController)
+        {
+            var view = [viewController view],
+                viewFrame = [view frame];
 
-        windowController = [[CPWindowController alloc] initWithWindow:theWindow];
+            viewFrame.origin = CGPointMake(50, 50);
+
+            var theWindow = [[CPWindow alloc] initWithContentRect:viewFrame styleMask:CPTitledWindowMask | CPClosableWindowMask | CPMiniaturizableWindowMask | CPResizableWindowMask];
+
+            windowController = [[CPWindowController alloc] initWithWindow:theWindow];
+        }
     }
 
     if (windowController && viewController)
@@ -515,9 +525,7 @@ var CPDocumentUntitledCount = 0;
 
         alert("There was an error retrieving the document.");
 
-        var theDelegate = session.delegate;
-
-        theDelegate.isa.objj_msgSend3(theDelegate, session.didReadSelector, self, NO, session.contextInfo);
+        objj_msgSend(session.delegate, session.didReadSelector, self, NO, session.contextInfo);
     }
     else
     {
@@ -542,9 +550,7 @@ var CPDocumentUntitledCount = 0;
 
                 _writeRequest = nil;
 
-                var theDelegate = session.delegate;
-
-                theDelegate.isa.objj_msgSend3(theDelegate, session.didSaveSelector, self, NO, session.contextInfo);
+                objj_msgSend(session.delegate, session.didSaveSelector, self, NO, session.contextInfo);
                 [self _sendDocumentSavedNotification:NO];
             }
         }
@@ -557,15 +563,14 @@ var CPDocumentUntitledCount = 0;
 */
 - (void)connection:(CPURLConnection)aConnection didReceiveData:(CPString)aData
 {
-    var session = aConnection.session,
-        theDelegate = session.delegate;
+    var session = aConnection.session;
 
     // READ
     if (aConnection == _readConnection)
     {
         [self readFromData:[CPData dataWithRawString:aData] ofType:session.fileType error:nil];
 
-        theDelegate.isa.objj_msgSend3(theDelegate, session.didReadSelector, self, YES, session.contextInfo);
+        objj_msgSend(session.delegate, session.didReadSelector, self, YES, session.contextInfo);
     }
     else
     {
@@ -574,7 +579,7 @@ var CPDocumentUntitledCount = 0;
 
         _writeRequest = nil;
 
-        theDelegate.isa.objj_msgSend3(theDelegate, session.didSaveSelector, self, YES, session.contextInfo);
+        objj_msgSend(session.delegate, session.didSaveSelector, self, YES, session.contextInfo);
         [self _sendDocumentSavedNotification:YES];
     }
 }
@@ -585,11 +590,10 @@ var CPDocumentUntitledCount = 0;
 */
 - (void)connection:(CPURLConnection)aConnection didFailWithError:(CPError)anError
 {
-    var session = aConnection.session,
-        theDelegate = session.delegate;
+    var session = aConnection.session;
 
     if (_readConnection == aConnection)
-        theDelegate.isa.objj_msgSend3(theDelegate, session.didReadSelector, self, NO, session.contextInfo);
+        objj_msgSend(session.delegate, session.didReadSelector, self, NO, session.contextInfo);
 
     else
     {
@@ -603,7 +607,7 @@ var CPDocumentUntitledCount = 0;
 
         alert("There was an error saving the document.");
 
-        theDelegate.isa.objj_msgSend3(theDelegate, session.didSaveSelector, self, NO, session.contextInfo);
+        objj_msgSend(session.delegate, session.didSaveSelector, self, NO, session.contextInfo);
         [self _sendDocumentSavedNotification:NO];
     }
 }
@@ -864,24 +868,21 @@ var CPDocumentUntitledCount = 0;
         [self canCloseDocumentWithDelegate:self shouldCloseSelector:@selector(_document:shouldClose:context:) contextInfo:{delegate:delegate, selector:selector, context:info}];
 
     else if ([delegate respondsToSelector:selector])
-        delegate.isa.objj_msgSend3(delegate, selector, self, YES, info);
+        objj_msgSend(delegate, selector, self, YES, info);
 }
 
 - (void)_document:(CPDocument)aDocument shouldClose:(BOOL)shouldClose context:(Object)context
 {
-    var theDelegate = context.delegate;
-
     if (aDocument === self && shouldClose)
         [self close];
 
-    if (theDelegate != null)
-        theDelegate.isa.objj_msgSend3(theDelegate, context.selector, aDocument, shouldClose, context.context);
+    objj_msgSend(context.delegate, context.selector, aDocument, shouldClose, context.context);
 }
 
 - (void)canCloseDocumentWithDelegate:(id)aDelegate shouldCloseSelector:(SEL)aSelector contextInfo:(Object)context
 {
     if (![self isDocumentEdited])
-        return [aDelegate respondsToSelector:aSelector] && aDelegate.isa.objj_msgSend3(aDelegate, aSelector, self, YES, context);
+        return [aDelegate respondsToSelector:aSelector] && objj_msgSend(aDelegate, aSelector, self, YES, context);
 
     _canCloseAlert = [[CPAlert alloc] init];
 
@@ -910,8 +911,8 @@ var CPDocumentUntitledCount = 0;
 
     if (returnCode === 0)
         [self saveDocumentWithDelegate:delegate didSaveSelector:selector contextInfo:context];
-    else if (delegate != null)
-        delegate.isa.objj_msgSend3(delegate, selector, self, returnCode === 2, context);
+    else
+        objj_msgSend(delegate, selector, self, returnCode === 2, context);
 
     _canCloseAlert = nil;
 }

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];
 
@@ -253,14 +249,6 @@ var CPSharedDocumentController = nil;
     return _documents;
 }
 
-/*!
-    Returns the CPDocument object associated with the main window.
-*/
-- (CPDocument)currentDocument
-{
-    return [[[CPApp mainWindow] windowController] document];
-}
-
 /*!
     Adds \c aDocument under the control of the receiver.
     @param aDocument the document to add
@@ -279,33 +267,6 @@ var CPSharedDocumentController = nil;
     [_documents removeObjectIdenticalTo:aDocument];
 }
 
-/*!
-    Returns the document object whose window controller
-    owns a specified window.
-*/
-- (CPDocument)documentForWindow:(CPWindow)aWindow
-{
-   return [[aWindow windowController] document];
-}
-
-/*!
-    Returns a Boolean value that indicates whether the receiver
-    has any documents with unsaved changes.
-*/
-- (BOOL)hasEditedDocuments
-{
-    var iter = [_documents objectEnumerator],
-        obj;
-
-    while ((obj = [iter nextObject]) !== nil)
-    {
-        if ([obj isDocumentEdited])
-            return YES;
-    }
-
-    return NO;
-}
-
 - (CPString)defaultType
 {
     return [_documentTypes[0] objectForKey:@"CPBundleTypeName"];
@@ -378,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];
 }
@@ -402,10 +363,8 @@ var CPSharedDocumentController = nil;
         }
     }
 
-    var theDelegate = context.delegate;
-
-    if ([theDelegate respondsToSelector:context.selector])
-        theDelegate.isa.objj_msgSend3(theDelegate, context.selector, self, [[self documents] count] === 0, context.context);
+    if ([context.delegate respondsToSelector:context.selector])
+        objj_msgSend(context.delegate, context.selector, self, [[self documents] count] === 0, context.context);
 }
 
 @end

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];
 }
@@ -163,7 +168,7 @@ var CPDraggingSource_draggedImage_movedTo_          = 1 << 0,
 
     if (self)
     {
-        _draggedWindow = [[CPWindow alloc] initWithContentRect:CGRectMakeZero() styleMask:CPBorderlessWindowMask];
+        _draggedWindow = [[CPWindow alloc] initWithContentRect:_CGRectMakeZero() styleMask:CPBorderlessWindowMask];
 
         [_draggedWindow setLevel:CPDraggingWindowLevel];
     }
@@ -201,12 +206,7 @@ var CPDraggingSource_draggedImage_movedTo_          = 1 << 0,
 - (void)draggingSourceUpdatedWithGlobalLocation:(CGPoint)aGlobalLocation
 {
     if (![CPPlatform supportsDragAndDrop])
-    {
-        var frame = [_draggedWindow frame];
-        frame.origin.x = aGlobalLocation.x - _draggingOffset.width;
-        frame.origin.y = aGlobalLocation.y - _draggingOffset.height;
-        [_draggedWindow _setFrame:frame display:YES animate:NO constrainWidth:NO constrainHeight:NO];
-    }
+        [_draggedWindow setFrameOrigin:_CGPointMake(aGlobalLocation.x - _draggingOffset.width, aGlobalLocation.y - _draggingOffset.height)];
 
     if (_implementedDraggingSourceMethods & CPDraggingSource_draggedImage_movedTo_)
         [_draggingSource draggedImage:[_draggedView image] movedTo:aGlobalLocation];
@@ -253,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;
@@ -270,10 +270,10 @@ var CPDraggingSource_draggedImage_movedTo_          = 1 << 0,
             {
                 if ([scrollView hasVerticalScroller])
                 {
-                    if (eventLocation.y < CGRectGetMinY(insetBounds))
-                        deltaY = CGRectGetMinY(insetBounds) - eventLocation.y;
-                    else if (eventLocation.y > CGRectGetMaxY(insetBounds))
-                        deltaY = CGRectGetMaxY(insetBounds) - eventLocation.y;
+                    if (eventLocation.y < _CGRectGetMinY(insetBounds))
+                        deltaY = _CGRectGetMinY(insetBounds) - eventLocation.y;
+                    else if (eventLocation.y > _CGRectGetMaxY(insetBounds))
+                        deltaY = _CGRectGetMaxY(insetBounds) - eventLocation.y;
                     if (deltaY < -insetBounds.size.height)
                         deltaY = -insetBounds.size.height;
                     if (deltaY > insetBounds.size.height)
@@ -282,17 +282,17 @@ var CPDraggingSource_draggedImage_movedTo_          = 1 << 0,
 
                 if ([scrollView hasHorizontalScroller])
                 {
-                    if (eventLocation.x < CGRectGetMinX(insetBounds))
-                        deltaX = CGRectGetMinX(insetBounds) - eventLocation.x;
-                    else if (eventLocation.x > CGRectGetMaxX(insetBounds))
-                        deltaX = CGRectGetMaxX(insetBounds) - eventLocation.x;
+                    if (eventLocation.x < _CGRectGetMinX(insetBounds))
+                        deltaX = _CGRectGetMinX(insetBounds) - eventLocation.x;
+                    else if (eventLocation.x > _CGRectGetMaxX(insetBounds))
+                        deltaX = _CGRectGetMaxX(insetBounds) - eventLocation.x;
                     if (deltaX < -insetBounds.size.width)
                         deltaX = -insetBounds.size.width;
                     if (deltaX > insetBounds.size.width)
                         deltaX = insetBounds.size.width;
                 }
 
-                var scrollPoint = CGPointMake(bounds.origin.x - deltaX, bounds.origin.y - deltaY);
+                var scrollPoint = _CGPointMake(bounds.origin.x - deltaX, bounds.origin.y - deltaY);
 
                 [contentView scrollToPoint:scrollPoint];
                 [[scrollView _headerView] scrollPoint:scrollPoint];
@@ -370,26 +370,22 @@ var CPDraggingSource_draggedImage_movedTo_          = 1 << 0,
         if (mouseDownWindow)
             mouseDownEventLocation = [mouseDownWindow convertBaseToGlobal:mouseDownEventLocation];
 
-        _draggingOffset = CGSizeMake(mouseDownEventLocation.x - viewLocation.x, mouseDownEventLocation.y - viewLocation.y);
+        _draggingOffset = _CGSizeMake(mouseDownEventLocation.x - viewLocation.x, mouseDownEventLocation.y - viewLocation.y);
     }
     else
-        _draggingOffset = CGSizeMakeZero();
+        _draggingOffset = _CGSizeMakeZero();
 
     if ([CPPlatform isBrowser])
         [_draggedWindow setPlatformWindow:[aWindow platformWindow]];
 
-    [aView setFrameOrigin:CGPointMakeZero()];
+    [aView setFrameOrigin:_CGPointMakeZero()];
 
-    var mouseLocation = [CPEvent mouseLocation],
-        viewSize = [aView frameSize],
-        startDragLocationX = mouseLocation.x - _draggingOffset.width,
-        startDragLocationY = mouseLocation.y - _draggingOffset.height,
-        draggedWindowFrame = CGRectMake(startDragLocationX, startDragLocationY, viewSize.width, viewSize.height);
+    var mouseLocation = [CPEvent mouseLocation];
 
     // Place it where the mouse pointer is.
-    _startDragLocation = CGPointMake(startDragLocationX, startDragLocationY);
-
-    [_draggedWindow _setFrame:draggedWindowFrame display:YES animate:NO constrainWidth:NO constrainHeight:NO];
+    _startDragLocation = _CGPointMake(mouseLocation.x - _draggingOffset.width, mouseLocation.y - _draggingOffset.height);
+    [_draggedWindow setFrameOrigin:_startDragLocation];
+    [_draggedWindow setFrameSize:[aView frame].size];
 
     [[_draggedWindow contentView] addSubview:aView];
 
@@ -438,7 +434,7 @@ var CPDraggingSource_draggedImage_movedTo_          = 1 << 0,
     var imageSize = [anImage size];
 
     if (!_imageView)
-        _imageView = [[CPImageView alloc] initWithFrame:CGRectMake(0.0, 0.0, imageSize.width, imageSize.height)];
+        _imageView = [[CPImageView alloc] initWithFrame:_CGRectMake(0.0, 0.0, imageSize.width, imageSize.height)];
 
     [_imageView setImage:anImage];
 
@@ -465,7 +461,6 @@ var CPDraggingSource_draggedImage_movedTo_          = 1 << 0,
     else if (type === CPKeyDown)
     {
         var characters = [anEvent characters];
-
         if (characters === CPEscapeFunctionKey)
         {
             _dragOperation = CPDragOperationNone;
@@ -482,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/CPEvent.j

@@ -20,26 +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"
-@import "CPTrackingArea.j"
 
-@class CPTextField
-@class CPWindow
-@class CPGraphicsContext
 
-@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;
 
-@typedef DOMEvent
-@typedef CPEventType
+// 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,
@@ -54,7 +190,7 @@ var _CPEventPeriodicEventPeriod         = 0,
 @implementation CPEvent : CPObject
 {
     CPEventType         _type;
-    CGPoint             _location;
+    CPPoint             _location;
     unsigned            _modifierFlags;
     CPTimeInterval      _timestamp;
     CPGraphicsContext   _context;
@@ -70,21 +206,10 @@ var _CPEventPeriodicEventPeriod         = 0,
     DOMEvent            _DOMEvent;
     int                 _data1;
     int                 _data2;
-    short               _subtype;
 
     float               _deltaX;
     float               _deltaY;
     float               _deltaZ;
-    float               _scrollingDeltaX;
-    float               _scrollingDeltaY;
-    BOOL                _hasPreciseScrollingDeltas;
-
-#if PLATFORM(DOM)
-    BOOL                _suppressCappuccinoCut;
-    BOOL                _suppressCappuccinoPaste;
-#endif
-    
-    CPTrackingArea      _trackingArea;
 }
 
 /*!
@@ -144,27 +269,6 @@ var _CPEventPeriodicEventPeriod         = 0,
         timestamp:aTimestamp windowNumber:aWindowNumber context:aGraphicsContext eventNumber:anEventNumber clickCount:aClickCount pressure:aPressure];
 }
 
-/*!
-    Creates a new mouse tracking event.
- 
-    @param anEventType the event type
-    @param aPoint the location of the cursor in the window specified by \c aWindowNumber
-    @param modifierFlags a bitwise combination of the modifiers specified in the CPEvent globals
-    @param aTimestamp the time the event occurred
-    @param aWindowNumber the number of the CPWindow where the event occurred
-    @param aGraphicsContext the graphics context where the event occurred
-    @param anEventNumber a number for this event
-    @param aTrackingArea the tracking area that triggered the event
-    @throws CPInternalInconsistencyException if an invalid event type is provided
-    @return the new mouse event
- */
-+ (id)enterExitEventWithType:(CPEventType)anEventType location:(CGPoint)aPoint modifierFlags:(unsigned)modifierFlags
-               timestamp:(CPTimeInterval)aTimestamp windowNumber:(int)aWindowNumber context:(CPGraphicsContext)aGraphicsContext
-             eventNumber:(int)anEventNumber trackingArea:(CPTrackingArea)aTrackingArea
-{
-    return [[self alloc] _initEnterExitEventWithType:anEventType location:aPoint modifierFlags:modifierFlags timestamp:aTimestamp windowNumber:aWindowNumber context:aGraphicsContext eventNumber:anEventNumber trackingArea:aTrackingArea];
-}
-
 /*!
     Creates a new custom event.
 
@@ -196,9 +300,7 @@ var _CPEventPeriodicEventPeriod         = 0,
 
         // Make sure these are 0 rather than nil.
         _deltaX = 0;
-        _scrollingDeltaX = 0;
         _deltaY = 0;
-        _scrollingDeltaY = 0;
         _deltaZ = 0;
     }
 
@@ -206,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;
@@ -226,35 +328,13 @@ var _CPEventPeriodicEventPeriod         = 0,
 }
 
 /* @ignore */
-- (id)_initEnterExitEventWithType:(CPEventType)anEventType location:(CGPoint)aPoint modifierFlags:(unsigned)modifierFlags
-                        timestamp:(CPTimeInterval)aTimestamp windowNumber:(int)aWindowNumber context:(CPGraphicsContext)aGraphicsContext
-                      eventNumber:(int)anEventNumber trackingArea:(CPTrackingArea)aTrackingArea
-{
-    if ((anEventType != CPMouseEntered) && (anEventType != CPMouseExited) && (anEventType != CPCursorUpdate))
-        [CPException raise:CPInternalInconsistencyException reason:"Invalid event type"];
-  
-    if (self = [self _initWithType:anEventType])
-    {
-        _location = CGPointCreateCopy(aPoint);
-        _modifierFlags = modifierFlags;
-        _timestamp = aTimestamp;
-        _context = aGraphicsContext;
-        _eventNumber = anEventNumber;
-        _trackingArea = aTrackingArea;
-        _window = [CPApp windowWithWindowNumber:aWindowNumber];
-    }
-    
-    return self;
-}
-
-/* @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;
@@ -275,14 +355,13 @@ var _CPEventPeriodicEventPeriod         = 0,
 {
     if (self = [self _initWithType:anEventType])
     {
-        _location = CGPointCreateCopy(aPoint);
+        _location = CPPointCreateCopy(aPoint);
         _modifierFlags = modifierFlags;
         _timestamp = aTimestamp;
         _context = aGraphicsContext;
         _subtype = aSubtype;
         _data1 = aData1;
         _data2 = aData2;
-        _windowNumber = aWindowNumber;
     }
 
     return self;
@@ -298,7 +377,7 @@ var _CPEventPeriodicEventPeriod         = 0,
 */
 - (CGPoint)locationInWindow
 {
-    return CGPointMakeCopy(_location);
+    return _CGPointMakeCopy(_location);
 }
 
 - (CGPoint)globalLocation
@@ -475,31 +554,6 @@ var _CPEventPeriodicEventPeriod         = 0,
     return _deltaZ;
 }
 
-- (BOOL)hasPreciseScrollingDeltas
-{
-    return !!_hasPreciseScrollingDeltas;
-}
-
-/*!
-    Returns the change in points on the x-axis for a mouse movement, unless hasPreciseScrollingDeltas is NO,
-    in which case the change is measured in number of "lines" or "rows" and needs to be multiplied as appropriate
-    to get change in pixels.
-*/
-- (float)scrollingDeltaX
-{
-    return _scrollingDeltaX;
-}
-
-/*!
-    Returns the change in points on the y-axis for a mouse movement, unless hasPreciseScrollingDeltas is NO,
-    in which case the change is measured in number of "lines" or "columns" and needs to be multiplied as appropriate
-    to get change in pixels.
-*/
-- (float)scrollingDeltaY
-{
-    return _scrollingDeltaY;
-}
-
 - (BOOL)_triggersKeyEquivalent:(CPString)aKeyEquivalent withModifierMask:aKeyEquivalentModifierMask
 {
     if (!aKeyEquivalent)
@@ -561,24 +615,6 @@ var _CPEventPeriodicEventPeriod         = 0,
     return !firstResponderIsText;
 }
 
-/*!
-    Return YES if this event is a part of processing a browser controlled cut or paste event
-    where the browser will go ahead and do the work of cutting or pasting within the input
-    element after processing of this event. The implication is that it should not be done by
-    the CPTextField (or whatever else is controlling the input) since this would result in
-    nothing being cut (because the field already cut the text out), or a double paste
-    (because the field pasted as well as the browser).
-*/
-- (BOOL)_platformIsEffectingCutOrPaste
-{
-#if PLATFORM(DOM)
-    return _suppressCappuccinoCut || _suppressCappuccinoPaste;
-#else
-    return NO;
-#endif
-}
-
-
 /*!
     Generates periodic events every \c aPeriod seconds.
 
@@ -613,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:
@@ -623,25 +659,17 @@ 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];
     }
 }
 
-- (CPTrackingArea)trackingArea
-{
-    if ((_type !== CPMouseEntered) && (_type !== CPMouseExited) && (_type !== CPCursorUpdate))
-        [CPException raise:CPInternalInconsistencyException format:@"You can't call trackingArea for events of type %#x", _type]
-    
-    return _trackingArea;
-}
-
 @end
 
 function _CPEventFirePeriodEvent()
 {
-    [CPApp sendEvent:[CPEvent otherEventWithType:CPPeriodic location:CGPointMakeZero() modifierFlags:0 timestamp:[CPEvent currentTimestamp] windowNumber:0 context:nil subtype:0 data1:0 data2:0]];
+    [CPApp sendEvent:[CPEvent otherEventWithType:CPPeriodic location:_CGPointMakeZero() modifierFlags:0 timestamp:[CPEvent currentTimestamp] windowNumber:0 context:nil subtype:0 data1:0 data2:0]];
 }
 
 var CPEventClass = [CPEvent class];

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:(CPEvent)sommit
-{
-    [[[self window] platformWindow] _propagateCurrentDOMEvent:YES];
-}
-
 - (void)mouseDragged:(CPEvent)anEvent
 {
     [[[self window] platformWindow] _propagateCurrentDOMEvent:YES];

AppKit/CPFont.j

@@ -37,12 +37,12 @@ CPFontCurrentSystemSize = -1;
 // For internal use only by this class and subclasses
 _CPFontSystemFacePlaceholder = "_CPFontSystemFacePlaceholder";
 
-var _CPFontCache          = {},
-    _CPSystemFontCache    = {},
-    _CPFontSystemFontFace = CPFontDefaultSystemFontFace,
-    _CPFontSystemFontSize = 12,
-    _CPFontFallbackFaces  = CPFontDefaultSystemFontFace.split(", "),
-    _CPFontStripRegExp    = new RegExp("(^\\s*[\"']?|[\"']?\\s*$)", "g");
+var _CPFontCache                     = {},
+    _CPSystemFontCache               = {},
+    _CPFontSystemFontFace            = CPFontDefaultSystemFontFace,
+    _CPFontSystemFontSize            = 12,
+    _CPFontFallbackFaces             = CPFontDefaultSystemFontFace.split(", "),
+    _CPFontStripRegExp               = new RegExp("(^\\s*[\"']?|[\"']?\\s*$)", "g");
 
 
 #define _CPRealFontSize(aSize)  (aSize <= 0 ? _CPFontSystemFontSize : aSize)
@@ -174,20 +174,18 @@ following:
     return _CPFontSystemFontSize;
 }
 
-+ (CPFont)systemFontForControlSize:(CPControlSize)aSize
++ (float)systemFontSizeForControlSize:(CPControlSize)aSize
 {
     // TODO These sizes should be themable or made less arbitrary in some other way.
     switch (aSize)
     {
         case CPSmallControlSize:
-            return [self systemFontOfSize:_CPFontSystemFontSize - 1];
-
+            return _CPFontSystemFontSize - 1;
         case CPMiniControlSize:
-            return [self systemFontOfSize:_CPFontSystemFontSize - 2];
-
+            return _CPFontSystemFontSize - 2;
         case CPRegularControlSize:
         default:
-            return [self systemFontOfSize:_CPFontSystemFontSize];
+            return _CPFontSystemFontSize;
     }
 }
 
@@ -208,7 +206,7 @@ following:
     var systemSize = String(_CPFontSystemFontSize),
         currentSize = String(CPFontCurrentSystemSize);
 
-    for (var key in _CPSystemFontCache)
+    for (key in _CPSystemFontCache)
     {
         if (_CPSystemFontCache.hasOwnProperty(key) &&
             (key.indexOf(systemSize) === 0 || key.indexOf(currentSize) === 0))
@@ -283,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);
 }
@@ -295,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,32 +74,20 @@ 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.
     angle = ((angle % 360.0) + 360.0) % 360.0;
 
     if (angle < 90.0)
-        startPoint = CGPointMake(CGRectGetMinX(rect), CGRectGetMinY(rect));
+        startPoint = _CGPointMake(_CGRectGetMinX(rect), _CGRectGetMinY(rect));
     else if (angle < 180.0)
-        startPoint = CGPointMake(CGRectGetMaxX(rect), CGRectGetMinY(rect));
+        startPoint = _CGPointMake(_CGRectGetMaxX(rect), _CGRectGetMinY(rect));
     else if (angle < 270.0)
-        startPoint = CGPointMake(CGRectGetMaxX(rect), CGRectGetMaxY(rect));
+        startPoint = _CGPointMake(_CGRectGetMaxX(rect), _CGRectGetMaxY(rect));
     else
-        startPoint = CGPointMake(CGRectGetMinX(rect), CGRectGetMaxY(rect));
+        startPoint = _CGPointMake(_CGRectGetMinX(rect), _CGRectGetMaxY(rect));
 
     // A line segment comes out of the starting point at the given angle, with the first colour
     // at the starting point and the last at the end. To do what drawInRect: is supposed to do
@@ -129,31 +102,13 @@ CPGradientDrawsAfterEndingLocation      = kCGGradientDrawsAfterEndLocation;
     // This simplifies down to (in the first quadrant) rectWidth * cos(a) + rectHeight * sin(a).
 
     var radians = PI * angle / 180.0,
-        length = ABS(CGRectGetWidth(rect) * COS(radians)) + ABS(CGRectGetHeight(rect) * SIN(radians));
+        length = ABS(_CGRectGetWidth(rect) * COS(radians)) + ABS(_CGRectGetHeight(rect) * SIN(radians));
 
-    endPoint = CGPointMake(startPoint.x + length * COS(radians),
+    endPoint = _CGPointMake(startPoint.x + length * COS(radians),
                            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/CPGraphics.j

@@ -60,9 +60,9 @@ function CPDrawColorTiledRects(
     if (sides.length != colors.length)
         [CPException raise:CPInvalidArgumentException reason:@"sides (length: " + sides.length + ") and colors (length: " + colors.length + ") must have the same length."];
 
-    var resultRect = CGRectMakeCopy(boundsRect),
-        slice = CGRectMakeZero(),
-        remainder = CGRectMakeZero(),
+    var resultRect = _CGRectMakeCopy(boundsRect),
+        slice = _CGRectMakeZero(),
+        remainder = _CGRectMakeZero(),
         context = [[CPGraphicsContext currentContext] graphicsPort];
 
     CGContextSaveGState(context);
@@ -77,7 +77,7 @@ function CPDrawColorTiledRects(
         slice = CGRectIntersection(slice, clipRect);
 
         // Cocoa docs say that only slices that are within the clipRect are actually drawn
-        if (CGRectIsEmpty(slice))
+        if (_CGRectIsEmpty(slice))
             continue;
 
         var minX,
@@ -88,23 +88,23 @@ function CPDrawColorTiledRects(
         if (side == CPMinXEdge || side == CPMaxXEdge)
         {
             // Make sure we have at least 1 pixel to draw a line
-            if (CGRectGetWidth(slice) < 1.0)
+            if (_CGRectGetWidth(slice) < 1.0)
                 continue;
 
-            minX = CGRectGetMinX(slice) + 0.5;
+            minX = _CGRectGetMinX(slice) + 0.5;
             maxX = minX;
-            minY = CGRectGetMinY(slice);
-            maxY = CGRectGetMaxY(slice);
+            minY = _CGRectGetMinY(slice);
+            maxY = _CGRectGetMaxY(slice);
         }
         else // CPMinYEdge || CPMaxYEdge
         {
             // Make sure we have at least 1 pixel to draw a line
-            if (CGRectGetHeight(slice) < 1.0)
+            if (_CGRectGetHeight(slice) < 1.0)
                 continue;
 
-            minX = CGRectGetMinX(slice);
-            maxX = CGRectGetMaxX(slice);
-            minY = CGRectGetMinY(slice) + 0.5;
+            minX = _CGRectGetMinX(slice);
+            maxX = _CGRectGetMaxX(slice);
+            minY = _CGRectGetMinY(slice) + 0.5;
             maxY = minY;
         }
 

AppKit/CPGraphicsContext.j

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

AppKit/CPImage.j

@@ -21,28 +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"
-
-
-@protocol CPImageDelegate <CPObject>
-
-@optional
-- (void)imageDidLoad:(CPImage)anImage;
-- (void)imageDidError:(CPImage)anImage;
-- (void)imageDidAbort:(CPImage)anImage;
-
-@end
-
-var CPImageDelegate_imageDidLoad_   = 1 << 1,
-    CPImageDelegate_imageDidError_  = 1 << 2,
-    CPImageDelegate_imageDidAbort_  = 1 << 3;
 
 CPImageLoadStatusInitialized    = 0;
 CPImageLoadStatusLoading        = 1;
@@ -65,44 +49,15 @@ var imagesForNames = { },
 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)
@@ -133,15 +88,14 @@ function CPAppKitImage(aFilename, aSize)
 */
 @implementation CPImage : CPObject
 {
-    CGSize                  _size;
-    CPString                _filename;
-    CPString                _name;
+    CGSize      _size;
+    CPString    _filename;
+    CPString    _name;
 
-    id <CPImageDelegate>    _delegate;
-    unsigned                _loadStatus;
-    unsigned                _implementedDelegateMethods;
+    id          _delegate;
+    unsigned    _loadStatus;
 
-    Image                   _image;
+    Image       _image;
 }
 
 - (id)init
@@ -151,24 +105,19 @@ function CPAppKitImage(aFilename, aSize)
 
 /*!
     Initializes the image, by associating it with a filename. The image
-    denoted in \c aFilename is not actually loaded. It will be loaded
-    once needed.
-
+    denoted in \c aFilename is not actually loaded. It will
+    be loaded once needed.
     @param aFilename the file containing the image
     @param aSize the image's size
     @return the initialized image
 */
 - (id)initByReferencingFile:(CPString)aFilename size:(CGSize)aSize
 {
-    // Quietly return nil like in Cocoa, rather than crashing later.
-    if (aFilename === undefined || aFilename === nil)
-        return nil;
-
     self = [super init];
 
     if (self)
     {
-        _size = CGSizeMakeCopy(aSize);
+        _size = CPSizeCreateCopy(aSize);
         _filename = aFilename;
         _loadStatus = CPImageLoadStatusInitialized;
     }
@@ -275,7 +224,7 @@ function CPAppKitImage(aFilename, aSize)
 */
 - (CGSize)size
 {
-    return CGSizeMakeCopy(_size);
+    return _size;
 }
 
 + (id)imageNamed:(CPString)aName
@@ -322,34 +271,13 @@ 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
 */
-- (void)setDelegate:(id <CPImageDelegate>)aDelegate
+- (void)setDelegate:(id)aDelegate
 {
-    if (_delegate === aDelegate)
-        return;
-
     _delegate = aDelegate;
-    _implementedDelegateMethods = 0;
-
-    if ([_delegate respondsToSelector:@selector(imageDidLoad:)])
-        _implementedDelegateMethods |= CPImageDelegate_imageDidLoad_;
-
-    if ([_delegate respondsToSelector:@selector(imageDidError:)])
-        _implementedDelegateMethods |= CPImageDelegate_imageDidError_;
-
-    if ([_delegate respondsToSelector:@selector(imageDidAbort:)])
-        _implementedDelegateMethods |= CPImageDelegate_imageDidAbort_;
 }
 
 /*!
@@ -431,11 +359,6 @@ function CPAppKitImage(aFilename, aSize)
 #endif
 }
 
-- (BOOL)isSingleImage
-{
-    return YES;
-}
-
 - (BOOL)isThreePartImage
 {
     return NO;
@@ -485,7 +408,7 @@ function CPAppKitImage(aFilename, aSize)
         postNotificationName:CPImageDidLoadNotification
         object:self];
 
-    if (_implementedDelegateMethods & CPImageDelegate_imageDidLoad_)
+    if ([_delegate respondsToSelector:@selector(imageDidLoad:)])
         [_delegate imageDidLoad:self];
 }
 
@@ -494,7 +417,7 @@ function CPAppKitImage(aFilename, aSize)
 {
     _loadStatus = CPImageLoadStatusReadError;
 
-    if (_implementedDelegateMethods & CPImageDelegate_imageDidError_)
+    if ([_delegate respondsToSelector:@selector(imageDidError:)])
         [_delegate imageDidError:self];
 }
 
@@ -503,7 +426,7 @@ function CPAppKitImage(aFilename, aSize)
 {
     _loadStatus = CPImageLoadStatusCancelled;
 
-    if (_implementedDelegateMethods & CPImageDelegate_imageDidAbort_)
+    if ([_delegate respondsToSelector:@selector(imageDidAbort:)])
         [_delegate imageDidAbort:self];
 }
 
@@ -567,11 +490,6 @@ function CPAppKitImage(aFilename, aSize)
     return _isVertical;
 }
 
-- (BOOL)isSingleImage
-{
-    return NO;
-}
-
 - (BOOL)isThreePartImage
 {
     return YES;
@@ -636,11 +554,6 @@ var CPThreePartImageImageSlicesKey  = @"CPThreePartImageImageSlicesKey",
     return _imageSlices;
 }
 
-- (BOOL)isSingleImage
-{
-    return NO;
-}
-
 - (BOOL)isThreePartImage
 {
     return NO;

AppKit/CPImageView.j

@@ -26,10 +26,6 @@
 @import "CPImage.j"
 @import "CPShadowView.j"
 
-@global CPImagesPboardType
-@global appkit_tag_dom_elements
-
-@typedef CPImageAlignment
 CPImageAlignCenter      = 0;
 CPImageAlignTop         = 1;
 CPImageAlignTopLeft     = 2;
@@ -71,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
@@ -88,37 +82,26 @@ var CPImageViewEmptyPlaceholderImage = nil;
     if (self)
     {
 #if PLATFORM(DOM)
-        [self _createDOMImageElement];
+        _DOMImageElement = document.createElement("img");
+        _DOMImageElement.style.position = "absolute";
+        _DOMImageElement.style.left = "0px";
+        _DOMImageElement.style.top = "0px";
+
+        if ([CPPlatform supportsDragAndDrop])
+        {
+            _DOMImageElement.setAttribute("draggable", "true");
+            _DOMImageElement.style["-khtml-user-drag"] = "element";
+        }
+
+        CPDOMDisplayServerAppendChild(_DOMElement, _DOMImageElement);
+
+        _DOMImageElement.style.visibility = "hidden";
 #endif
     }
 
     return self;
 }
 
-- (void)_createDOMImageElement
-{
-#if PLATFORM(DOM)
-    if (_DOMImageElement)
-        return;
-
-    _DOMImageElement = document.createElement("img");
-    _DOMImageElement.style.position = "absolute";
-    _DOMImageElement.style.left = "0px";
-    _DOMImageElement.style.top = "0px";
-
-    if ([CPPlatform supportsDragAndDrop])
-    {
-        _DOMImageElement.setAttribute("draggable", "true");
-        _DOMImageElement.style["-khtml-user-drag"] = "element";
-    }
-
-    _DOMImageElement.style.visibility = "hidden";
-    AppKitTagDOMElement(self, _DOMImageElement);
-
-    CPDOMDisplayServerAppendChild(_DOMElement, _DOMImageElement);
-#endif
-}
-
 /*!
     Returns the view's image.
 */
@@ -150,9 +133,6 @@ var CPImageViewEmptyPlaceholderImage = nil;
     var newImage = [self objectValue];
 
 #if PLATFORM(DOM)
-    if (!_DOMImageElement)
-        [self _createDOMImageElement];
-
     _DOMImageElement.src = newImage ? [newImage filename] : [CPImageViewEmptyPlaceholderImage filename];
 #endif
 
@@ -179,7 +159,6 @@ var CPImageViewEmptyPlaceholderImage = nil;
 
 - (void)imageDidLoad:(CPNotification)aNotification
 {
-    [[CPNotificationCenter defaultCenter] removeObserver:self name:CPImageDidLoadNotification object:[self objectValue]];
     [self hideOrDisplayContents];
 
     [self setNeedsLayout];
@@ -269,7 +248,7 @@ var CPImageViewEmptyPlaceholderImage = nil;
     [self setNeedsDisplay:YES];
 }
 
-- (CPUInteger)imageScaling
+- (unsigned)imageScaling
 {
     return [self currentValueForThemeAttribute:@"image-scaling"];
 }
@@ -318,8 +297,8 @@ var CPImageViewEmptyPlaceholderImage = nil;
         y = 0.0,
         insetWidth = (_hasShadow ? [_shadowView horizontalInset] : 0.0),
         insetHeight = (_hasShadow ? [_shadowView verticalInset] : 0.0),
-        boundsWidth = CGRectGetWidth(bounds),
-        boundsHeight = CGRectGetHeight(bounds),
+        boundsWidth = _CGRectGetWidth(bounds),
+        boundsHeight = _CGRectGetHeight(bounds),
         width = boundsWidth - insetWidth,
         height = boundsHeight - insetHeight;
 
@@ -417,10 +396,10 @@ var CPImageViewEmptyPlaceholderImage = nil;
 #endif
     }
 
-    _imageRect = CGRectMake(x, y, width, height);
+    _imageRect = _CGRectMake(x, y, width, height);
 
     if (_hasShadow)
-        [_shadowView setFrame:CGRectMake(x - [_shadowView leftInset], y - [_shadowView topInset], width + insetWidth, height + insetHeight)];
+        [_shadowView setFrame:_CGRectMake(x - [_shadowView leftInset], y - [_shadowView topInset], width + insetWidth, height + insetHeight)];
 }
 
 - (void)mouseDown:(CPEvent)anEvent
@@ -492,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];
 }
 
-- (id)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",
@@ -533,12 +498,28 @@ var CPImageViewImageKey          = @"CPImageViewImageKey",
 */
 - (id)initWithCoder:(CPCoder)aCoder
 {
+#if PLATFORM(DOM)
+    _DOMImageElement = document.createElement("img");
+    _DOMImageElement.style.position = "absolute";
+    _DOMImageElement.style.left = "0px";
+    _DOMImageElement.style.top = "0px";
+    _DOMImageElement.style.visibility = "hidden";
+    if ([CPPlatform supportsDragAndDrop])
+    {
+        _DOMImageElement.setAttribute("draggable", "true");
+        _DOMImageElement.style["-khtml-user-drag"] = "element";
+    }
+
+    if (typeof(appkit_tag_dom_elements) !== "undefined" && !!appkit_tag_dom_elements)
+        _DOMImageElement.setAttribute("data-cappuccino-view", [self className]);
+#endif
+
     self = [super initWithCoder:aCoder];
 
     if (self)
     {
 #if PLATFORM(DOM)
-        [self _createDOMImageElement];
+        _DOMElement.appendChild(_DOMImageElement);
 #endif
 
         [self setHasShadow:[aCoder decodeBoolForKey:CPImageViewHasShadowKey]];
@@ -564,12 +545,17 @@ var CPImageViewImageKey          = @"CPImageViewImageKey",
     // We do this in order to avoid encoding the _shadowView, which
     // should just automatically be created programmatically as needed.
     if (_shadowView)
-        [_shadowView removeFromSuperview];
+    {
+        var actualSubviews = _subviews;
+
+        _subviews = [_subviews copy];
+        [_subviews removeObjectIdenticalTo:_shadowView];
+    }
 
     [super encodeWithCoder:aCoder];
 
     if (_shadowView)
-        [self addSubview:_shadowView];
+        _subviews = actualSubviews;
 
     [aCoder encodeBool:_hasShadow forKey:CPImageViewHasShadowKey];
     [aCoder encodeInt:_imageAlignment forKey:CPImageViewImageAlignmentKey];
@@ -579,21 +565,3 @@ var CPImageViewImageKey          = @"CPImageViewImageKey",
 }
 
 @end
-
-@implementation CPImage (CachedImage)
-
-+ (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,23 +26,19 @@
 @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];
 
-@typedef CPBindingOperationKind
 var CPBindingOperationAnd = 0,
     CPBindingOperationOr  = 1;
 
 @implementation CPBinder : CPObject
 {
     CPDictionary    _info;
-    id              _source @accessors(getter=source);
+    id              _source;
 
     JSObject        _suppressedNotifications;
     JSObject        _placeholderForMarker;
@@ -71,20 +67,6 @@ var CPBindingOperationAnd = 0,
     return [[bindingsMap objectForKey:[anObject UID]] objectForKey:aBinding];
 }
 
-+ (void)_reverseSetValueFromExclusiveBinderForObject:(id)anObject
-{
-    var bindersByBindingName = [bindingsMap objectForKey:[anObject UID]];
-
-    [bindersByBindingName enumerateKeysAndObjectsUsingBlock:function(binding, binder, stop)
-    {
-        if ([binder isKindOfClass:[self class]])
-        {
-            [binder reverseSetValueFor:binding];
-            stop(YES);
-        }
-    }];
-}
-
 + (CPDictionary)infoForBinding:(CPString)aBinding forObject:(id)anObject
 {
     var theBinding = [self getBinding:aBinding forObject:anObject];
@@ -112,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];
@@ -123,7 +105,6 @@ var CPBindingOperationAnd = 0,
 + (void)unbindAllForObject:(id)anObject
 {
     var bindings = [bindingsMap objectForKey:[anObject UID]];
-
     if (!bindings)
         return;
 
@@ -131,24 +112,19 @@ var CPBindingOperationAnd = 0,
         count = allKeys.length;
 
     while (count--)
-        [anObject unbind:allKeys[count]];
+        [anObject unbind:[bindings objectForKey:allKeys[count]]];
 
     [bindingsMap removeObjectForKey:[anObject UID]];
 }
 
 - (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 = {};
 
@@ -157,13 +133,12 @@ var CPBindingOperationAnd = 0,
 
         [self _updatePlaceholdersWithOptions:options forBinding:aName];
 
-        [aDestination addObserver:self forKeyPath:aKeyPath options:0 context:aBinding];
+        [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]];
         }
 
@@ -174,43 +149,21 @@ var CPBindingOperationAnd = 0,
     return self;
 }
 
-+ (BOOL)isBindingAllowed:(CPString)aBinding forObject:(id)anObject
-{
-    if ([[anObject class] isBindingExclusive:aBinding])
-    {
-        var bindingsForObject = [bindingsMap objectForKey:[anObject UID]],
-            allBindings = [bindingsForObject allKeys],
-            count = [allBindings count];
-
-        while (count--)
-        {
-            if ([[anObject class] isBindingExclusive:allBindings[count]])
-                return NO;
-        }
-    }
-
-    return YES;
-}
-
-- (void)raiseIfNotApplicable:(id)aValue forKeyPath:(CPString)keyPath options:(CPDictionary)options
-{
-    if (aValue === CPNotApplicableMarker && [options objectForKey:CPRaisesForNotApplicableKeysBindingOption])
-    {
-       [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];
@@ -257,7 +210,6 @@ var CPBindingOperationAnd = 0,
         return;
 
     var objectSuppressions = _suppressedNotifications[[anObject UID]];
-
     if (objectSuppressions && objectSuppressions[aKeyPath])
         return;
 
@@ -276,7 +228,6 @@ var CPBindingOperationAnd = 0,
         if (!valueTransformer)
         {
             var valueTransformerClass = CPClassFromString(valueTransformerName);
-
             if (valueTransformerClass)
             {
                 valueTransformer = [[valueTransformerClass alloc] init];
@@ -290,11 +241,7 @@ var CPBindingOperationAnd = 0,
     if (valueTransformer)
         aValue = [valueTransformer transformedValue:aValue];
 
-    // If the value is nil AND the source doesn't respond to setPlaceholderString: then
-    // we set the value to the placeholder. Otherwise, we do not want to short cut the process
-    // of setting the placeholder that is based on the fact that the value is nil.
-    if ((aValue === undefined || aValue === nil || aValue === [CPNull null])
-        && ![_source respondsToSelector:@selector(setPlaceholderString:)])
+    if (aValue === undefined || aValue === nil || aValue === [CPNull null])
         aValue = [options objectForKey:CPNullPlaceholderBindingOption] || nil;
 
     return aValue;
@@ -338,7 +285,6 @@ var CPBindingOperationAnd = 0,
 
     var uid = [anObject UID],
         objectSuppressions = _suppressedNotifications[uid];
-
     if (!objectSuppressions)
         _suppressedNotifications[uid] = objectSuppressions = {};
 
@@ -355,7 +301,6 @@ var CPBindingOperationAnd = 0,
 
     var uid = [anObject UID],
         objectSuppressions = _suppressedNotifications[uid];
-
     if (!objectSuppressions)
         return;
 
@@ -372,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];
     }
 }
@@ -382,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;
 }
 
@@ -396,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
@@ -415,16 +357,11 @@ var CPBindingOperationAnd = 0,
     [CPBinder exposeBinding:aBinding forClass:[self class]];
 }
 
-+ (Class)_binderClassForBinding:(CPString)aBinding
++ (Class)_binderClassForBinding:(CPString)theBinding
 {
     return [CPBinder class];
 }
 
-+ (BOOL)isBindingExclusive:(CPString)aBinding
-{
-    return NO;
-}
-
 - (CPArray)exposedBindings
 {
     var exposedBindings = [],
@@ -453,11 +390,6 @@ var CPBindingOperationAnd = 0,
     if (!anObject || !aKeyPath)
         return CPLog.error("Invalid object or path on " + self + " for " + aBinding);
 
-    if (![CPBinder isBindingAllowed:aBinding forObject:self])
-    {
-        CPLog.warn([self description] + " : cannot bind " + aBinding + " because another binding with the same functionality is already in use.");
-        return;
-    }
     //if (![[self exposedBindings] containsObject:aBinding])
     //    CPLog.warn("No binding exposed on " + self + " for " + aBinding);
 
@@ -478,7 +410,7 @@ var CPBindingOperationAnd = 0,
     [binderClass unbind:aBinding forObject:self];
 }
 
-- (CPString)_replacementKeyPathForBinding:(CPString)binding
+- (id)_replacementKeyPathForBinding:(CPString)binding
 {
     return binding;
 }
@@ -487,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
 {
@@ -507,9 +439,8 @@ var CPBindingOperationAnd = 0,
 
 @end
 
-@implementation _CPMultipleValueBooleanBinding : CPBinder
+@implementation _CPKeyValueOrBinding : CPBinder
 {
-    CPBindingOperationKind _operation;
 }
 
 - (void)setValueFor:(CPString)aBinding
@@ -519,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
@@ -534,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];
@@ -681,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
 
@@ -878,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";
@@ -913,7 +580,6 @@ CPSelectedTagBinding                      = @"selectedTag";
 CPSelectedValueBinding                    = @"selectedValue";
 CPSelectedValuesBinding                   = @"selectedValues";
 CPSelectionIndexesBinding                 = @"selectionIndexes";
-CPTargetBinding                           = @"target";
 CPTextColorBinding                        = @"textColor";
 CPTitleBinding                            = @"title";
 CPToolTipBinding                          = @"toolTip";
@@ -922,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,22 +21,25 @@
  */
 
 @import "CPControl.j"
-@import "CPWindow_Constants.j"
 
-@global CPApp
-
-@typedef CPTickMarkPosition
 CPTickMarkBelow                             = 0;
 CPTickMarkAbove                             = 1;
 CPTickMarkLeft                              = CPTickMarkAbove;
 CPTickMarkRight                             = CPTickMarkBelow;
 
-@typedef CPLevelIndicatorStyle
 CPRelevancyLevelIndicatorStyle              = 0;
 CPContinuousCapacityLevelIndicatorStyle     = 1;
 CPDiscreteCapacityLevelIndicatorStyle       = 2;
 CPRatingLevelIndicatorStyle                 = 3;
 
+var _CPLevelIndicatorBezelColor = nil,
+    _CPLevelIndicatorSegmentEmptyColor = nil,
+    _CPLevelIndicatorSegmentNormalColor = nil,
+    _CPLevelIndicatorSegmentWarningColor = nil,
+    _CPLevelIndicatorSegmentCriticalColor = nil,
+
+    _CPLevelIndicatorSpacing = 1;
+
 /*!
     @ingroup appkit
     @class CPLevelIndicator
@@ -59,21 +62,57 @@ CPRatingLevelIndicatorStyle                 = 3;
     BOOL                _isTracking;
 }
 
-+ (CPString)defaultThemeClass
++ (void)initialize
 {
-    return "level-indicator";
-}
+    if (self !== [CPLevelIndicator class])
+        return;
 
-+ (CPDictionary)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
@@ -86,42 +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 (_warningValue < _criticalValue)
-    {
-        if (value >= _criticalValue)
-            filledColor = [self valueForThemeAttribute:@"color-critical"];
-        else if (value >= _warningValue)
-            filledColor = [self valueForThemeAttribute:@"color-warning"];
-    }
-    else
-    {
-        if (value <= _criticalValue)
-            filledColor = [self valueForThemeAttribute:@"color-critical"];
-        else if (value <= _warningValue)
-            filledColor = [self valueForThemeAttribute:@"color-warning"];
-    }
-
+    if (value <= _criticalValue)
+        filledColor = _CPLevelIndicatorSegmentCriticalColor;
+    else if (value <= _warningValue)
+        filledColor = _CPLevelIndicatorSegmentWarningColor;
 
     for (var i = 0; i < segmentCount; i++)
     {
@@ -129,13 +163,13 @@ CPRatingLevelIndicatorStyle                 = 3;
                                                positioned:CPWindowAbove
                           relativeToEphemeralSubviewNamed:bezelView];
 
-        [segmentView setBackgroundColor:(_minValue + i) < value ? filledColor : [self valueForThemeAttribute:@"color-empty"]];
+        [segmentView setBackgroundColor:(_minValue + i) < value ? filledColor : _CPLevelIndicatorSegmentEmptyColor];
     }
 }
 
 - (CPView)createEphemeralSubviewNamed:(CPString)aName
 {
-    return [[CPView alloc] initWithFrame:CGRectMakeZero()];
+    return [[CPView alloc] initWithFrame:_CGRectMakeZero()];
 }
 
 - (CGRect)rectForEphemeralSubviewNamed:(CPString)aViewName
@@ -143,11 +177,11 @@ CPRatingLevelIndicatorStyle                 = 3;
     // TODO Put into theme attributes.
     var bezelHeight = 18,
         segmentHeight = 17,
-        bounds = CGRectCreateCopy([self bounds]);
+        bounds = _CGRectCreateCopy([self bounds]);
 
     if (aViewName == "bezel")
     {
-        bounds.origin.y = (CGRectGetHeight(bounds) - bezelHeight) / 2.0;
+        bounds.origin.y = (_CGRectGetHeight(bounds) - bezelHeight) / 2.0;
         bounds.size.height = bezelHeight;
         return bounds;
     }
@@ -157,21 +191,20 @@ CPRatingLevelIndicatorStyle                 = 3;
             segmentCount = _maxValue - _minValue;
 
         if (segment >= segmentCount)
-            return CGRectMakeZero();
+            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.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;
     }
 
-    return CGRectMakeZero();
+    return _CGRectMakeZero();
 }
 
 /*!
@@ -193,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])
@@ -355,6 +388,8 @@ var CPLevelIndicatorStyleKey                    = "CPLevelIndicatorStyleKey",
 
         _isEditable = [aCoder decodeBoolForKey:CPLevelIndicatorIsEditableKey];
 
+        [self _init];
+
         [self setNeedsLayout];
         [self setNeedsDisplay:YES];
     }

AppKit/CPMenu/CPMenu.j

@@ -25,21 +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
-
-@protocol CPMenuDelegate <CPObject>
-
-@optional
-- (void)menuWillOpen:(CPMenu)aMenu;
-- (void)menuDidClose:(CPMenu)aMenu;
-
-@end
-
-var CPMenuDelegate_menuWillOpen_ = 1 << 1,
-    CPMenuDelegate_menuDidClose_ = 1 << 2;
 
 CPMenuDidAddItemNotification        = @"CPMenuDidAddItemNotification";
 CPMenuDidChangeItemNotification     = @"CPMenuDidChangeItemNotification";
@@ -47,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;
 
@@ -61,27 +56,24 @@ var _CPMenuBarVisible               = NO,
 */
 @implementation CPMenu : CPObject
 {
-    CPMenu              _supermenu;
+    CPMenu          _supermenu;
 
-    CPString            _title;
-    CPString            _name;
+    CPString        _title;
+    CPString        _name;
 
-    CPFont              _font;
+    CPFont          _font;
 
-    float               _minimumWidth;
+    float           _minimumWidth;
 
-    CPMutableArray      _items;
+    CPMutableArray  _items;
 
-    BOOL                _autoenablesItems;
-    BOOL                _showsStateColumn;
+    BOOL            _autoenablesItems;
+    BOOL            _showsStateColumn;
 
-    id <CPMenuDelegate> _delegate;
-    unsigned            _implementedDelegateMethods;
+    id              _delegate;
 
-    int                 _highlightedIndex;
-    _CPMenuWindow       _menuWindow;
-
-    CPEvent             _lastCloseEvent;
+    int             _highlightedIndex;
+    _CPMenuWindow   _menuWindow;
 }
 
 // Managing the Menu Bar
@@ -91,7 +83,7 @@ var _CPMenuBarVisible               = NO,
     if (self !== [CPMenu class])
         return;
 
-    [[self class] setMenuBarAttributes:@{}];
+    [[self class] setMenuBarAttributes:[CPDictionary dictionary]];
 }
 
 + (BOOL)menuBarVisible
@@ -117,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"]];
@@ -162,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
 {
@@ -193,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)
@@ -205,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)
     {
@@ -245,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
@@ -290,7 +275,7 @@ var _CPMenuBarVisible               = NO,
     @param aMenuItem the item to insert
     @param anIndex the index in the menu to insert the item.
 */
-- (void)insertItem:(CPMenuItem)aMenuItem atIndex:(CPUInteger)anIndex
+- (void)insertItem:(CPMenuItem)aMenuItem atIndex:(unsigned)anIndex
 {
     [self insertObject:aMenuItem inItemsAtIndex:anIndex];
 }
@@ -303,7 +288,7 @@ var _CPMenuBarVisible               = NO,
     @param anIndex the index location in the menu for the new item
     @return the new menu item
 */
-- (CPMenuItem)insertItemWithTitle:(CPString)aTitle action:(SEL)anAction keyEquivalent:(CPString)aKeyEquivalent atIndex:(CPUInteger)anIndex
+- (CPMenuItem)insertItemWithTitle:(CPString)aTitle action:(SEL)anAction keyEquivalent:(CPString)aKeyEquivalent atIndex:(unsigned)anIndex
 {
     var item = [[CPMenuItem alloc] initWithTitle:aTitle action:anAction keyEquivalent:aKeyEquivalent];
 
@@ -347,7 +332,7 @@ var _CPMenuBarVisible               = NO,
     Removes the item at the specified index from the menu
     @param anIndex the index of the item to remove
 */
-- (void)removeItemAtIndex:(CPUInteger)anIndex
+- (void)removeItemAtIndex:(unsigned)anIndex
 {
     [self removeObjectFromItemsAtIndex:anIndex];
 }
@@ -367,7 +352,7 @@ var _CPMenuBarVisible               = NO,
     while (count--)
         [_items[count] setMenu:nil];
 
-    [self _highlightItemAtIndex:CPNotFound];
+    _highlightedIndex = CPNotFound;
 
     // Because we are changing _items directly, be sure to notify KVO
     [self willChangeValueForKey:@"items"];
@@ -381,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"];
@@ -394,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
@@ -627,17 +607,15 @@ 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
 {
-    if (!_autoenablesItems)
+    if (![self autoenablesItems])
         return;
 
     var items = [self itemArray];
-
     for (var i = 0; i < [items count]; i++)
     {
         var item = [items objectAtIndex:i];
@@ -645,51 +623,14 @@ var _CPMenuBarVisible               = NO,
         if ([item hasSubmenu])
             continue;
 
-        // If there are enabled bindings for the item, they override anything else
-        var binder = [CPBinder getBinding:CPEnabledBinding forObject:item];
+        var validator = [CPApp targetForAction:[item action] to:[item target] from:item];
 
-        if (binder)
-        {
-            [binder setValueFor:CPEnabledBinding];
-            [[_menuWindow _menuView] tile];
-            return;
-        }
-
-        var validator = [CPApp targetForAction:[item action] to:[item target] from:item],
-            shouldBeEnabled = YES;
-
-        if (!validator)
-        {
-            // If targetForAction: returns nil, it could be that there is no action.
-            // If there is an action and nil is returned, no valid target could be found.
-            if ([item action] || [item target])
-                shouldBeEnabled = 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)])
-                        shouldBeEnabled = NO;
-                }
-            }
-        }
-        else if (![validator respondsToSelector:[item action]])
-            shouldBeEnabled = NO;
+        if (!validator || ![validator respondsToSelector:[item action]])
+            [item setEnabled:NO];
         else if ([validator respondsToSelector:@selector(validateMenuItem:)])
-            shouldBeEnabled = [validator validateMenuItem:item];
+            [item setEnabled:[validator validateMenuItem:item]];
         else if ([validator respondsToSelector:@selector(validateUserInterfaceItem:)])
-            shouldBeEnabled = [validator validateUserInterfaceItem:item];
-
-        [item setEnabled:shouldBeEnabled];
+            [item setEnabled:[validator validateUserInterfaceItem:item]];
     }
 
     [[_menuWindow _menuView] tile];
@@ -734,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];
-    }
 }
 
 //
@@ -868,9 +803,6 @@ var _CPMenuBarVisible               = NO,
 
 + (void)popUpContextMenu:(CPMenu)aMenu withEvent:(CPEvent)anEvent forView:(CPView)aView withFont:(CPFont)aFont
 {
-    // This is needed when we are making several rights click
-    [[_CPMenuManager sharedMenuManager] cancelActiveMenu];
-
     [aMenu _menuWillOpen];
 
     if (!aFont)
@@ -954,19 +886,9 @@ var _CPMenuBarVisible               = NO,
 
 // Managing the Delegate
 
-- (void)setDelegate:(id <CPMenuDelegate>)aDelegate
+- (void)setDelegate:(id)aDelegate
 {
-    if (_delegate === aDelegate)
-        return;
-
     _delegate = aDelegate;
-    _implementedDelegateMethods = 0;
-
-    if ([_delegate respondsToSelector:@selector(menuWillOpen:)])
-         _implementedDelegateMethods |= CPMenuDelegate_menuWillOpen_;
-
-    if ([_delegate respondsToSelector:@selector(menuDidClose:)])
-        _implementedDelegateMethods |= CPMenuDelegate_menuDidClose_;
 }
 
 - (id)delegate
@@ -976,16 +898,18 @@ var _CPMenuBarVisible               = NO,
 
 - (void)_menuWillOpen
 {
-    [self _sendDelegateMenuWillOpen];
+    var delegate = [self delegate];
+
+    if ([delegate respondsToSelector:@selector(menuWillOpen:)])
+        [delegate menuWillOpen:self];
 }
 
 - (void)_menuDidClose
 {
-    // Remember which event caused this menu to close, if any. CPPopUpButton uses this to detect
-    // when a click on the button itself caused the menu to close.
-    _lastCloseEvent = [CPApp currentEvent];
+    var delegate = [self delegate];
 
-    [self _sendDelegateMenuDidClose];
+    if ([delegate respondsToSelector:@selector(menuDidClose:)])
+        [delegate menuDidClose:self];
 }
 
 // Handling Tracking
@@ -1001,7 +925,7 @@ var _CPMenuBarVisible               = NO,
 {
     [CPApp sendEvent:[CPEvent
         otherEventWithType:CPAppKitDefined
-                  location:CGPointMakeZero()
+                  location:_CGPointMakeZero()
              modifierFlags:0
                  timestamp:0
               windowNumber:0
@@ -1078,7 +1002,7 @@ var _CPMenuBarVisible               = NO,
     Sends the action of the menu item at the specified index.
     @param anIndex the index of the item
 */
-- (void)performActionForItemAtIndex:(CPUInteger)anIndex
+- (void)performActionForItemAtIndex:(unsigned)anIndex
 {
     var item = _items[anIndex];
 
@@ -1149,36 +1073,6 @@ var _CPMenuBarVisible               = NO,
 
 @end
 
-
-@implementation CPMenu (CPMenuDelegate)
-
-/*!
-    @ignore
-    Call delegate menuWillOpen
-*/
-- (void)_sendDelegateMenuWillOpen
-{
-    if (!(_implementedDelegateMethods & CPMenuDelegate_menuWillOpen_))
-        return;
-
-    [_delegate menuWillOpen:self];
-}
-
-/*!
-    @ignore
-    Call delegate menuDidClose
-*/
-- (void)_sendDelegateMenuDidClose
-{
-    if (!(_implementedDelegateMethods & CPMenuDelegate_menuDidClose_))
-        return;
-
-    [_delegate menuDidClose:self];
-}
-
-@end
-
-
 @implementation CPMenu (CPKeyValueCoding)
 
 - (CPUInteger)countOfItems
@@ -1211,13 +1105,12 @@ var _CPMenuBarVisible               = NO,
             return;
 
     [aMenuItem setMenu:self];
-    [self _highlightItemAtIndex:CPNotFound];
     [_items insertObject:aMenuItem atIndex:anIndex];
 
     [[CPNotificationCenter defaultCenter]
         postNotificationName:CPMenuDidAddItemNotification
                       object:self
-                    userInfo:@{ @"CPMenuItemIndex": anIndex }];
+                    userInfo:[CPDictionary dictionaryWithObject:anIndex forKey:@"CPMenuItemIndex"]];
 }
 
 - (void)removeObjectFromItemsAtIndex:(CPUInteger)anIndex
@@ -1226,13 +1119,12 @@ var _CPMenuBarVisible               = NO,
         return;
 
     [[_items objectAtIndex:anIndex] setMenu:nil];
-    [self _highlightItemAtIndex:CPNotFound];
     [_items removeObjectAtIndex:anIndex];
 
     [[CPNotificationCenter defaultCenter]
         postNotificationName:CPMenuDidRemoveItemNotification
                       object:self
-                    userInfo:@{ @"CPMenuItemIndex": anIndex }];
+                    userInfo:[CPDictionary dictionaryWithObject:anIndex forKey:@"CPMenuItemIndex"]];
 }
 
 @end
@@ -1240,8 +1132,7 @@ var _CPMenuBarVisible               = NO,
 var CPMenuTitleKey              = @"CPMenuTitleKey",
     CPMenuNameKey               = @"CPMenuNameKey",
     CPMenuItemsKey              = @"CPMenuItemsKey",
-    CPMenuShowsStateColumnKey   = @"CPMenuShowsStateColumnKey",
-    CPMenuAutoEnablesItemsKey   = @"CPMenuAutoEnablesItemsKey";
+    CPMenuShowsStateColumnKey   = @"CPMenuShowsStateColumnKey";
 
 @implementation CPMenu (CPCoding)
 
@@ -1263,7 +1154,7 @@ var CPMenuTitleKey              = @"CPMenuTitleKey",
 
         _showsStateColumn = ![aCoder containsValueForKey:CPMenuShowsStateColumnKey] || [aCoder decodeBoolForKey:CPMenuShowsStateColumnKey];
 
-        _autoenablesItems = ![aCoder containsValueForKey:CPMenuAutoEnablesItemsKey] || [aCoder decodeBoolForKey:CPMenuAutoEnablesItemsKey];
+        _autoenablesItems = YES;
 
         [self setMinimumWidth:0];
     }
@@ -1286,9 +1177,6 @@ var CPMenuTitleKey              = @"CPMenuTitleKey",
 
     if (!_showsStateColumn)
         [aCoder encodeBool:_showsStateColumn forKey:CPMenuShowsStateColumnKey];
-
-    if (!_autoenablesItems)
-        [aCoder encodeBool:_autoenablesItems forKey:CPMenuAutoEnablesItemsKey];
 }
 
 @end

AppKit/CPMenu/_CPMenuBarWindow.j

@@ -1,37 +1,18 @@
-/*
- * _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
-@class CPMenu
 
-@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
 {
+    CPMenu      _menu;
     CPView      _highlightView;
     CPArray     _menuItemViews;
 
@@ -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,14 +52,12 @@
     // 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];
 
     if (self)
     {
-        _constrainsToUsableScreen = NO;
-
         [self setLevel:CPMainMenuWindowLevel];
         [self setAutoresizingMask:CPWindowWidthSizable];
 
@@ -130,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];
 }
@@ -143,7 +137,6 @@
     _textColor = aColor;
 
     [_menuItemViews makeObjectsPerformSelector:@selector(setTextColor:) withObject:_textColor];
-    [_menuItemViews makeObjectsPerformSelector:@selector(setParentMenuTextColor:) withObject:_textColor];
 }
 
 - (void)setTitleColor:(CPColor)aColor
@@ -164,7 +157,6 @@
     _textShadowColor = aColor;
 
     [_menuItemViews makeObjectsPerformSelector:@selector(setTextShadowColor:) withObject:_textShadowColor];
-    [_menuItemViews makeObjectsPerformSelector:@selector(setParentMenuTextShadowColor:) withObject:_textShadowColor];
 }
 
 - (void)setTitleShadowColor:(CPColor)aColor
@@ -183,8 +175,6 @@
         return;
 
     _highlightColor = aColor;
-
-    [_menuItemViews makeObjectsPerformSelector:@selector(setParentMenuHighlightColor:) withObject:_highlightColor];
 }
 
 - (void)setHighlightTextColor:(CPColor)aColor
@@ -194,7 +184,7 @@
 
     _highlightTextColor = aColor;
 
-    [_menuItemViews makeObjectsPerformSelector:@selector(setParentMenuHighlightTextColor:) withObject:_highlightTextColor];
+//    [_menuItemViews makeObjectsPerformSelector:@selector(setActivateColor:) withObject:_highlightTextColor];
 }
 
 - (void)setHighlightTextShadowColor:(CPColor)aColor
@@ -204,7 +194,7 @@
 
     _highlightTextShadowColor = aColor;
 
-    [_menuItemViews makeObjectsPerformSelector:@selector(setParentMenuHighlightTextShadowColor:) withObject:_highlightTextShadowColor];
+//    [_menuItemViews makeObjectsPerformSelector:@selector(setActivateShadowColor:) withObject:_highlightTextShadowColor];
 }
 
 - (void)setMenu:(CPMenu)aMenu
@@ -326,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);
@@ -359,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;
 
@@ -369,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;
@@ -383,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]);
         }
@@ -417,7 +402,7 @@
 
     [super setFrame:aRect display:shouldDisplay animate:shouldAnimate];
 
-    if (!CGSizeEqualToSize(size, aRect.size))
+    if (!_CGSizeEqualToSize(size, aRect.size))
         [self tile];
 }
 
@@ -467,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,51 +1,16 @@
-/*
- * _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
 {
     CPTimeInterval      _startTime;
-    CPEvent             _openEvent;
     BOOL                _mouseWasDragged;
     int                 _scrollingState;
     CGPoint             _lastGlobalLocation;
@@ -61,8 +26,6 @@ var STICKY_TIME_INTERVAL            = 0.4,
 
     CPMenuItem          _previousActiveItem;
     int                 _showTimerID;
-
-    int                 _menuBarButtonItemIndex;
 }
 
 + (_CPMenuManager)sharedMenuManager
@@ -104,7 +67,6 @@ var STICKY_TIME_INTERVAL            = 0.4,
     CPApp._activeMenu = menu;
 
     _startTime = [anEvent timestamp];
-    _openEvent = anEvent;
     _scrollingState = _CPMenuManagerScrollingStateNone;
 
     _constraintRect = aRect;
@@ -123,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];
@@ -134,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],
@@ -148,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,
@@ -163,18 +122,23 @@ var STICKY_TIME_INTERVAL            = 0.4,
         if ([menu numberOfItems])
             [self interpretKeyEvent:anEvent forMenu:menu];
 
-        [self _trackAgain];
         return;
     }
 
+    if (_keyBuffer)
+    {
+        if (([anEvent timestamp] - _startTime) > (STICKY_TIME_INTERVAL + [activeMenu numberOfItems] / 2))
+            [self selectNextItemBeginningWith:_keyBuffer inMenu:menu clearBuffer:YES];
+
+        if (type === CPPeriodic)
+            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],
@@ -185,35 +149,6 @@ var STICKY_TIME_INTERVAL            = 0.4,
         activeItemIndex = activeMenuContainer ? [activeMenuContainer itemIndexAtPoint:menuLocation] : CPNotFound,
         activeItem = activeItemIndex !== CPNotFound ? [activeMenu itemAtIndex:activeItemIndex] : nil;
 
-    /*
-    Click outside the menu structure?
-
-    The event which caused the menu to open is not considered even if it's
-    technically a click outside of an open menu, since this would mean the same
-    click which opened the menu could also close it. This is actually common.
-    E.g. you click on a button and it opens a menu below itself.
-    */
-    if (type === CPLeftMouseDown && _openEvent !== anEvent && (!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];
-
     // unhighlight when mouse is moved off the menu
     if (_lastGlobalLocation && CGRectContainsPoint([activeMenuContainer globalFrame], _lastGlobalLocation)
                             && !CGRectContainsPoint([activeMenuContainer globalFrame], globalLocation))
@@ -250,9 +185,9 @@ var STICKY_TIME_INTERVAL            = 0.4,
 
         if (_lastMouseOverMenuView != mouseOverMenuView)
         {
-            [_lastMouseOverMenuView mouseExited:anEvent];
+            [mouseOverMenuView mouseExited:anEvent];
             // FIXME: Possibly multiple of these?
-            [mouseOverMenuView mouseEntered:anEvent];
+            [_lastMouseOverMenuView mouseEntered:anEvent];
 
             _lastMouseOverMenuView = mouseOverMenuView;
         }
@@ -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)
@@ -407,15 +342,6 @@ var STICKY_TIME_INTERVAL            = 0.4,
         [menu cancelTracking];
 }
 
-- (void)cancelActiveMenu
-{
-    if (CPApp._activeMenu)
-    {
-        [self completeTracking];
-        _menuContainerStack = [];
-    }
-}
-
 - (void)completeTracking
 {
     var trackingMenu = [self trackingMenu];
@@ -466,8 +392,8 @@ var STICKY_TIME_INTERVAL            = 0.4,
     {
         var menuContainer = _menuContainerStack[index],
             menuContainerFrame = [menuContainer globalFrame],
-            menuContainerMinX = CGRectGetMinX(menuContainerFrame),
-            menuContainerMaxX = CGRectGetMaxX(menuContainerFrame);
+            menuContainerMinX = _CGRectGetMinX(menuContainerFrame),
+            menuContainerMaxX = _CGRectGetMaxX(menuContainerFrame);
 
         // If within the x bounds of this menu container, return it.
         if (x < menuContainerMaxX && x >= menuContainerMinX)
@@ -563,9 +489,6 @@ var STICKY_TIME_INTERVAL            = 0.4,
     }
     else if (!(modifierFlags & (CPCommandKeyMask | CPControlKeyMask)))
     {
-        if (([anEvent timestamp] - _startTime) > STICKY_TIME_INTERVAL)
-            _keyBuffer = nil;
-
         if (!_keyBuffer)
         {
             _startTime = [anEvent timestamp];
@@ -577,12 +500,12 @@ var STICKY_TIME_INTERVAL            = 0.4,
         else
             _keyBuffer += character;
 
-        [self selectNextItemBeginningWith:_keyBuffer inMenu:menu];
-        _lastGlobalLocation = nil;
+        [self selectNextItemBeginningWith:_keyBuffer inMenu:menu clearBuffer:NO];
+        _lastGlobalLocation = Nil;
     }
 }
 
-- (void)selectNextItemBeginningWith:(CPString)characters inMenu:(CPMenu)menu
+- (void)selectNextItemBeginningWith:(CPString)characters inMenu:(CPMenu)menu clearBuffer:(BOOL)shouldClear
 {
     var iter = [[menu itemArray] objectEnumerator],
         obj;
@@ -599,7 +522,13 @@ var STICKY_TIME_INTERVAL            = 0.4,
         }
     }
 
-    _startTime = [CPEvent currentTimestamp];
+    if (shouldClear)
+    {
+        [CPEvent stopPeriodicEvents];
+        _keyBuffer = Nil;
+    }
+    else
+        _startTime = [CPEvent currentTimestamp];
 }
 
 - (void)scrollToBeginningOfDocument:(CPMenu)menu
@@ -627,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];
@@ -655,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];
@@ -736,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
@@ -746,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,31 +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"
 
-@class _CPMenuView
 
 var _CPMenuWindowPool                       = [],
     _CPMenuWindowPoolCapacity               = 5,
@@ -36,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
 */
@@ -74,24 +57,32 @@ _CPMenuWindowAttachedMenuBackgroundStyle    = 2;
 
 + (void)poolMenuWindow:(_CPMenuWindow)aMenuWindow
 {
-    // FIXME :the poolMenuWindow is called too many times somewhere....
-    if (!aMenuWindow || _CPMenuWindowPool.length >= _CPMenuWindowPoolCapacity || [_CPMenuWindowPool containsObject:aMenuWindow])
+    if (!aMenuWindow || _CPMenuWindowPool.length >= _CPMenuWindowPoolCapacity)
         return;
 
     _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();
-    _unconstrainedFrame = CGRectMakeZero();
+    _constraintRect = _CGRectMakeZero();
+    _unconstrainedFrame = _CGRectMakeZero();
 
     self = [super initWithContentRect:aRect styleMask:CPBorderlessWindowMask];
 
     if (self)
     {
-        _constrainsToUsableScreen = NO;
-
         [self setLevel:CPPopUpMenuWindowLevel];
         [self setHasShadow:YES];
         [self setShadowStyle:CPMenuWindowShadowStyle];
@@ -101,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];
     }
@@ -126,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
@@ -148,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;
     }
@@ -169,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
@@ -212,30 +228,28 @@ _CPMenuWindowAttachedMenuBackgroundStyle    = 2;
 
 - (CGRect)unconstrainedFrame
 {
-    return CGRectMakeCopy(_unconstrainedFrame);
+    return _CGRectMakeCopy(_unconstrainedFrame);
 }
 
 // We need this because if not this will call setFrame: with -frame instead of -unconstrainedFrame, turning
 // the constrained frame into the unconstrained frame.
 - (void)setFrameOrigin:(CGPoint)aPoint
 {
-    [super setFrame:CGRectMake(aPoint.x, aPoint.y, CGRectGetWidth(_unconstrainedFrame), CGRectGetHeight(_unconstrainedFrame))];
+    [super setFrame:_CGRectMake(aPoint.x, aPoint.y, _CGRectGetWidth(_unconstrainedFrame), _CGRectGetHeight(_unconstrainedFrame))];
 }
 
 - (void)setFrameSize:(CGSize)aSize
 {
-    [super setFrame:CGRectMake(CGRectGetMinX(_unconstrainedFrame), CGRectGetMinY(_unconstrainedFrame), aSize.width, aSize.height)];
+    [super setFrame:_CGRectMake(_CGRectGetMinX(_unconstrainedFrame), _CGRectGetMinY(_unconstrainedFrame), aSize.width, aSize.height)];
 }
 
 - (void)setFrame:(CGRect)aFrame display:(BOOL)shouldDisplay animate:(BOOL)shouldAnimate
 {
     // FIXME: There are integral window issues with platform windows.
     // FIXME: This gets called far too often.
-    _unconstrainedFrame = CGRectMakeCopy(aFrame);
+    _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).
@@ -254,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];
@@ -384,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;
@@ -400,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
@@ -412,7 +426,7 @@ _CPMenuWindowAttachedMenuBackgroundStyle    = 2;
 {
     // Don't return indexes of items that aren't visible.
     if (!CGRectContainsPoint([_menuClipView bounds], [_menuClipView convertPoint:aPoint fromView:nil]))
-        return CPNotFound;
+        return NO;
 
     return [_menuView itemIndexAtPoint:[_menuView convertPoint:aPoint fromView:nil]];
 }
@@ -431,44 +445,6 @@ _CPMenuWindowAttachedMenuBackgroundStyle    = 2;
     CPFont  _font @accessors(property=font);
 }
 
-
-+ (CPString)defaultThemeClass
-{
-    return "menu-view";
-}
-
-+ (CPDictionary)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];
@@ -166,9 +152,6 @@ var CPMenuItemStringRepresentationDictionary = @{
     if (_isEnabled === isEnabled)
         return;
 
-    if (!isEnabled && [self isHighlighted])
-        [_menu _highlightItemAtIndex:CPNotFound];
-
     _isEnabled = !!isEnabled;
 
     [_menuItemView setDirty];

AppKit/CPMenuItem/_CPMenuItemMenuBarView.j

@@ -1,62 +1,54 @@
-/*
- * _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
-@class CPMenuItem
+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
 {
-    CPColor                 _highlightColor @accessors(property=highlightColor);
-    CPColor                 _textColor @accessors(property=textColor);
-    CPColor                 _textShadowColor @accessors(property=textShadowColor);
-    CPColor                 _highlightTextColor @accessors(property=highlightTextColor);
-    CPColor                 _highlightTextShadowColor @accessors(property=highlightTextShadowColor);
-
     CPMenuItem              _menuItem @accessors(property=menuItem);
 
     CPFont                  _font;
+    CPColor                 _textColor;
+    CPColor                 _textShadowColor;
 
     BOOL                    _isDirty;
-    BOOL                    _shouldHighlight;
 
     _CPImageAndTextView     _imageAndTextView;
+    CPView                  _submenuIndicatorView;
 }
 
-+ (CPString)defaultThemeClass
++ (void)initialize
 {
-    return "menu-item-bar-view";
-}
+    if (self !== [_CPMenuItemMenuBarView class])
+        return;
 
-+ (CPDictionary)themeAttributes
-{
-    return @{
-            @"horizontal-margin": 9.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
@@ -70,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];
@@ -79,98 +71,86 @@
 
         [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];
     }
 
     return self;
 }
 
-- (void)setTextColor:(CPColor)aColor
-{
-    _textColor = aColor;
-    [self setNeedsLayout];
-}
-
-- (void)setTextShadowColor:(CPColor)aColor
-{
-    _textShadowColor = aColor;
-    [self setNeedsLayout];
-}
-
-- (void)setHighlightTextColor:(CPColor)aColor
-{
-    _highlightTextColor = aColor;
-    [self setNeedsLayout];
-}
-
-- (void)setHighlightTextShadowColor:(CPColor)aColor
-{
-    _highlightTextShadowColor = aColor;
-    [self setNeedsLayout];
-}
-
 - (CPColor)textColor
 {
     if (![_menuItem isEnabled])
         return [CPColor lightGrayColor];
 
-    return _textColor || [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-text-color" forClass:_CPMenuView];
+    return _textColor || [CPColor colorWithCalibratedRed:70.0 / 255.0 green:69.0 / 255.0 blue:69.0 / 255.0 alpha:1.0];
 }
 
 - (CPColor)textShadowColor
 {
     if (![_menuItem isEnabled])
-        return [CPColor clearColor];
+        return [CPColor colorWithWhite:0.8 alpha:0.8];
 
-    return _textShadowColor || [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-text-shadow-color" forClass:_CPMenuView];
-}
-
-- (CPColor)highlightTextColor
-{
-    if (![_menuItem isEnabled])
-        return [CPColor lightGrayColor];
-
-    return _highlightTextColor || [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-highlight-text-color" forClass:_CPMenuView];
-}
-
-- (CPColor)highlightTextShadowColor
-{
-    if (![_menuItem isEnabled])
-        return [CPColor clearColor];
-
-    return _highlightTextShadowColor || [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-highlight-text-shadow-color" forClass:_CPMenuView];
-}
-
-- (CPColor)highlightColor
-{
-    return _highlightColor || [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-window-background-selected-color" forClass:_CPMenuView];
+    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 setText:[_menuItem title]];
     [_imageAndTextView setFont:[_menuItem font] || [_CPMenuBarWindow font]];
     [_imageAndTextView setVerticalAlignment:CPCenterVerticalTextAlignment];
-    [_imageAndTextView setTextShadowOffset:CGSizeMake(0.0, 1.0)];
     [_imageAndTextView setImage:[_menuItem image]];
+    [_imageAndTextView setText:[_menuItem title]];
+    [_imageAndTextView setTextColor:[self textColor]];
+    [_imageAndTextView setTextShadowColor:[self textShadowColor]];
+    [_imageAndTextView setTextShadowOffset:CGSizeMake(0.0, 1.0)];
     [_imageAndTextView sizeToFit];
 
     var imageAndTextViewFrame = [_imageAndTextView frame];
 
     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];
-    [self setNeedsLayout];
 }
 
 - (void)highlight:(BOOL)shouldHighlight
@@ -179,20 +159,17 @@
     if (![_menuItem isEnabled])
         shouldHighlight = NO;
 
-    _shouldHighlight = shouldHighlight;
-    [self setNeedsLayout];
-}
-
-- (void)layoutSubviews
-{
-    if (_shouldHighlight)
+    if (shouldHighlight)
     {
         if (![_menuItem _isMenuBarButton])
-            [self setBackgroundColor:[self highlightColor]];
+            [self setBackgroundColor:SelectionColor];
 
         [_imageAndTextView setImage:[_menuItem alternateImage] || [_menuItem image]];
-        [_imageAndTextView setTextColor:[self highlightTextColor]];
-        [_imageAndTextView setTextShadowColor:[self highlightTextShadowColor]];
+        [_imageAndTextView setTextColor:[CPColor whiteColor]];
+        [_imageAndTextView setTextShadowColor:_CPMenuItemTextShadowColor];
+
+        [_submenuIndicatorView setColor:[CPColor whiteColor]];
+        [_submenuIndicatorView setShadowColor:[CPColor colorWithWhite:0.1 alpha:0.7]];
     }
     else
     {
@@ -201,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,41 +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"
 
-@class CPMenuItem
 
+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;
@@ -43,32 +34,26 @@
     CPView                  _submenuIndicatorView;
 }
 
-+ (CPString)defaultThemeClass
++ (void)initialize
 {
-    return "menu-item-standard-view";
-}
+    if (self !== [_CPMenuItemStandardView class])
+        return;
 
-+ (CPDictionary)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
@@ -78,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
@@ -110,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];
@@ -126,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
@@ -137,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
@@ -150,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];
@@ -201,7 +162,7 @@
         hasSubmenu = [_menuItem hasSubmenu];
 
     if (hasKeyEquivalent || hasSubmenu)
-        x += [self valueForThemeAttribute:@"right-columns-margin"];
+        x += RIGHT_COLUMNS_MARGIN;
 
     if (hasKeyEquivalent)
     {
@@ -212,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];
@@ -222,7 +183,7 @@
         height = MAX(height, CGRectGetHeight(keyEquivalentViewFrame));
 
         if (hasSubmenu)
-            x += [self valueForThemeAttribute:@"right-columns-margin"];
+            x += RIGHT_COLUMNS_MARGIN;
     }
     else
         [_keyEquivalentView setHidden:YES];
@@ -241,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)
     {
@@ -261,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];
@@ -274,76 +235,40 @@
     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];
     }
 }
 
-- (BOOL)isHighlighted
-{
-    return _highlighted;
-}
-
 @end
 
 @implementation _CPMenuItemSubmenuIndicatorView : CPView

AppKit/CPMenuItem/_CPMenuItemView.j

@@ -1,33 +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"
 
-@class CPMenuItem
-@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
@@ -35,7 +24,7 @@
 @implementation _CPMenuItemView : CPView
 {
     CPMenuItem              _menuItem;
-    CPView                  _view       @accessors(property=view, readonly);
+    CPView                  _view;
 
     CPFont                  _font;
     CPColor                 _textColor;
@@ -49,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;
 }
 
-+ (CPDictionary)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];
@@ -113,6 +111,7 @@
             _view = menuItemView;
         }
     }
+
     else if ([_menuItem menu] == [CPApp mainMenu])
     {
         if (![_view isKindOfClass:[_CPMenuItemMenuBarView class]])
@@ -220,36 +219,6 @@
     return [_menuItem isEnabled] ? (_textShadowColor ? _textShadowColor : [CPColor colorWithWhite:1.0 alpha:0.8]) : [CPColor colorWithWhite:0.8 alpha:0.8];
 }
 
-- (void)setParentMenuHighlightColor:(CPColor)aColor
-{
-    if ([_view respondsToSelector:@selector(setHighlightColor:)])
-        [_view setHighlightColor:aColor];
-}
-
-- (void)setParentMenuHighlightTextColor:(CPColor)aColor
-{
-    if ([_view respondsToSelector:@selector(setHighlightTextColor:)])
-        [_view setHighlightTextColor:aColor];
-}
-
-- (void)setParentMenuHighlightTextShadowColor:(CPColor)aColor
-{
-    if ([_view respondsToSelector:@selector(setHighlightTextShadowColor:)])
-        [_view setHighlightTextShadowColor:aColor];
-}
-
-- (void)setParentMenuTextColor:(CPColor)aColor
-{
-    if ([_view respondsToSelector:@selector(setTextColor:)])
-        [_view setTextColor:aColor];
-}
-
-- (void)setParentMenuTextShadowColor:(CPColor)aColor
-{
-    if ([_view respondsToSelector:@selector(setTextShadowColor:)])
-        [_view setTextShadowColor:aColor];
-}
-
 @end
 
 @implementation _CPMenuItemArrowView : CPView
@@ -276,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
@@ -51,7 +49,7 @@
     CPCountedSet    _observedKeys;
 }
 
-+ (void)initialize
++ (id)initialize
 {
     if (self !== [CPObjectController class])
         return;
@@ -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;
@@ -459,13 +455,13 @@ var CPObjectControllerContentKey                        = @"CPObjectControllerCo
 
 - (BOOL)isEqual:(id)anObject
 {
-    if (self === anObject)
-        return YES;
+    if ([anObject class] === [self class])
+    {
+        if (anObject._observer === _observer && [anObject._keyPath isEqual:_keyPath] && [anObject._object isEqual:_object])
+            return YES;
+    }
 
-    if (!anObject || [anObject class] !== [self class] || anObject._observer !== _observer || anObject._keyPath !== _keyPath || anObject._object !== _object)
-            return NO;
-
-    return YES;
+    return NO;
 }
 
 - (void)observeValueForKeyPath:(CPString)aKeyPath ofObject:(id)anObject change:(CPDictionary)change context:(id)context
@@ -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];
 
@@ -572,13 +560,13 @@ var CPObjectControllerContentKey                        = @"CPObjectControllerCo
     }
 }
 
-- (void)insertObject:(id)anObject atIndex:(CPUInteger)anIndex
+- (void)insertObject:(id)anObject atIndex:(unsigned)anIndex
 {
     for (var i = 0, count = [_observationProxies count]; i < count; i++)
     {
         var proxy = [_observationProxies objectAtIndex:i],
             keyPath = [proxy keyPath],
-            operator = keyPath.charAt(0) === ".";
+            operator = keyPath.indexOf(".") === 0;
 
         if (operator)
             [self willChangeValueForKey:keyPath];
@@ -592,7 +580,7 @@ var CPObjectControllerContentKey                        = @"CPObjectControllerCo
     [super insertObject:anObject atIndex:anIndex];
 }
 
-- (void)removeObjectAtIndex:(CPUInteger)anIndex
+- (void)removeObjectAtIndex:(unsigned)anIndex
 {
     var currentObject = [self objectAtIndex:anIndex];
 
@@ -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];
@@ -614,7 +602,7 @@ var CPObjectControllerContentKey                        = @"CPObjectControllerCo
     [super removeObjectAtIndex:anIndex];
 }
 
-- (CPArray)objectsAtIndexes:(CPIndexSet)theIndexes
+- (_CPObservableArray)objectsAtIndexes:(CPIndexSet)theIndexes
 {
     return [_CPObservableArray arrayWithArray:[super objectsAtIndexes:theIndexes]];
 }
@@ -629,7 +617,7 @@ var CPObjectControllerContentKey                        = @"CPObjectControllerCo
    [self removeObjectAtIndex:[self count]];
 }
 
-- (void)replaceObjectAtIndex:(CPUInteger)anIndex withObject:(id)anObject
+- (void)replaceObjectAtIndex:(unsigned)anIndex withObject:(id)anObject
 {
     var currentObject = [self objectAtIndex:anIndex];
 
@@ -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
@@ -749,7 +731,7 @@ var CPObjectControllerContentKey                        = @"CPObjectControllerCo
 
 - (void)setValue:(id)theValue forKey:(CPString)theKeyPath
 {
-    [self setValue:theValue forKeyPath:theKeyPath];
+    [self setValue:theKeyPath forKeyPath:theKeyPath];
 }
 
 - (unsigned)count
@@ -808,20 +790,15 @@ var CPObjectControllerContentKey                        = @"CPObjectControllerCo
 
 - (void)removeObserver:(id)anObject forKeyPath:(CPString)aKeyPath
 {
-    [_observationProxies enumerateObjectsUsingBlock:function(aProxy, idx, stop)
-    {
-        if (aProxy._object === self && aProxy._keyPath == aKeyPath && aProxy._observer === anObject)
-        {
-            var observedObjects = _observedObjectsByKeyPath[aKeyPath];
+    var proxy = [[_CPObservationProxy alloc] initWithKeyPath:aKeyPath observer:anObject object:self],
+        index = [_observationProxies indexOfObject:proxy];
 
-            [observedObjects removeObserver:aProxy forKeyPath:aKeyPath];
-            [_observationProxies removeObjectAtIndex:idx];
+    var observedObjects = _observedObjectsByKeyPath[aKeyPath];
+    [observedObjects removeObserver:[_observationProxies objectAtIndex:index] forKeyPath:aKeyPath];
 
-            _observedObjectsByKeyPath[aKeyPath] = nil;
+    [_observationProxies removeObjectAtIndex:index];
 
-            stop(YES);
-        }
-    }];
+    _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/CPPanel.j

@@ -22,13 +22,10 @@
 
 @import "CPWindow.j"
 
-@global CPApp
 
 CPOKButton      = 1;
 CPCancelButton  = 0;
 
-CPDocModalWindowMask    = 1 << 6;
-
 /*!
     @ingroup appkit
     @class CPPanel
@@ -54,6 +51,8 @@ CPDocModalWindowMask    = 1 << 6;
     @global
     @class CPWindow
 */
+CPDocModalWindowMask    = 1 << 6;
+
 @implementation CPPanel : CPWindow
 {
     BOOL    _becomesKeyOnlyIfNeeded;
@@ -115,29 +114,4 @@ CPDocModalWindowMask    = 1 << 6;
     return NO;
 }
 
-- (BOOL)canBecomeKeyWindow
-{
-    return YES;
-}
-
-
-#pragma mark -
-#pragma mark Overrides
-
-/*!
-    @ignore
-*/
-- (void)cancelOperation:(id)sender
-{
-    if ([[CPApp currentEvent] _couldBeKeyEquivalent] && [self performKeyEquivalent:[CPApp currentEvent]])
-        return;
-
-    [[self firstResponder] tryToPerform:@selector(cancel:) with:self];
-}
-
-- (void)cancel:(id)sender
-{
-    [self performClose:sender];
-}
-
 @end

AppKit/CPPasteboard.j

@@ -22,13 +22,9 @@
 
 @import <Foundation/CPObject.j>
 @import <Foundation/CPArray.j>
-@import <Foundation/CPData.j>
 @import <Foundation/CPDictionary.j>
 @import <Foundation/CPPropertyListSerialization.j>
 
-@class CPWebScriptObject
-
-@typedef DataTransfer
 
 CPGeneralPboard         = @"CPGeneralPboard";
 CPFontPboard            = @"CPFontPboard";
@@ -69,7 +65,7 @@ var CPPasteboards = nil,
     unsigned        _changeCount;
     CPString        _stateUID;
 
-    CPWebScriptObject _nativePasteboard;
+    WebScriptObject _nativePasteboard;
 }
 
 /*
@@ -82,7 +78,7 @@ var CPPasteboards = nil,
 
     [self setVersion:1.0];
 
-    CPPasteboards = @{};
+    CPPasteboards = [CPDictionary dictionary];
 
     if (typeof window.cpPasteboardWithName !== "undefined")
         supportsNativePasteboard = YES;
@@ -121,11 +117,11 @@ var CPPasteboards = nil,
 
     if (self)
     {
-//        _name = aName;
+        _name = aName;
         _types = [];
 
-        _owners = @{};
-        _provided = @{};
+        _owners = [CPDictionary dictionary];
+        _provided = [CPDictionary dictionary];
 
         _changeCount = 0;
 
@@ -191,15 +187,13 @@ var CPPasteboards = nil,
 {
     [_types setArray:types];
 
-    _owners = @{};
-    _provided = @{};
+    _owners = [CPDictionary dictionary];
+    _provided = [CPDictionary dictionary];
 
-    if (anOwner)
-    {
-        var count = _types.length;
-        while (count--)
-            [_owners setObject:anOwner forKey:_types[count]];
-    }
+    var count = _types.length;
+
+    while (count--)
+        [_owners setObject:anOwner forKey:_types[count]];
 
     if (_nativePasteboard && shouldUpdate)
     {
@@ -210,7 +204,6 @@ var CPPasteboards = nil,
         _nativePasteboard.declareTypes_(nativeTypes);
         _changeCount = _nativePasteboard.changeCount();
     }
-
     return ++_changeCount;
 }
 
@@ -249,23 +242,19 @@ var CPPasteboards = nil,
 */
 - (void)setString:(CPString)aString forType:(CPString)aType
 {
-    // Putting a non-string on the string pasteboard can lead to strange crashes.
-    if (aString && aString.isa && ![aString isKindOfClass:CPString])
-        [CPException raise:CPInvalidArgumentException reason:"CPPasteboard setString:forType: must be called with a string."];
-
     [self setPropertyList:aString forType:aType];
 }
 
 // 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,12 +20,15 @@
  * 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"
 @import "CPMenuItem.j"
 
+var VISIBLE_MARGIN = 7.0;
+
 CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
 
 /*!
@@ -277,7 +280,7 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
     Selects the item at the specified index
     @param anIndex the index of the item to select
 */
-- (void)setObjectValue:(id)anIndex
+- (void)setObjectValue:(int)anIndex
 {
     var indexOfSelectedItem = [self objectValue];
 
@@ -342,7 +345,7 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
     Returns the item at the specified index or \c nil if the item does not exist.
     @param anIndex the index of the item to obtain
 */
-- (CPMenuItem)itemAtIndex:(CPUInteger)anIndex
+- (CPMenuItem)itemAtIndex:(unsigned)anIndex
 {
     return [[self menu] itemAtIndex:anIndex];
 }
@@ -351,7 +354,7 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
     Returns the title of the item at the specified index or \c nil if no item exists.
     @param anIndex the index of the item
 */
-- (CPString)itemTitleAtIndex:(CPUInteger)anIndex
+- (CPString)itemTitleAtIndex:(unsigned)anIndex
 {
     return [[[self menu] itemAtIndex:anIndex] title];
 }
@@ -665,15 +668,10 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
     if (![self isEnabled] || ![self numberOfItems])
         return;
 
-    var menu = [self menu];
-
-    // Don't reopen the menu based on the same click which caused it to close, e.g. a click on this button.
-    if (menu._lastCloseEvent === anEvent)
-        return;
-
     [self highlight:YES];
 
-    var bounds = [self bounds],
+    var menu = [self menu],
+        bounds = [self bounds],
         minimumWidth = CGRectGetWidth(bounds);
 
     // FIXME: setFont: should set the font on the menu.
@@ -682,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
     {
@@ -771,6 +769,13 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
             [[self selectedItem] setState:CPOffState];
 }
 
+- (void)_reverseSetBinding
+{
+    [_CPPopUpButtonSelectionBinder reverseSetValueForObject:self];
+
+    [super _reverseSetBinding];
+}
+
 @end
 
 @implementation CPPopUpButton (BindingSupport)
@@ -793,20 +798,6 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
     return [super _binderClassForBinding:aBinding];
 }
 
-+ (BOOL)isBindingExclusive:(CPString)aBinding
-{
-    return (aBinding == CPSelectedIndexBinding ||
-           aBinding == CPSelectedTagBinding ||
-           aBinding == CPSelectedValueBinding);
-}
-
-- (void)_reverseSetBinding
-{
-    [_CPPopUpButtonSelectionBinder _reverseSetValueFromExclusiveBinderForObject:self];
-
-    [super _reverseSetBinding];
-}
-
 @end
 
 @implementation _CPPopUpButtonContentBinder : CPBinder
@@ -843,7 +834,7 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
     [self _setContentValuesIfNeeded:contentArray];
 }
 
-- (id)valueForBinding:(CPString)aBinding
+- (void)valueForBinding:(CPString)aBinding
 {
     return [self _content];
 }
@@ -915,7 +906,7 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
 {
 }
 
-- (void)setValue:(CPArray)aValue forBinding:(CPString)aBinding
+- (void)setValue:(id)aValue forBinding:(CPString)aBinding
 {
     [super _setContent:aValue];
 }
@@ -936,8 +927,30 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
 
 @end
 
+var binderForObject = {};
+
 @implementation _CPPopUpButtonSelectionBinder : CPBinder
 {
+    CPString _selectionBinding @accessors;
+}
+
+- (id)initWithBinding:(CPString)aBinding name:(CPString)aName to:(id)aDestination keyPath:(CPString)aKeyPath options:(CPDictionary)options from:(id)aSource
+{
+    self = [super initWithBinding:aBinding name:aName to:aDestination keyPath:aKeyPath options:options from:aSource];
+
+    if (self)
+    {
+        binderForObject[[aSource UID]] = self;
+        _selectionBinding = aName;
+    }
+
+    return self;
+}
+
++ (void)reverseSetValueForObject:(id)aSource
+{
+    var binder = binderForObject[[aSource UID]];
+    [binder reverseSetValueFor:[binder _selectionBinding]];
 }
 
 - (void)setPlaceholderValue:(id)aValue withMarker:(CPString)aMarker forBinding:(CPString)aBinding

AppKit/CPPopover.j

@@ -28,19 +28,8 @@
 @import "CPImageView.j"
 @import "CPResponder.j"
 @import "CPView.j"
-@import "CPViewController.j"
-@import "_CPPopoverWindow.j"
+@import "_CPAttachedWindow.j"
 
-@protocol CPPopoverDelegate <CPObject>
-
-@optional
-- (BOOL)popoverShouldClose:(CPPopover)aPopover;
-- (void)popoverWillClose:(CPPopover)aPopover;
-- (void)popoverDidClose:(CPPopover)aPopover;
-- (void)popoverWillShow:(CPPopover)aPopover;
-- (void)popoverDidShow:(CPPopover)aPopover;
-
-@end
 
 CPPopoverBehaviorApplicationDefined = 0;
 CPPopoverBehaviorTransient          = 1;
@@ -56,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:
@@ -71,16 +60,15 @@ var CPPopoverDelegate_popover_willShow_     = 1 << 0,
 */
 @implementation CPPopover : CPResponder
 {
-    @outlet CPViewController        _contentViewController  @accessors(property=contentViewController);
-    @outlet id <CPPopoverDelegate>  _delegate               @accessors(getter=delegate);
+    @outlet CPViewController    _contentViewController  @accessors(property=contentViewController);
+    @outlet id                  _delegate               @accessors(getter=delegate);
 
-    BOOL                            _animates               @accessors(getter=animates);
-    int                             _appearance             @accessors(property=appearance);
-    int                             _behavior               @accessors(getter=behavior);
+    BOOL                        _animates               @accessors(property=animates);
+    int                         _appearance             @accessors(property=appearance);
+    int                         _behavior               @accessors(getter=behavior);
 
-    _CPPopoverWindow                _popoverWindow;
-    CPView                          _positioningView;
-    int                             _implementedDelegateMethods;
+    _CPAttachedWindow           _attachedWindow;
+    int                         _implementedDelegateMethods;
 }
 
 
@@ -115,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
@@ -126,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];
 }
 
 /*!
@@ -139,6 +125,8 @@ var CPPopoverDelegate_popover_willShow_     = 1 << 0,
 */
 - (CGSize)contentSize
 {
+    if (![_attachedWindow isVisible])
+        return CGRectMakeZero();
     return [[_contentViewController view] frameSize];
 }
 
@@ -147,12 +135,9 @@ var CPPopoverDelegate_popover_willShow_     = 1 << 0,
 
     @param aSize the desired size
 */
-- (void)setContentSize:(CGSize)aSize
+- (void)setContentSize:(CPSize)aSize
 {
-    if (!_popoverWindow)
-        [[_contentViewController view] setFrameSize:aSize];
-    else
-        [_popoverWindow updateFrameWithSize:aSize];
+    [[_contentViewController view] setFrameSize:aSize];
 }
 
 /*!
@@ -162,21 +147,7 @@ var CPPopoverDelegate_popover_willShow_     = 1 << 0,
 */
 - (BOOL)isShown
 {
-    return [_popoverWindow isVisible];
-}
-
-/*!
-    Set if the popover should animate for open/close actions.
-
-    @param shouldAnimate if YES, the popover will be animated.
-*/
-- (void)setAnimates:(BOOL)shouldAnimate
-{
-    if (_animates == shouldAnimate)
-        return;
-
-    _animates = shouldAnimate;
-    [_popoverWindow setAnimates:_animates];
+    return [_attachedWindow isVisible];
 }
 
 /*!
@@ -193,10 +164,10 @@ Set the behavior of the CPPopover. It can be:
         return;
 
     _behavior = aBehavior;
-    [_popoverWindow setStyleMask:[self _styleMaskForBehavior]];
+    [_attachedWindow setStyleMask:[self styleMaskForBehavior]];
 }
 
-- (void)setDelegate:(id <CPPopoverDelegate>)aDelegate
+- (void)setDelegate:(id)aDelegate
 {
     if (_delegate === aDelegate)
         return;
@@ -238,38 +209,38 @@ Set the behavior of the CPPopover. It can be:
     if (!_contentViewController)
         [CPException raise:CPInternalInconsistencyException reason:@"contentViewController must not be nil"];
 
-    // If the popover is currently closing or opening, do nothing. That is what Cocoa does.
-    if ([_popoverWindow isClosing] || [_popoverWindow isOpening])
+    // If the popover is currently closing, do nothing. That is what Cocoa does.
+    if ([_attachedWindow isClosing])
         return;
 
-    _positioningView = positioningView;
+    if (_implementedDelegateMethods & CPPopoverDelegate_popover_willShow_)
+        [_delegate popoverWillShow:self];
 
-    if (!_popoverWindow)
-        _popoverWindow = [[_CPPopoverWindow alloc] initWithContentRect:CGRectMakeZero() styleMask:[self _styleMaskForBehavior]];
+    if (!_attachedWindow)
+    {
+        _attachedWindow = [[_CPAttachedWindow alloc] initWithContentRect:CGRectMakeZero() styleMask:[self styleMaskForBehavior]];
 
-    [_popoverWindow setPlatformWindow:[[positioningView window] platformWindow]];
-    [_popoverWindow setAppearance:_appearance];
-    [_popoverWindow setAnimates:_animates];
-    [_popoverWindow setDelegate:self];
-    [_popoverWindow setMovableByWindowBackground:NO];
-    [_popoverWindow setFrame:[_popoverWindow frameRectForContentRect:[[_contentViewController view] frame]]];
-    [_popoverWindow setContentView:[_contentViewController view]];
+        var parentWindow = [positioningView window];
 
-    if (![self isShown])
-        [self _popoverWillShow];
+        if (![parentWindow isKindOfClass:_CPAttachedWindow])
+            [[CPNotificationCenter defaultCenter] addObserver:self selector:@selector(parentWindowWillClose:) name:CPWindowWillCloseNotification object:parentWindow];
+    }
 
-    [_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 (![self isShown])
-        [self _popoverWindowDidShow];
+    if (!_animates && _implementedDelegateMethods & CPPopoverDelegate_popover_didShow_)
+        [_delegate popoverDidShow:self];
 }
 
-- (unsigned)_styleMaskForBehavior
+- (unsigned)styleMaskForBehavior
 {
-    if (_behavior == CPPopoverBehaviorApplicationDefined)
-        return 0;
-
-    return CPClosableOnBlurWindowMask
+    return (_behavior == CPPopoverBehaviorTransient) ? CPClosableOnBlurWindowMask : 0;
 }
 
 /*!
@@ -285,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;
 
-    [self _popoverWillClose];
+    if (_implementedDelegateMethods & CPPopoverDelegate_popover_willClose_)
+        [_delegate popoverWillClose:self];
 
-    _positioningView = nil;
-    [_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.
 }
 
 
@@ -308,11 +279,12 @@ Set the behavior of the CPPopover. It can be:
 */
 - (IBAction)performClose:(id)sender
 {
-    if ([_popoverWindow isClosing])
+    if ([_attachedWindow isClosing])
         return;
 
-    if (![self _popoverShouldClose])
-        return;
+    if (_implementedDelegateMethods & CPPopoverDelegate_popover_shouldClose_)
+        if (![_delegate popoverShouldClose:self])
+            return;
 
     [self _close];
 }
@@ -322,51 +294,44 @@ Set the behavior of the CPPopover. It can be:
 #pragma mark Delegates
 
 /*! @ignore */
-- (BOOL)_popoverWindowShouldClose
+- (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
+- (void)attachedWindowDidClose:(_CPAttachedWindow)anAttachedWindow
 {
     if (_implementedDelegateMethods & CPPopoverDelegate_popover_didClose_)
         [_delegate popoverDidClose:self];
 }
 
 /*! @ignore */
-- (void)_popoverWindowDidShow
+- (void)attachedWindowDidShow:(_CPAttachedWindow)anAttachedWindow
 {
     if (_implementedDelegateMethods & CPPopoverDelegate_popover_didShow_)
         [_delegate popoverDidShow:self];
 }
 
-/*! @ignore */
-- (BOOL)_popoverShouldClose
-{
-    if (_implementedDelegateMethods & CPPopoverDelegate_popover_shouldClose_)
-        return [_delegate popoverShouldClose:self];
 
-    return YES;
-}
+#pragma mark -
+#pragma mark Notifications
 
-/*! @ignore */
-- (void)_popoverWillClose
-{
-    if (_implementedDelegateMethods & CPPopoverDelegate_popover_willClose_)
-        [_delegate popoverWillClose:self];
-}
+/*!
+    @ignore
 
-/*! @ignore */
-- (void)_popoverWillShow
+    This method is called only when a non-popover parent window
+    is closing. In that case popovers should order out.
+*/
+- (void)parentWindowWillClose:(CPNotification)aNotification
 {
-    if (_implementedDelegateMethods & CPPopoverDelegate_popover_willShow_)
-        [_delegate popoverWillShow:self];
+    [_attachedWindow orderOut:nil];
+    [self performClose:nil];
 }
 
 @end
@@ -382,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,27 +23,29 @@
 @import "CGGeometry.j"
 @import "CPImageView.j"
 @import "CPView.j"
-@import "CPWindow_Constants.j"
 
 
-@typedef CPProgressIndicatorStyle
 /*
     @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
@@ -62,7 +64,7 @@ var CPProgressIndicatorSpinningStyleColors = [];
 
     CPControlSize               _controlSize;
 
-    BOOL                        _indeterminate;
+    BOOL                        _isIndeterminate;
     CPProgressIndicatorStyle    _style;
 
     BOOL                        _isAnimating;
@@ -71,33 +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],
-            @"circular-border-color": [CPNull null],
-            @"circular-border-size": 1,
-            @"circular-color": [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
@@ -116,7 +151,8 @@ var CPProgressIndicatorSpinningStyleColors = [];
 
         _controlSize = CPRegularControlSize;
 
-        [self setNeedsLayout];
+        [self updateBackgroundColor];
+        [self drawBar];
     }
 
     return self;
@@ -278,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];
 }
@@ -293,7 +329,7 @@ var CPProgressIndicatorSpinningStyleColors = [];
 */
 - (BOOL)isIndeterminate
 {
-    return _indeterminate;
+    return _isIndeterminate;
 }
 
 /*!
@@ -307,8 +343,6 @@ var CPProgressIndicatorSpinningStyleColors = [];
 
     _style = aStyle;
 
-    [self setTheme:(_style === CPProgressIndicatorHUDBarStyle) ? [CPTheme defaultHudTheme] : [CPTheme defaultTheme]];
-
     [self updateBackgroundColor];
 }
 
@@ -320,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)];
 }
 
 /*!
@@ -370,13 +405,25 @@ var CPProgressIndicatorSpinningStyleColors = [];
 /* @ignore */
 - (void)drawBar
 {
-    [self setNeedsLayout];
-    [self setNeedsDisplay:YES];
+    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
 {
-    return [[CPView alloc] initWithFrame:CGRectMakeZero()];
+    return [[CPView alloc] initWithFrame:_CGRectMakeZero()];
 }
 
 - (CGRect)rectForEphemeralSubviewNamed:(CPString)aViewName
@@ -389,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;
@@ -400,26 +444,11 @@ 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)
     {
         if (_style == CPProgressIndicatorSpinningStyle)
         {
-            if (!_indeterminate)
-                return;
-
             // This will cause the bar view to go away due to having a nil rect when _style == CPProgressIndicatorSpinningStyle.
             [self layoutEphemeralSubviewNamed:"bar-view"
                                    positioned:CPWindowBelow
@@ -429,70 +458,21 @@ 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
         [self setBackgroundColor:nil];
 }
 
-- (void)drawRect:(CGRect)aRect
-{
-    if (_style == CPProgressIndicatorSpinningStyle && !_indeterminate)
-    {
-        var context = [[CPGraphicsContext currentContext] graphicsPort],
-            rect = CGRectMakeCopy(aRect),
-            borderSize = [self currentValueForThemeAttribute:@"circular-border-size"];
-
-        rect.origin.x += borderSize;
-        rect.origin.y += borderSize;
-        rect.size.width = rect.size.width - borderSize * 2;
-        rect.size.height = rect.size.height - borderSize * 2;
-
-        if ([self doubleValue] > [self minValue] && [self doubleValue] < [self maxValue])
-        {
-            var midX = CGRectGetMidX(rect),
-                midY = CGRectGetMidY(rect),
-                endAngle = Math.PI * 2 * (([self doubleValue] - [self minValue]) / ([self maxValue] - [self minValue])) - Math.PI / 2,
-                radius = MIN(rect.size.width / 2, rect.size.height / 2)
-
-            CGContextBeginPath(context);
-            CGContextSetLineWidth(context, borderSize);
-            CGContextSetFillColor(context, [self currentValueForThemeAttribute:@"circular-color"])
-            CGContextMoveToPoint(context, midX, midY);
-            CGContextAddArc(context, midX, midY, radius, 3 * Math.PI / 2, endAngle, YES)
-            CGContextAddLineToPoint(context, midX, midY);
-            CGContextClosePath(context);
-            CGContextFillPath(context);
-            CGContextStrokePath(context);
-        }
-        else if ([self doubleValue] == [self maxValue])
-        {
-            CGContextBeginPath(context);
-            CGContextSetFillColor(context, [self currentValueForThemeAttribute:@"circular-color"])
-            CGContextAddEllipseInRect(context, rect);
-            CGContextClosePath(context);
-            CGContextFillPath(context);
-        }
-
-        CGContextBeginPath(context);
-        CGContextSetStrokeColor(context , [self currentValueForThemeAttribute:@"circular-border-color"]);
-        CGContextSetLineWidth(context, borderSize);
-        CGContextAddEllipseInRect(context, rect);
-        CGContextClosePath(context);
-        CGContextStrokePath(context);
-    }
-}
-
 @end
 
 
@@ -506,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"];
@@ -520,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];
@@ -531,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"];
@@ -539,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,11 +25,6 @@
 
 @import "CPButton.j"
 
-@class CPRadioGroup
-
-@global CPApp
-
-CPRadioImageOffset = 4.0;
 
 /*!
     @ingroup appkit
@@ -68,6 +63,9 @@ CPRadioImageOffset = 4.0;
     option.
 
 */
+
+CPRadioImageOffset = 4.0;
+
 @implementation CPRadio : CPButton
 {
     CPRadioGroup    _radioGroup;
@@ -152,7 +150,7 @@ CPRadioImageOffset = 4.0;
         [_radioGroup _setSelectedRadio:self];
 }
 
-- (BOOL)sendAction:(SEL)anAction to:(id)anObject
+- (void)sendAction:(SEL)anAction to:(id)anObject
 {
     [super sendAction:anAction to:anObject];
 
@@ -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 _reverseSetValueFromExclusiveBinderForObject:self];
+}
+
+- (CPRadio)selectedRadio
+{
+    return _selectedRadio;
+}
+
+- (CPArray)radios
+{
+    return [_radios allObjects];
 }
 
 @end
@@ -386,85 +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];
-}
-
-+ (BOOL)isBindingExclusive:(CPString)aBinding
-{
-    return (aBinding == CPSelectedIndexBinding ||
-           aBinding == CPSelectedTagBinding ||
-           aBinding == CPSelectedValueBinding);
-}
-
-@end
-
-@implementation _CPRadioGroupSelectionBinder : CPBinder
-{
-}
-
-- (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,13 +21,7 @@
  */
 
 @import <Foundation/CPObject.j>
-@import <Foundation/CPObjJRuntime.j>
 
-@import "CPEvent.j"
-@import "CPCursor.j"
-
-@class CPKeyBinding
-@class CPMenu
 
 CPDeleteKeyCode         = 8;
 CPTabKeyCode            = 9;
@@ -201,18 +195,6 @@ CPDeleteForwardKeyCode  = 46;
     [_nextResponder performSelector:_cmd withObject:anEvent];
 }
 
-/*!
- Notifies the receiver that the mouse entered the receiver's area and that it can adapt the cursor.
- @param anEvent contains information about the exit
- */
-- (void)cursorUpdate:(CPEvent)anEvent
-{
-    if (_nextResponder)
-        [_nextResponder performSelector:_cmd withObject:anEvent];
-    else
-        [[CPCursor arrowCursor] set];
-}
-
 /*!
     Notifies the receiver that the mouse scroll wheel has moved.
     @param anEvent information about the scroll
@@ -370,7 +352,7 @@ CPDeleteForwardKeyCode  = 46;
 var CPResponderNextResponderKey = @"CPResponderNextResponderKey",
     CPResponderMenuKey = @"CPResponderMenuKey";
 
-@implementation CPResponder (CPCoding) <CPCoding>
+@implementation CPResponder (CPCoding)
 
 /*!
     Initializes the responder with data from a coder.

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

AppKit/CPRuleEditor/CPPredicateEditorRowTemplate.j

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

AppKit/CPRuleEditor/CPRuleEditor.j

@@ -20,41 +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";
 
-@protocol CPRuleEditorDelegate <CPObject>
+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
 
-@required
-- (id)ruleEditor:(CPRuleEditor)editor child:(CPInteger)index forCriterion:(id)criterion withRowType:(CPRuleEditorRowType)rowType;
-- (id)ruleEditor:(CPRuleEditor)editor displayValueForCriterion:(id)criterion inRow:(CPInteger)row;
-- (CPInteger)ruleEditor:(CPRuleEditor)editor numberOfChildrenForCriterion:(id)criterion withRowType:(CPRuleEditorRowType)rowType;
-
-@optional
-- (CPDictionary)ruleEditor:(CPRuleEditor)editor predicatePartsForCriterion:(id)criterion withDisplayValue:(id)value inRow:(CPInteger)row;
-- (void)ruleEditorRowsDidChange:(CPNotification)notification;
-
-@end
-
-var CPRuleEditorDelegate_ruleEditor_predicatePartsForCriterion_withDisplayValue_inRow_   = 1 << 1;
+CPRuleEditorRowTypeSimple       = 0;
+CPRuleEditorRowTypeCompound     = 1;
 
 var CPRuleEditorItemPBoardType  = @"CPRuleEditorItemPBoardType",
     itemsContext                = "items",
@@ -84,51 +78,50 @@ var CPRuleEditorItemPBoardType  = @"CPRuleEditorItemPBoardType",
 
 @implementation CPRuleEditor : CPControl
 {
-    BOOL                        _suppressKeyDownHandling;
-    BOOL                        _allowsEmptyCompoundRows;
-    BOOL                        _disallowEmpty;
-    BOOL                        _delegateWantsValidation;
-    BOOL                        _editable;
-    BOOL                        _sendAction;
+    BOOL             _suppressKeyDownHandling;
+    BOOL             _allowsEmptyCompoundRows;
+    BOOL             _disallowEmpty;
+    BOOL             _delegateWantsValidation;
+    BOOL             _editable;
+    BOOL             _sendAction;
 
-    Class                       _rowClass;
+    Class           _rowClass;
 
-    CPIndexSet                  _draggingRows;
-    CPInteger                   _subviewIndexOfDropLine;
-    CPView                      _dropLineView;
+    CPIndexSet      _draggingRows;
+    CPInteger       _subviewIndexOfDropLine;
+    CPView          _dropLineView;
 
-    CPMutableArray              _rowCache;
-    CPMutableArray              _slices;
+    CPMutableArray  _rowCache;
+    CPMutableArray  _slices;
 
-    CPPredicate                 _predicate;
+    CPPredicate     _predicate;
 
-    CPString                    _itemsKeyPath;
-    CPString                    _subrowsArrayKeyPath;
-    CPString                    _typeKeyPath;
-    CPString                    _valuesKeyPath;
-    CPString                    _boundArrayKeyPath @accessors(property=boundArrayKeyPath);
+    CPString        _itemsKeyPath;
+    CPString        _subrowsArrayKeyPath;
+    CPString        _typeKeyPath;
+    CPString        _valuesKeyPath;
+    CPString        _boundArrayKeyPath @accessors(property=boundArrayKeyPath);
 
-    CPView                      _slicesHolder;
-    CPViewAnimation             _currentAnimation;
+    CPView          _slicesHolder;
+    CPViewAnimation _currentAnimation;
 
-    CPInteger                   _lastRow;
-    CPInteger                   _nestingMode;
+    CPInteger       _lastRow;
+    CPInteger       _nestingMode;
 
-    float                       _alignmentGridWidth;
-    float                       _sliceHeight;
+    float           _alignmentGridWidth;
+    float           _sliceHeight;
 
-    id                          _ruleDataSource;
-    id <CPRuleEditorDelegate>   _ruleDelegate;
-    id                          _boundArrayOwner;
-    unsigned                    _implementedDelegateMethods;
+    id              _ruleDataSource;
+    id              _ruleDelegate;
+    id              _boundArrayOwner;
 
-    CPString                    _stringsFilename;
+    CPString        _stringsFilename;
 
-    BOOL                        _isKeyDown;
-    BOOL                        _nestingModeDidChange;
+    BOOL            _isKeyDown;
+    BOOL            _nestingModeDidChange;
 
-    _CPRuleEditorLocalizer      _standardLocalizer @accessors(property=standardLocalizer);
-    CPDictionary                _itemsAndValuesToAddForRowType;
+    _CPRuleEditorLocalizer _standardLocalizer @accessors(property=standardLocalizer);
+    CPDictionary           _itemsAndValuesToAddForRowType;
 }
 
 /*! @cond */
@@ -138,20 +131,10 @@ var CPRuleEditorItemPBoardType  = @"CPRuleEditorItemPBoardType",
     return @"rule-editor";
 }
 
-+ (CPDictionary)themeAttributes
++ (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],
-            @"font-color": [CPNull null],
-            @"add-image": [CPNull null],
-            @"remove-image": [CPNull null],
-            @"vertical-alignment": [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
@@ -161,7 +144,7 @@ var CPRuleEditorItemPBoardType  = @"CPRuleEditorItemPBoardType",
     {
         _slices = [[CPMutableArray alloc] init];
 
-        _sliceHeight = 26.0;
+        _sliceHeight = 26.;
         _nestingMode = CPRuleEditorNestingModeSimple; // 10.5 default is CPRuleEditorNestingModeCompound
         _editable = YES;
         _allowsEmptyCompoundRows = NO;
@@ -231,24 +214,19 @@ var CPRuleEditorItemPBoardType  = @"CPRuleEditorItemPBoardType",
     @discussion CPRuleEditor requires a delegate that implements the required delegate methods to function.
     @see delegate
 */
-- (void)setDelegate:(id <CPRuleEditorDelegate>)aDelegate
+- (void)setDelegate:(id)aDelegate
 {
     if (_ruleDelegate === aDelegate)
         return;
 
     var nc = [CPNotificationCenter defaultCenter];
-
     if (_ruleDelegate)
         [nc removeObserver:_ruleDelegate name:nil object:self];
 
     _ruleDelegate = aDelegate;
-    _implementedDelegateMethods = 0;
 
     if ([_ruleDelegate respondsToSelector:@selector(ruleEditorRowsDidChange:)])
         [nc addObserver:_ruleDelegate selector:@selector(ruleEditorRowsDidChange:) name:CPRuleEditorRowsDidChangeNotification object:nil];
-
-    if ([_ruleDelegate respondsToSelector:@selector(ruleEditor:predicatePartsForCriterion:withDisplayValue:inRow:)])
-        _implementedDelegateMethods |= CPRuleEditorDelegate_ruleEditor_predicatePartsForCriterion_withDisplayValue_inRow_;
 }
 /*!
     @brief Returns a Boolean value that indicates whether the receiver is editable.
@@ -484,7 +462,7 @@ var CPRuleEditorItemPBoardType  = @"CPRuleEditorItemPBoardType",
     @param row The index of a row in the receiver.
     @return The currently chosen items for row @a row.
 */
-- (id)criteriaForRow:(CPInteger)row
+- (id)criteriaForRow:(int)row
 {
     var rowcache = [self _rowCacheForIndex:row];
     if (rowcache)
@@ -503,7 +481,7 @@ var CPRuleEditorItemPBoardType  = @"CPRuleEditorItemPBoardType",
     @return The chosen values (strings, views, or menu items) for row row.
     @discussion The values returned are the same as those returned from the delegate method -#ruleEditor:displayValueForCriterion:inRow:
 */
-- (CPMutableArray)displayValuesForRow:(CPInteger)row
+- (CPMutableArray)displayValuesForRow:(int)row
 {
     var rowcache = [self _rowCacheForIndex:row];
     if (rowcache)
@@ -526,7 +504,7 @@ var CPRuleEditorItemPBoardType  = @"CPRuleEditorItemPBoardType",
     @param rowIndex The index of a row in the receiver.
     @return The index of the parent of the row at @a rowIndex. If the row at @a rowIndex is a root row, returns @c -1.
 */
-- (int)parentRowForRow:(CPInteger)rowIndex
+- (int)parentRowForRow:(int)rowIndex
 {
     if (rowIndex < 0 || rowIndex >= [self numberOfRows])
         [CPException raise:CPRangeException reason:_cmd + @" row " + rowIndex + " is out of range"];
@@ -567,7 +545,7 @@ TODO: implement
     @return The type of the row at @a rowIndex.
     @warning Raises a @c CPRangeException if rowIndex is less than @c 0 or greater than or equal to the number of rows.
 */
-- (CPRuleEditorRowType)rowTypeForRow:(CPInteger)rowIndex
+- (CPRuleEditorRowType)rowTypeForRow:(int)rowIndex
 {
     if (rowIndex < 0 || rowIndex > [self numberOfRows])
         [CPException raise:CPRangeException reason:_cmd + @"row " + rowIndex + " is out of range"];
@@ -588,7 +566,7 @@ TODO: implement
     @return The immediate subrows of the row at @a rowIndex.
     @discussion Rows are numbered starting at @c 0.
 */
-- (CPIndexSet)subrowIndexesForRow:(CPInteger)rowIndex
+- (CPIndexSet)subrowIndexesForRow:(int)rowIndex
 {
     var object;
 
@@ -714,7 +692,7 @@ TODO: implement
     @note Currently, @a shouldAnimate has no effect, rows are always animated when calling this method.
     @see addRow:
 */
-- (void)insertRowAtIndex:(int)rowIndex withType:(unsigned int)rowType asSubrowOfRow:(CPInteger)parentRow animate:(BOOL)shouldAnimate
+- (void)insertRowAtIndex:(int)rowIndex withType:(unsigned int)rowType asSubrowOfRow:(int)parentRow animate:(BOOL)shouldAnimate
 {
 /*
     TODO: raise exceptions if parentRow is greater than or equal to rowIndex, or if rowIndex would fall amongst the children of some other parent, or if the nesting mode forbids this configuration.
@@ -822,7 +800,7 @@ TODO: implement
 */
 - (CPPredicate)predicateForRow:(CPInteger)aRow
 {
-    var predicateParts = @{},
+    var predicateParts = [CPDictionary dictionary],
         items = [self criteriaForRow:aRow],
         count = [items count],
         predicate,
@@ -833,7 +811,7 @@ TODO: implement
         var item = [items objectAtIndex:i],
         //var displayValue = [self _queryValueForItem:item inRow:aRow]; Ask the delegate or get cached value ?.
             displayValue = [[self displayValuesForRow:aRow] objectAtIndex:i],
-            predpart = [self _sendDelegateRuleEditorPredicatePartsForCriterion:item withDisplayValue:displayValue inRow:aRow];
+            predpart = [_ruleDelegate ruleEditor:self predicatePartsForCriterion:item withDisplayValue:displayValue inRow:aRow];
 
         if (predpart)
             [predicateParts addEntriesFromDictionary:predpart];
@@ -1336,7 +1314,7 @@ TODO: implement
     return [_boundArrayOwner mutableArrayValueForKey:_boundArrayKeyPath];
 }
 
-- (BOOL)_nextUnusedItems:(CPArray)items andValues:(CPArray)values forRow:(CPInteger)rowIndex forRowType:(unsigned int)type
+- (BOOL)_nextUnusedItems:(CPArray)items andValues:(CPArray)values forRow:(int)rowIndex forRowType:(unsigned int)type
 {
     var parentItem = [items lastObject], // if empty items array, this is NULL aka the root item;
         childrenCount = [self _queryNumberOfChildrenOfItem:parentItem withRowType:type],
@@ -1398,7 +1376,7 @@ TODO: implement
     return YES;
 }
 
-- (CPMutableArray)_getItemsAndValuesToAddForRow:(CPInteger)rowIndex ofType:(CPRuleEditorRowType)type
+- (CPMutableArray)_getItemsAndValuesToAddForRow:(int)rowIndex ofType:(CPRuleEditorRowType)type
 {
     //var cachedItemsAndValues = _itemsAndValuesToAddForRowType[type];
     //if (cachedItemsAndValues)
@@ -1418,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];
     }
@@ -1441,7 +1416,7 @@ TODO: implement
     [self insertRowAtIndex:insertIndex withType:type asSubrowOfRow:parentRowIndex animate:YES];
 }
 
-- (id)_insertNewRowAtIndex:(int)insertIndex ofType:(CPRuleEditorRowType)rowtype withParentRow:(CPInteger)parentRowIndex
+- (id)_insertNewRowAtIndex:(int)insertIndex ofType:(CPRuleEditorRowType)rowtype withParentRow:(int)parentRowIndex
 {
     var row = [[[self rowClass] alloc] init],
         itemsandvalues = [self _getItemsAndValuesToAddForRow:insertIndex ofType:rowtype],
@@ -1537,13 +1512,26 @@ 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:(CPInteger)aRow atCriteriaIndex:(int)fromItemIndex
+- (void)_changedItem:(id)fromItem toItem:(id)toItem inRow:(int)aRow atCriteriaIndex:(int)fromItemIndex
 {
     var criteria = [self criteriaForRow:aRow],
         displayValues = [self displayValuesForRow:aRow],
@@ -1707,7 +1695,7 @@ TODO: implement
     [super bind:aBinding toObject:observableController withKeyPath:aKeyPath options:options];
 }
 
-- (void)unbind:(CPString)object
+- (void)unbind:(id)object
 {
     _rowClass = [_CPRuleEditorRowObject class];
     [super unbind:object];
@@ -1715,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;
@@ -1739,7 +1727,8 @@ TODO: implement
 {
     if (_delegateWantsValidation)
     {
-        if (![self _delegateRespondsToRuleEditorPredicatePartsForCriterionWithDisplayValueInRow])
+        var selector = @selector(ruleEditor:predicatePartsForCriterion:withDisplayValue:inRow:);
+        if (![_ruleDelegate respondsToSelector:selector])
             return;
 
         _delegateWantsValidation = NO;
@@ -1804,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];
@@ -1887,49 +1876,29 @@ TODO: implement
     return [self valueForThemeAttribute:@"font"];
 }
 
-- (CPColor)_fontColor
+- (CPImage)_addImage
 {
-    return [self valueForThemeAttribute:@"font-color"];
+    return [self valueForThemeAttribute:@"add-image"];
 }
 
-- (CPImage)_imageAdd
+- (CPImage)_removeImage
 {
-    return [self valueForThemeAttribute:@"add-image" inState:CPThemeStateNormal];
-}
-
-- (CPImage)_imageAddHighlighted
-{
-    return [self valueForThemeAttribute:@"add-image" inState:CPThemeStateHighlighted];
-}
-
-- (CPImage)_imageRemove
-{
-    return [self valueForThemeAttribute:@"remove-image" inState:CPThemeStateNormal];
-}
-
-- (CPImage)_imageRemoveHighlighted
-{
-    return [self valueForThemeAttribute:@"remove-image" inState:CPThemeStateHighlighted];
-}
-
-- (CPVerticalTextAlignment)_verticalAlignment
-{
-    return [self valueForThemeAttribute:@"vertical-alignment"];
+    return [self valueForThemeAttribute:@"remove-image"];
 }
 
 - (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 +2016,7 @@ TODO: implement
     return [_ruleDelegate ruleEditor:self child:childIndex forCriterion:item withRowType:type];
 }
 
-- (id)_queryValueForItem:(id)item inRow:(CPInteger)row
+- (id)_queryValueForItem:(id)item inRow:(int)row
 {
     return [_ruleDelegate ruleEditor:self displayValueForCriterion:item inRow:row];
 }
@@ -2068,12 +2037,12 @@ TODO: implement
     _alignmentGridWidth = width;
 }
 
-- (BOOL)_validateItem:(id)item value:(id)value inRow:(CPInteger)row
+- (BOOL)_validateItem:(id)item value:(id)value inRow:(int)row
 {
     return [self _queryCanSelectItem:item displayValue:value inRow:row];
 }
 
-- (BOOL)_queryCanSelectItem:(id)item displayValue:(id)value inRow:(CPInteger)row
+- (BOOL)_queryCanSelectItem:(id)item displayValue:(id)value inRow:(int)row
 {
     return YES;
 }
@@ -2089,7 +2058,7 @@ TODO: implement
     [super setNeedsDisplay:flag];
 }
 
-- (void)setFrameSize:(CGSize)size
+- (void)setFrameSize:(CPSize)size
 {
     [self setNeedsDisplay:YES];
 
@@ -2121,7 +2090,7 @@ TODO: implement
         return;
 
     var point = [self convertPoint:[event locationInWindow] fromView:nil],
-        view = [_slices objectAtIndex:FLOOR(MAX(0, point.y) / _sliceHeight)];
+        view = [_slices objectAtIndex:FLOOR(point.y / _sliceHeight)];
 
     if ([self _dragShouldBeginFromMouseDown:view])
         [self _performDragForSlice:view withEvent:event];
@@ -2157,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
@@ -2170,7 +2139,7 @@ TODO: implement
     return YES;
 }
 
-- (CPDragOperation)draggingEntered:(id /*< CPDraggingInfo >*/)sender
+- (CPDragOperation)draggingEntered:(id < CPDraggingInfo >)sender
 {
     if ([sender draggingSource] === self)
     {
@@ -2200,14 +2169,14 @@ TODO: implement
     _subviewIndexOfDropLine = CPNotFound;
 }
 
-- (CPDragOperation)draggingUpdated:(id /*<CPDraggingInfo>*/)sender
+- (CPDragOperation)draggingUpdated:(id <CPDraggingInfo>)sender
 {
     var point = [self convertPoint:[sender draggingLocation] fromView:nil],
         y = point.y + _sliceHeight / 2,
         indexOfDropLine =  FLOOR(y / _sliceHeight),
         numberOfRows = [self numberOfRows];
 
-    if (indexOfDropLine <= 0 || indexOfDropLine > numberOfRows || (indexOfDropLine >= [_draggingRows firstIndex] && indexOfDropLine <= [_draggingRows lastIndex] + 1))
+    if (indexOfDropLine < 0 || indexOfDropLine > numberOfRows || (indexOfDropLine >= [_draggingRows firstIndex] && indexOfDropLine <= [_draggingRows lastIndex] + 1))
     {
         if (_subviewIndexOfDropLine !== CPNotFound && indexOfDropLine !== _subviewIndexOfDropLine)
             [self _clearDropLine];
@@ -2219,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)
@@ -2237,12 +2206,12 @@ TODO: implement
     return CPDragOperationMove;
 }
 
-- (BOOL)prepareForDragOperation:(id /*< CPDraggingInfo >*/)sender
+- (BOOL)prepareForDragOperation:(id < CPDraggingInfo >)sender
 {
     return (_subviewIndexOfDropLine !== CPNotFound);
 }
 
-- (BOOL)performDragOperation:(id /*< CPDraggingInfo >*/)info
+- (BOOL)performDragOperation:(id < CPDraggingInfo >)info
 {
     var aboveInsertIndexCount = 0,
         object,
@@ -2285,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;
 
@@ -2304,7 +2273,7 @@ TODO: implement
 {
 }
 
-- (void)_setWindow:(CPWindow)window
+- (void)_setWindow:(id)window
 {
     [super _setWindow:window];
 }
@@ -2321,7 +2290,7 @@ TODO: implement
 
 - (void)_postRowCountChangedNotificationOfType:(CPString)notificationName indexes:indexes
 {
-    var userInfo = indexes === nil ? @{} : @{ "indexes": indexes };
+    var userInfo = [CPDictionary dictionaryWithObject:indexes forKey:"indexes"];
     [[CPNotificationCenter defaultCenter] postNotificationName:notificationName object:self userInfo:userInfo];
 }
 
@@ -2367,7 +2336,7 @@ TODO: implement
     return YES;
 }
 
-- (void)_getAllAvailableItems:(id)items values:(id)values asChildrenOfItem:(id)parentItem inRow:(CPInteger)aRow
+- (void)_getAllAvailableItems:(id)items values:(id)values asChildrenOfItem:(id)parentItem inRow:(int)aRow
 {
     var type,
         indexofCriterion,
@@ -2419,33 +2388,6 @@ TODO: implement
 
 @end
 
-
-@implementation CPRuleEditor (CPRuleEditorDelegate)
-
-/*!
-    @ignore
-    Check if the delegate responds to ruleEditor:predicatePartsForCriterion:withDisplayValue:inRow:
-*/
-- (BOOL)_delegateRespondsToRuleEditorPredicatePartsForCriterionWithDisplayValueInRow
-{
-    return _implementedDelegateMethods & CPRuleEditorDelegate_ruleEditor_predicatePartsForCriterion_withDisplayValue_inRow_;
-}
-
-/*!
-    @ignore
-    Call delegate ruleEditor:predicatePartsForCriterion:withDisplayValue:inRow:
-*/
-- (CPDictionary)_sendDelegateRuleEditorPredicatePartsForCriterion:(id)criterion withDisplayValue:(id)value inRow:(CPInteger)row
-{
-    if (!(_implementedDelegateMethods & CPRuleEditorDelegate_ruleEditor_predicatePartsForCriterion_withDisplayValue_inRow_))
-        return @{};
-
-    return [_ruleDelegate ruleEditor:self predicatePartsForCriterion:criterion withDisplayValue:value inRow:row];
-}
-
-@end
-
-
 var CPRuleEditorAlignmentGridWidthKey       = @"CPRuleEditorAlignmentGridWidth",
     CPRuleEditorSliceHeightKey              = @"CPRuleEditorSliceHeight",
     CPRuleEditorStringsFilenameKey          = @"CPRuleEditorStringsFilename",
@@ -2495,7 +2437,7 @@ var CPRuleEditorAlignmentGridWidthKey       = @"CPRuleEditorAlignmentGridWidth",
     return self;
 }
 
-- (void)encodeWithCoder:(CPCoder)coder
+- (void)encodeWithCoder:(id)coder
 {
     [super encodeWithCoder:coder];
 
@@ -2550,7 +2492,7 @@ var CriteriaKey         = @"criteria",
     return "<" + [self className] + ">\nsubrows = " + [subrows description] + "\ncriteria = " + [criteria description] + "\ndisplayValues = " + [displayValues description];
 }
 
-- (id)initWithCoder:(CPCoder)coder
+- (id)initWithCoder:(id)coder
 {
     self = [super init];
     if (self !== nil)
@@ -2564,7 +2506,7 @@ var CriteriaKey         = @"criteria",
     return self;
 }
 
-- (void)encodeWithCoder:(CPCoder)coder
+- (void)encodeWithCoder:(id)coder
 {
     [coder encodeObject:subrows forKey:SubrowsKey];
     [coder encodeObject:criteria forKey:CriteriaKey];
@@ -2603,7 +2545,7 @@ var CPBoundArrayKey = @"CPBoundArray";
     return self;
 }
 
-- (id)initWithCoder:(CPCoder)coder
+- (id)initWithCoder:(id)coder
 {
     if (self = [super init])
         boundArray = [coder decodeObjectForKey:CPBoundArrayKey];
@@ -2611,7 +2553,7 @@ var CPBoundArrayKey = @"CPBoundArray";
     return self;
 }
 
-- (void)encodeWithCoder:(CPCoder)coder
+- (void)encodeWithCoder:(id)coder
 {
     [coder encodeObject:boundArray forKey:CPBoundArrayKey];
 }
@@ -2636,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,42 +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
-
-@typedef CPRuleEditorRowType
-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,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 <Foundation/CPObject.j>
-@import <Foundation/CPString.j>
-
-@class CPPredicateEditorRowTemplate
-
 @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

@@ -0,0 +1,176 @@
+/*
+ *     Created by cacaodev@gmail.com.
+ *     Copyright (c) 2011 Pear, Inc. All rights reserved.
+ */
+
+var GRADIENT_START_COLOR = "#fcfcfc",
+    GRADIENT_END_COLOR = "#dfdfdf",
+    BORDER_COLOR = "#BDBDBD";
+
+var GRADIENT_NORMAL,
+    GRADIENT_HIGHLIGHTED,
+    GRADIENT_PROPERTY;
+
+if (CPBrowserIsEngine(CPWebKitBrowserEngine))
+{
+    GRADIENT_NORMAL = "-webkit-gradient(linear, left top, left bottom, from(" + GRADIENT_START_COLOR + "), to(" + GRADIENT_END_COLOR + "))",
+    GRADIENT_HIGHLIGHTED = "-webkit-gradient(linear, left top, left bottom, from(" + GRADIENT_END_COLOR + "), to(" + GRADIENT_START_COLOR + "))";
+    GRADIENT_PROPERTY = "background";
+}
+else if (CPBrowserIsEngine(CPGeckoBrowserEngine))
+{
+    GRADIENT_NORMAL = "-moz-linear-gradient(top, " + GRADIENT_START_COLOR + ", " + GRADIENT_END_COLOR + ")",
+    GRADIENT_HIGHLIGHTED = "-moz-linear-gradient(top, " + GRADIENT_END_COLOR + ", " + GRADIENT_START_COLOR + ")";
+    GRADIENT_PROPERTY = "background";
+}
+else if (CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
+{
+    GRADIENT_NORMAL = "progid:DXImageTransform.Microsoft.gradient(startColorstr='" + GRADIENT_START_COLOR + "', endColorstr='" + GRADIENT_END_COLOR + "')";
+    GRADIENT_HIGHLIGHTED = "progid:DXImageTransform.Microsoft.gradient(startColorstr='" + GRADIENT_END_COLOR + "', endColorstr='" + GRADIENT_START_COLOR + "')";
+    GRADIENT_PROPERTY = "filter";
+}else
+{
+    GRADIENT_NORMAL = GRADIENT_START_COLOR;
+    GRADIENT_HIGHLIGHTED = GRADIENT_END_COLOR;
+    GRADIENT_PROPERTY = "background";
+}
+
+@implementation _CPRuleEditorPopUpButton : CPPopUpButton
+{
+    CPInteger radius;
+}
+
+- (void)_sharedInit
+{
+    [self setBordered:NO];
+
+    var style = _DOMElement.style;
+    style.border = "1px solid " + BORDER_COLOR;
+    style[GRADIENT_PROPERTY] = GRADIENT_NORMAL;
+}
+
+- (id)initWithFrame:(CGRect)aFrame
+{
+    if (self = [super initWithFrame:aFrame])
+        [self _sharedInit];
+
+    return self;
+}
+
+- (id)initWithCoder:(CPCoder)aCoder
+{
+    self = [super initWithCoder:aCoder];
+    [self _sharedInit];
+
+    return self;
+}
+
+- (id)hitTest:(CPPoint)point
+{
+    if (!CPRectContainsPoint([self frame], point) || ![self sliceIsEditable])
+        return nil;
+
+    return self;
+}
+
+- (BOOL)sliceIsEditable
+{
+    var superview = [self superview];
+    return ![superview isKindOfClass:[_CPRuleEditorViewSlice]] || [superview isEditable];
+}
+
+- (BOOL)trackMouse:(CPEvent)theEvent
+{
+    if (![self sliceIsEditable])
+        return NO;
+
+    return [super trackMouse:theEvent];
+}
+
+- (CGRect)contentRectForBounds:(CGRect)bounds
+{
+    var contentRect = [super contentRectForBounds:bounds];
+    contentRect.origin.x += radius;
+    contentRect.size.width -= 2 * radius;
+
+    return contentRect;
+}
+
+- (void)layoutSubviews
+{
+    radius = FLOOR(CGRectGetHeight([self bounds]) / 2);
+    var style = _DOMElement.style,
+        radiusCSS = radius + "px";
+
+    style.borderRadius = radiusCSS;
+
+    [super layoutSubviews];
+}
+
+- (void)drawRect:(CGRect)aRect
+{
+    var context = [[CPGraphicsContext currentContext] graphicsPort],
+        bounds = [self bounds],
+        arrow_width = FLOOR(CGRectGetHeight(bounds) / 3.5);
+
+    CGContextTranslateCTM(context, CGRectGetWidth(bounds) - radius - arrow_width, CGRectGetHeight(bounds) / 2);
+
+    var arrowsPath = [CPBezierPath bezierPath];
+    [arrowsPath moveToPoint:CGPointMake(0, 1)];
+    [arrowsPath lineToPoint:CGPointMake(arrow_width, 1)];
+    [arrowsPath lineToPoint:CGPointMake(arrow_width / 2, arrow_width + 1)];
+    [arrowsPath closePath];
+
+    CGContextSetFillColor(context, [CPColor colorWithWhite:101 / 255 alpha:1]);
+    [arrowsPath fill];
+
+    CGContextScaleCTM(context, 1 , -1);
+    [arrowsPath fill];
+}
+
+@end
+
+@implementation _CPRuleEditorButton : CPButton
+{
+    CPInteger radius;
+}
+
+- (void)_sharedInit
+{
+    [self setBordered:NO];
+
+    var style = _DOMElement.style;
+    style.border = "1px solid " + BORDER_COLOR;
+    style[GRADIENT_PROPERTY] = GRADIENT_NORMAL;
+}
+
+- (id)initWithFrame:(CGRect)aFrame
+{
+    if (self = [super initWithFrame:aFrame])
+        [self _sharedInit];
+
+    return self;
+}
+
+- (id)initWithCoder:(CPCoder)aCoder
+{
+    self = [super initWithCoder:aCoder];
+    [self _sharedInit];
+
+    return self;
+}
+
+- (void)layoutSubviews
+{
+    radius = FLOOR(CGRectGetHeight([self bounds]) / 2);
+
+    var style = _DOMElement.style,
+        radiusCSS = radius + "px";
+
+    style.borderRadius = radiusCSS;
+    style[GRADIENT_PROPERTY] = ([self isHighlighted]) ? GRADIENT_HIGHLIGHTED : GRADIENT_NORMAL;
+
+    [super layoutSubviews];
+}
+
+@end

AppKit/CPRuleEditor/_CPRuleEditorViewSlice.j

@@ -1,35 +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"
-
-@class CPRuleEditor
-
 @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:);
-    BOOL         _editable              @accessors(getter=isEditable, setter=setEditable:);
+    CPColor      _backgroundColor       @accessors(property=backgroundColor);
 }
 
 - (void)removeFromSuperview
@@ -54,19 +36,19 @@
     if (select == _selected)
         return;
 
-    var selector = select ? @selector(setThemeState:) : @selector(unsetThemeState:);
-    [[self subviews] makeObjectsPerformSelector:selector  withObject:CPThemeStateSelectedDataView];
+    var selector = select ? @"setThemeState:" : @"unsetThemeState:";
+    [[self subviews] makeObjectsPerformSelector:CPSelectorFromString(selector)  withObject:CPThemeStateSelectedDataView];
     _selected = select;
 }
 
-- (void)drawRect:(CGRect)rect
+- (void)drawRect:(CPRect)rect
 {
     var context = [[CPGraphicsContext currentContext] graphicsPort],
-        bounds  = [self bounds],
-        maxX    = CGRectGetWidth(bounds),
-        maxY    = CGRectGetHeight(bounds);
+        bounds = [self bounds],
+        maxX = CGRectGetWidth(bounds),
+        maxY = CGRectGetHeight(bounds);
 
-    // Draw background
+// Draw background
     if ([self _isSelected])
         _backgroundColor = [_ruleEditor _selectedRowColor];
     else
@@ -79,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,45 +1,26 @@
 /*
- * 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"
+@import "CPRuleEditor.j"
 
-@import "CPButton.j"
-@import "CPDatePicker.j"
-@import "CPPopUpButton.j"
-
-@global CPApp
-@global CPMiniControlSize
-@global CPSmallControlSize
+var CONTROL_HEIGHT = 16.,
+    BUTTON_HEIGHT = 16.;
 
 @implementation _CPRuleEditorViewSliceRow : _CPRuleEditorViewSlice
 {
-    CPButton                _addButton;
-    CPButton                _subtractButton;
-    CPMutableArray          _correspondingRuleItems;
-    CPMutableArray          _ruleOptionFrames;
-    CPMutableArray          _ruleOptionInitialViewFrames;
-    CPMutableArray          _ruleOptionViews;
-
-
-    CPRuleEditorRowType     _rowType @accessors;
-    CPRuleEditorRowType     _plusButtonRowType;
+    CPMutableArray  _ruleOptionViews;
+    CPMutableArray  _ruleOptionFrames;
+    CPMutableArray  _correspondingRuleItems;
+    CPMutableArray  _ruleOptionInitialViewFrames;
+    CPButton        _addButton;
+    CPButton        _subtractButton;
+    BOOL            editable;
+    CPRuleEditorRowType _rowType @accessors;
+    CPRuleEditorRowType _plusButtonRowType;
 }
 
 - (id)initWithFrame:(CGRect)frame ruleEditorView:(id)editor
@@ -52,33 +33,34 @@
 
 - (void)_initShared
 {
-    _correspondingRuleItems         = [[CPMutableArray alloc] init];
-    _ruleOptionFrames               = [[CPMutableArray alloc] init];
-    _ruleOptionInitialViewFrames    = [[CPMutableArray alloc] init];
-    _ruleOptionViews                = [[CPMutableArray alloc] init];
-    _editable                       = [_ruleEditor isEditable];
-
-    _addButton                      = [self _createAddRowButton];
-    _subtractButton                 = [self _createDeleteRowButton];
+    _correspondingRuleItems = [[CPMutableArray alloc] init];
+    _ruleOptionFrames = [[CPMutableArray alloc] init];
+    _ruleOptionInitialViewFrames = [[CPMutableArray alloc] init];
+    _ruleOptionViews = [[CPMutableArray alloc] init];
+     editable = [_ruleEditor isEditable];
 
+    _addButton = [self _createAddRowButton];
+    _subtractButton = [self _createDeleteRowButton];
+    [_addButton setToolTip:[_ruleEditor _toolTipForAddSimpleRowButton]];
+    [_subtractButton setToolTip:[_ruleEditor _toolTipForDeleteRowButton]];
+    [_addButton setHidden:!editable];
+    [_subtractButton setHidden:!editable];
     [self addSubview:_addButton];
     [self addSubview:_subtractButton];
 
     [self setAutoresizingMask:CPViewWidthSizable];
+
+    var center = [CPNotificationCenter defaultCenter];
+    [center addObserver:self selector:@selector(_textDidChange:) name:CPControlTextDidChangeNotification object:nil];
 }
 
 - (CPButton)_createRowButton
 {
-    var button = [[CPButton alloc] initWithFrame:CGRectMakeZero()];
-
-    [button setFont:[_ruleEditor font]];
-    [button setTextColor:[_ruleEditor _fontColor]];
-
+    var button = [[_CPRuleEditorButton alloc] initWithFrame:CGRectMakeZero()];
+    [button setFont:[CPFont boldFontWithName:@"Apple Symbol" size:12.0]];
+    [button setTextColor:[CPColor colorWithWhite:150 / 255 alpha:1]];
     [button setAlignment:CPCenterTextAlignment];
     [button setAutoresizingMask:CPViewMinXMargin];
-    [button setButtonType:CPMomentaryChangeButton];
-    [button setBordered:NO];
-    [button setHidden:!_editable];
     [button setImagePosition:CPImageOnly];
 
     return button;
@@ -88,10 +70,7 @@
 {
     var button = [self _createRowButton];
 
-    [button setToolTip:[_ruleEditor _toolTipForAddSimpleRowButton]];
-    [button setValue:[_ruleEditor _imageAdd] forThemeAttribute:@"image" inState:CPThemeStateNormal];
-    [button setValue:[_ruleEditor _imageAddHighlighted] forThemeAttribute:@"image" inState:CPThemeStateHighlighted];
-
+    [button setImage:[_ruleEditor _addImage]];
     [button setAction:@selector(_addOption:)];
     [button setTarget:self];
 
@@ -102,10 +81,7 @@
 {
     var button = [self _createRowButton];
 
-    [button setToolTip:[_ruleEditor _toolTipForDeleteRowButton]];
-    [button setValue:[_ruleEditor _imageRemove] forThemeAttribute:@"image" inState:CPThemeStateNormal];
-    [button setValue:[_ruleEditor _imageRemoveHighlighted] forThemeAttribute:@"image" inState:CPThemeStateHighlighted];
-
+    [button setImage:[_ruleEditor _removeImage]];
     [button setAction:@selector(_deleteOption:)];
     [button setTarget:self];
 
@@ -115,17 +91,20 @@
 - (CPMenuItem)_createMenuItemWithTitle:(CPString )title
 {
     title = [[_ruleEditor standardLocalizer] localizedStringForString:title];
-    return [[CPMenuItem alloc] initWithTitle:title action:nil keyEquivalent:@""];
+    var mItem = [[CPMenuItem alloc] initWithTitle:title action:nil keyEquivalent:@""];
+    return mItem;
 }
 
 - (CPPopUpButton)_createPopUpButtonWithItems:(CPArray)itemsArray selectedItemIndex:(int)index
 {
-    var title   = [[itemsArray objectAtIndex:index] title],
-        font    = [_ruleEditor font],
-        width   = [title sizeWithFont:font].width + 35, // 35 for right arrows + margins
-        rect    = CGRectMake(0, 0, width, [_ruleEditor rowHeight]),
-        popup   = [[CPPopUpButton alloc] initWithFrame:rect];
+    var title = [[itemsArray objectAtIndex:index] title],
+        font = [_ruleEditor font],
+        width = [title sizeWithFont:font].width + 20,
+        rect = CGRectMake(0, 0, (width - width % 40) + 80, CONTROL_HEIGHT),
 
+        popup = [[_CPRuleEditorPopUpButton alloc] initWithFrame:rect];
+
+    [popup setTextColor:[CPColor colorWithWhite:101 / 255 alpha:1]];
     [popup setValue:font forThemeAttribute:@"font"];
 
     var count = [itemsArray count];
@@ -142,18 +121,17 @@
     return [CPMenuItem separatorItem];
 }
 
-- (CPTextField)_createStaticTextFieldWithStringValue:(CPString)text
+- (_CPRuleEditorTextField)_createStaticTextFieldWithStringValue:(CPString)text
 {
-    var textField       = [[CPTextField alloc] initWithFrame:CGRectMakeZero()],
-        ruleEditorFont  = [_ruleEditor font],
-        font            = [CPFont fontWithName:[ruleEditorFont familyName] size:[ruleEditorFont size] + 2],
-        localizedText   = [[_ruleEditor standardLocalizer] localizedStringForString:text],
-        size            = [localizedText sizeWithFont:font];
+    var textField = [[_CPRuleEditorTextField alloc] initWithFrame:CPMakeRect(0, 0, 200, CONTROL_HEIGHT)],
+        refont = [_ruleEditor font],
+        font = [CPFont fontWithName:[refont familyName] size:[refont size] + 2],
+
+        localizedText = [[_ruleEditor standardLocalizer] localizedStringForString:text];
 
-    [textField setFrameSize:CGSizeMake(size.width + 4, [_ruleEditor rowHeight])];
     [textField setValue:font forThemeAttribute:@"font"];
-    [textField setValue:[_ruleEditor _verticalAlignment] forThemeAttribute:@"vertical-alignment"];
     [textField setStringValue:localizedText];
+    [textField sizeToFit];
 
     return textField;
 }
@@ -164,7 +142,6 @@
         [self setNeedsDisplay:YES];
 
     var type = _plusButtonRowType;
-
     if ([_ruleEditor nestingMode] == CPRuleEditorNestingModeCompound && ([[CPApp currentEvent] modifierFlags] & CPAlternateKeyMask))
         type = CPRuleEditorRowTypeCompound;
 
@@ -176,12 +153,12 @@
     [_ruleEditor _deleteSlice:self];
 }
 
-- (void)_ruleOptionPopupChangedAction:(CPMenuItem)sender
+- (void)_ruleOptionPopupChangedAction:(CPMenuItem )sender
 {
-    var layoutdict      = [sender representedObject],
-        newItem         = [layoutdict objectForKey:@"item"],
+    var layoutdict = [sender representedObject],
+        newItem = [layoutdict objectForKey:@"item"],
         indexInCriteria = [layoutdict objectForKey:@"indexInCriteria"],
-        oldItem         = [_correspondingRuleItems objectAtIndex:indexInCriteria];
+        oldItem = [_correspondingRuleItems objectAtIndex:indexInCriteria];
 
     if (![newItem isEqual:oldItem])
     {
@@ -277,11 +254,7 @@
                     }
                 }
 
-                repObject = @{
-                        @"item": childItem,
-                        @"value": childValue,
-                        @"indexInCriteria": i
-                    };
+                repObject = [CPDictionary dictionaryWithObjectsAndKeys:childItem, @"item", childValue, @"value", i, @"indexInCriteria"];
                 [menuItem setRepresentedObject:repObject];
                 [menuItems addObject:menuItem];
             }
@@ -313,16 +286,8 @@
 
         if (ruleView != nil)
         {
-            [ruleView setControlSize:CPSmallControlSize];
-
-            var minSize = [ruleView currentValueForThemeAttribute:@"min-size"],
-                frame = [ruleView frame];
-
-            // Force controls to their minimum size
-            frame.size.height = minSize.height;
-            [ruleView setFrame:frame];
-
             [_ruleOptionViews addObject:ruleView];
+            var frame = [ruleView frame];
             [_ruleOptionInitialViewFrames addObject:frame];
             [_ruleOptionFrames addObject:frame];
 
@@ -335,7 +300,7 @@
 
     [_correspondingRuleItems setArray:ruleItems];
 
-    if (!_editable)
+    if (!editable)
         [self _updateEnabledStateForSubviews];
 
     [self _relayoutSubviewsWidthChanged:YES];
@@ -345,6 +310,8 @@
         var aView = [_ruleOptionViews objectAtIndex:firstResponderIndex];
         [[self window] makeFirstResponder:aView]; // This is not working. bug in CPPopUpButton firstResponder ?
     }
+
+    //[self setNeedsDisplay:YES];
 }
 
 - (void)_updateEnabledStateForSubviews
@@ -362,15 +329,14 @@
     var optionViewOriginX,
         leftHorizontalPadding,
         leftButtonMinX,
-        rowHeight   = [_ruleEditor rowHeight],
-        count       = [_ruleOptionViews count],
-        sliceFrame  = [self frame],
-        image       = [_ruleEditor _imageAdd],
+        rowHeight = [_ruleEditor rowHeight],
+        count = [_ruleOptionViews count],
+        sliceFrame = [self frame],
 
-        buttonFrame = CGRectMake(CGRectGetWidth(sliceFrame) - [image size].width - [self _rowButtonsRightHorizontalPadding], ([_ruleEditor rowHeight] - [image size].height) / 2 - 1, [image size].width, [image size].height);
+        buttonFrame = CGRectMake(CGRectGetWidth(sliceFrame) - BUTTON_HEIGHT - [self _rowButtonsRightHorizontalPadding], ([_ruleEditor rowHeight] - BUTTON_HEIGHT) / 2 - 2, BUTTON_HEIGHT, BUTTON_HEIGHT);
 
     [_addButton setFrame:buttonFrame];
-    buttonFrame.origin.x -= [image size].width + [self _rowButtonsInterviewHorizontalPadding];
+    buttonFrame.origin.x -= BUTTON_HEIGHT + [self _rowButtonsInterviewHorizontalPadding];
     [_subtractButton setFrame:buttonFrame];
 
     if (widthChanged)
@@ -385,8 +351,15 @@
         var ruleOptionView = _ruleOptionViews[i],
             optionFrame = _ruleOptionFrames[i];
 
-        // Use a pixel correction to align controls
-        optionFrame.origin.y = (rowHeight - CGRectGetHeight(optionFrame)) / 2;
+        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)
         {
@@ -417,9 +390,14 @@
     [self _setRowTypeToAddFromPlusButton:type];
 }
 
+- (BOOL)isEditable
+{
+    return editable;
+}
+
 - (void)setEditable:(BOOL)value
 {
-    [super setEditable:value]
+    editable = value;
 //  [self _updateEnabledStateForSubviews];
     [self _updateButtonVisibilities];
 }
@@ -495,36 +473,22 @@
     [self layoutSubviews];
 }
 
-- (void)_addObservers
-{
-    if (_isObserving)
-        return;
-
-    [super _addObservers];
-
-    [[CPNotificationCenter defaultCenter] addObserver:self selector:@selector(_textDidChange:) name:CPControlTextDidChangeNotification object:nil];
-}
-
-- (void)_removeObservers
-{
-    if (!_isObserving)
-        return;
-
-    [super _removeObservers];
-
-    [[CPNotificationCenter defaultCenter] removeObserver:self name:CPControlTextDidChangeNotification object:nil];
-}
-
-- (void)drawRect:(CGRect)rect
+- (void)drawRect:(CPRect)rect
 {
     [super drawRect:rect];
 }
 
 - (BOOL)_isRulePopup:(CPView)view
 {
-    if ([view isKindOfClass:[CPPopUpButton class]])
+    if ([view isKindOfClass:[_CPRuleEditorPopUpButton class]])
         return YES;
+    return NO;
+}
 
+- (BOOL)_isRuleStaticTextField:(CPView)view
+{
+    if ([view isKindOfClass:[_CPRuleEditorTextField class]])
+        return YES;
     return NO;
 }
 
@@ -541,3 +505,30 @@
 }
 
 @end
+
+@implementation _CPRuleEditorTextField : CPTextField
+{
+}
+
+- (id)initWithFrame:(CGRect)frame
+{
+    self = [super initWithFrame:frame];
+    if (self != nil)
+    {
+        [self setBordered:NO];
+        [self setEditable:NO];
+        [self setDrawsBackground:NO];
+    }
+
+    return self;
+}
+
+- (id)hitTest:(CPPoint)point
+{
+    if (!CPRectContainsPoint([self frame], point))
+        return nil;
+
+    return [self superview];
+}
+
+@end

AppKit/CPScreen.j

@@ -43,9 +43,9 @@
 - (CGRect)visibleFrame
 {
 #if PLATFORM(DOM)
-    return CGRectMake(window.screen.availLeft, window.screen.availTop, window.screen.availWidth, window.screen.availHeight);
+    return _CGRectMake(window.screen.availLeft, window.screen.availTop, window.screen.availWidth, window.screen.availHeight);
 #else
-    return CGRectMakeZero();
+    return _CGRectMakeZero();
 #endif
 }
 

AppKit/CPScrollView.j

@@ -33,59 +33,49 @@
 #define SHOULD_SHOW_CORNER_VIEW() (_scrollerStyle === CPScrollerStyleLegacy && _verticalScroller && ![_verticalScroller isHidden])
 
 
-@protocol CPScrollViewDelegate <CPObject>
-
-@optional
-- (void)scrollViewWillScroll:(CPScrollView)aScrollView;
-- (void)scrollViewDidScroll:(CPScrollView)aScrollView;
-
-@end
-
-
 /*! @ignore */
-var _isBrowserUsingOverlayScrollers = function()
+var _isSystemUsingOverlayScrollers = function()
 {
 #if PLATFORM(DOM)
-    /*
-        Even if the system supports overlay (Lion) scrollers,
-        the browser (e.g. FireFox *cough*) may not.
+    var inner = document.createElement('p'),
+        outer = document.createElement('div');
 
-        To determine if the browser is using overlay scrollbars,
-        we put a <p> element inside a shorter <div> and set its
-        overflow to scroll. If the browser is using visible scrollers,
-        the outer div's clientWidth will less than the offsetWidth, because
-        clientWidth does not include scrollbars, whereas offsetWidth does.
-        So if clientWidth === offsetWidth, the scrollers must be overlay.
-        Even IE gets this right.
-    */
-    var outer = document.createElement('div'),
-        inner = document.createElement('p');
+    inner.style.width = "100%";
+    inner.style.height = "200px";
 
-    // position it absolute so it doesn't affect existing DOM elements
     outer.style.position = "absolute";
     outer.style.top = "0px";
     outer.style.left = "0px";
     outer.style.visibility = "hidden";
     outer.style.width = "200px";
     outer.style.height = "150px";
-    outer.style.overflow = "scroll";
+    outer.style.overflow = "hidden";
+    outer.appendChild (inner);
 
-    inner.style.width = "100%";
-    inner.style.height = "200px";
-    outer.appendChild(inner);
+    document.body.appendChild (outer);
+    var w1 = inner.offsetWidth;
+    outer.style.overflow = 'scroll';
+    var w2 = inner.offsetWidth;
+    if (w1 == w2)
+        w2 = outer.clientWidth;
 
-    document.body.appendChild(outer);
+    document.body.removeChild (outer);
 
-    var usingOverlayScrollers = outer.clientWidth === outer.offsetWidth;
-
-    document.body.removeChild(outer);
-
-    return usingOverlayScrollers;
+    return (w1 - w2 == 0);
 #else
     return NO;
 #endif
 };
 
+/*!
+    @ingroup appkit
+    @class CPScrollView
+
+    Used to display views that are too large for the viewing area. the CPScrollView
+    places scroll bars on the side of the view to allow the user to scroll and see the entire
+    contents of the view.
+*/
+
 var TIMER_INTERVAL                              = 0.2,
     CPScrollViewDelegate_scrollViewWillScroll_  = 1 << 0,
     CPScrollViewDelegate_scrollViewDidScroll_   = 1 << 1,
@@ -95,45 +85,38 @@ var TIMER_INTERVAL                              = 0.2,
 var CPScrollerStyleGlobal                       = CPScrollerStyleOverlay,
     CPScrollerStyleGlobalChangeNotification     = @"CPScrollerStyleGlobalChangeNotification";
 
-/*!
-    @ingroup appkit
-    @class CPScrollView
 
-    Used to display views that are too large for the viewing area. the CPScrollView
-    places scroll bars on the side of the view to allow the user to scroll and see the entire
-    contents of the view.
-*/
 @implementation CPScrollView : CPView
 {
-    CPClipView                  _contentView;
-    CPClipView                  _headerClipView;
-    CPView                      _cornerView;
-    CPView                      _bottomCornerView;
+    CPClipView      _contentView;
+    CPClipView      _headerClipView;
+    CPView          _cornerView;
+    CPView          _bottomCornerView;
 
-    id <CPScrollViewDelegate>   _delegate;
-    CPTimer                     _scrollTimer;
+    id              _delegate;
+    CPTimer         _scrollTimer;
 
-    BOOL                        _hasVerticalScroller;
-    BOOL                        _hasHorizontalScroller;
-    BOOL                        _autohidesScrollers;
+    BOOL            _hasVerticalScroller;
+    BOOL            _hasHorizontalScroller;
+    BOOL            _autohidesScrollers;
 
-    CPScroller                  _verticalScroller;
-    CPScroller                  _horizontalScroller;
+    CPScroller      _verticalScroller;
+    CPScroller      _horizontalScroller;
 
-    CPInteger                   _recursionCount;
-    CPInteger                   _implementedDelegateMethods;
+    CPInteger       _recursionCount;
+    CPInteger       _implementedDelegateMethods;
 
-    float                       _verticalLineScroll;
-    float                       _verticalPageScroll;
-    float                       _horizontalLineScroll;
-    float                       _horizontalPageScroll;
+    float           _verticalLineScroll;
+    float           _verticalPageScroll;
+    float           _horizontalLineScroll;
+    float           _horizontalPageScroll;
 
-    CPBorderType                _borderType;
+    CPBorderType    _borderType;
 
-    CPTimer                     _timerScrollersHide;
+    CPTimer         _timerScrollersHide;
 
-    int                         _scrollerStyle;
-    int                         _scrollerKnobStyle;
+    int             _scrollerStyle;
+    int             _scrollerKnobStyle;
 }
 
 
@@ -147,8 +130,8 @@ var CPScrollerStyleGlobal                       = CPScrollerStyleOverlay,
 
     var globalValue = [[CPBundle mainBundle] objectForInfoDictionaryKey:@"CPScrollersGlobalStyle"];
 
-    if (globalValue === nil || globalValue === -1)
-        CPScrollerStyleGlobal = _isBrowserUsingOverlayScrollers() ? CPScrollerStyleOverlay : CPScrollerStyleLegacy
+    if (globalValue == nil || globalValue == -1)
+        CPScrollerStyleGlobal = _isSystemUsingOverlayScrollers() ? CPScrollerStyleOverlay : CPScrollerStyleLegacy
     else
         CPScrollerStyleGlobal = globalValue;
 }
@@ -160,15 +143,15 @@ 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
 {
-    var bounds = [self _insetBounds:CGRectMake(0.0, 0.0, frameSize.width, frameSize.height) borderType:borderType],
+    var bounds = [self _insetBounds:_CGRectMake(0.0, 0.0, frameSize.width, frameSize.height) borderType:borderType],
         scrollerWidth = [CPScroller scrollerWidth];
 
     if (hFlag)
@@ -182,10 +165,10 @@ var CPScrollerStyleGlobal                       = CPScrollerStyleOverlay,
 
 + (CGSize)frameSizeForContentSize:(CGSize)contentSize hasHorizontalScroller:(BOOL)hFlag hasVerticalScroller:(BOOL)vFlag borderType:(CPBorderType)borderType
 {
-    var bounds = [self _insetBounds:CGRectMake(0.0, 0.0, contentSize.width, contentSize.height) borderType:borderType],
+    var bounds = [self _insetBounds:_CGRectMake(0.0, 0.0, contentSize.width, contentSize.height) borderType:borderType],
         widthInset = contentSize.width - bounds.size.width,
         heightInset = contentSize.height - bounds.size.height,
-        frameSize = CGSizeMake(contentSize.width + widthInset, contentSize.height + heightInset),
+        frameSize = _CGSizeMake(contentSize.width + widthInset, contentSize.height + heightInset),
         scrollerWidth = [CPScroller scrollerWidth];
 
     if (hFlag)
@@ -203,10 +186,10 @@ var CPScrollerStyleGlobal                       = CPScrollerStyleOverlay,
     {
         case CPLineBorder:
         case CPBezelBorder:
-            return CGRectInset(bounds, 1.0, 1.0);
+            return _CGRectInset(bounds, 1.0, 1.0);
 
         case CPGrooveBorder:
-            bounds = CGRectInset(bounds, 2.0, 2.0);
+            bounds = _CGRectInset(bounds, 2.0, 2.0);
             ++bounds.origin.y;
             --bounds.size.height;
             return bounds;
@@ -271,6 +254,11 @@ var CPScrollerStyleGlobal                       = CPScrollerStyleOverlay,
         _delegate = nil;
         _scrollTimer = nil;
         _implementedDelegateMethods = 0;
+
+        [[CPNotificationCenter defaultCenter] addObserver:self
+                                 selector:@selector(_didReceiveDefaultStyleChange:)
+                                     name:CPScrollerStyleGlobalChangeNotification
+                                   object:nil];
     }
 
     return self;
@@ -303,7 +291,7 @@ Notifies the delegate when the scroll view has finished scrolling.
 @endcode
 
 */
-- (void)setDelegate:(id <CPScrollViewDelegate>)aDelegate
+- (void)setDelegate:(id)aDelegate
 {
     if (aDelegate === _delegate)
         return;
@@ -529,8 +517,8 @@ Notifies the delegate when the scroll view has finished scrolling.
     {
         var bounds = [self _insetBounds];
 
-        [self setHorizontalScroller:[[CPScroller alloc] initWithFrame:CGRectMake(0.0, 0.0, MAX(CGRectGetWidth(bounds), [CPScroller scrollerWidthInStyle:_scrollerStyle] + 1), [CPScroller scrollerWidthInStyle:_scrollerStyle])]];
-        [[self horizontalScroller] setFrameSize:CGSizeMake(CGRectGetWidth(bounds), [CPScroller scrollerWidthInStyle:_scrollerStyle])];
+        [self setHorizontalScroller:[[CPScroller alloc] initWithFrame:CGRectMake(0.0, 0.0, MAX(_CGRectGetWidth(bounds), [CPScroller scrollerWidthInStyle:_scrollerStyle] + 1), [CPScroller scrollerWidthInStyle:_scrollerStyle])]];
+        [[self horizontalScroller] setFrameSize:CGSizeMake(_CGRectGetWidth(bounds), [CPScroller scrollerWidthInStyle:_scrollerStyle])];
     }
 
     [self reflectScrolledClipView:_contentView];
@@ -594,8 +582,8 @@ Notifies the delegate when the scroll view has finished scrolling.
     {
         var bounds = [self _insetBounds];
 
-        [self setVerticalScroller:[[CPScroller alloc] initWithFrame:CGRectMake(0.0, 0.0, [CPScroller scrollerWidthInStyle:_scrollerStyle], MAX(CGRectGetHeight(bounds), [CPScroller scrollerWidthInStyle:_scrollerStyle] + 1))]];
-        [[self verticalScroller] setFrameSize:CGSizeMake([CPScroller scrollerWidthInStyle:_scrollerStyle], CGRectGetHeight(bounds))];
+        [self setVerticalScroller:[[CPScroller alloc] initWithFrame:_CGRectMake(0.0, 0.0, [CPScroller scrollerWidthInStyle:_scrollerStyle], MAX(_CGRectGetHeight(bounds), [CPScroller scrollerWidthInStyle:_scrollerStyle] + 1))]];
+        [[self verticalScroller] setFrameSize:CGSizeMake([CPScroller scrollerWidthInStyle:_scrollerStyle], _CGRectGetHeight(bounds))];
     }
 
     [self reflectScrolledClipView:_contentView];
@@ -871,13 +859,13 @@ Notifies the delegate when the scroll view has finished scrolling.
 - (CGRect)_cornerViewFrame
 {
     if (!_cornerView)
-        return CGRectMakeZero();
+        return _CGRectMakeZero();
 
     var bounds = [self _insetBounds],
         frame = [_cornerView frame];
 
-    frame.origin.x = CGRectGetMaxX(bounds) - CGRectGetWidth(frame);
-    frame.origin.y = CGRectGetMinY(bounds);
+    frame.origin.x = _CGRectGetMaxX(bounds) - _CGRectGetWidth(frame);
+    frame.origin.y = _CGRectGetMinY(bounds);
 
     return frame;
 }
@@ -888,14 +876,14 @@ Notifies the delegate when the scroll view has finished scrolling.
     var headerView = [self _headerView];
 
     if (!headerView)
-        return CGRectMakeZero();
+        return _CGRectMakeZero();
 
     var frame = [self _insetBounds];
 
-    frame.size.height = CGRectGetHeight([headerView frame]);
+    frame.size.height = _CGRectGetHeight([headerView frame]);
 
     if (SHOULD_SHOW_CORNER_VIEW())
-        frame.size.width -= CGRectGetWidth([self _cornerViewFrame]);
+        frame.size.width -= _CGRectGetWidth([self _cornerViewFrame]);
 
     return frame;
 }
@@ -936,18 +924,18 @@ Notifies the delegate when the scroll view has finished scrolling.
             break;
 
         case CPScrollerDecrementPage:
-            contentBounds.origin.y -= CGRectGetHeight(contentBounds) - _verticalPageScroll;
+            contentBounds.origin.y -= _CGRectGetHeight(contentBounds) - _verticalPageScroll;
             break;
 
         case CPScrollerIncrementPage:
-            contentBounds.origin.y += CGRectGetHeight(contentBounds) - _verticalPageScroll;
+            contentBounds.origin.y += _CGRectGetHeight(contentBounds) - _verticalPageScroll;
             break;
 
         // We want integral bounds!
         case CPScrollerKnobSlot:
         case CPScrollerKnob:
         default:
-            contentBounds.origin.y = ROUND(value * (CGRectGetHeight(documentFrame) - CGRectGetHeight(contentBounds)));
+            contentBounds.origin.y = ROUND(value * (_CGRectGetHeight(documentFrame) - _CGRectGetHeight(contentBounds)));
     }
 
     [self _sendDelegateMessages];
@@ -973,18 +961,18 @@ Notifies the delegate when the scroll view has finished scrolling.
             break;
 
         case CPScrollerDecrementPage:
-            contentBounds.origin.x -= CGRectGetWidth(contentBounds) - _horizontalPageScroll;
+            contentBounds.origin.x -= _CGRectGetWidth(contentBounds) - _horizontalPageScroll;
             break;
 
         case CPScrollerIncrementPage:
-            contentBounds.origin.x += CGRectGetWidth(contentBounds) - _horizontalPageScroll;
+            contentBounds.origin.x += _CGRectGetWidth(contentBounds) - _horizontalPageScroll;
             break;
 
         // We want integral bounds!
         case CPScrollerKnobSlot:
         case CPScrollerKnob:
         default:
-            contentBounds.origin.x = ROUND(value * (CGRectGetWidth(documentFrame) - CGRectGetWidth(contentBounds)));
+            contentBounds.origin.x = ROUND(value * (_CGRectGetWidth(documentFrame) - _CGRectGetWidth(contentBounds)));
     }
 
     [self _sendDelegateMessages];
@@ -1108,7 +1096,7 @@ Notifies the delegate when the scroll view has finished scrolling.
         }
 
         [_contentView setFrame:[self _insetBounds]];
-        [_headerClipView setFrame:CGRectMakeZero()];
+        [_headerClipView setFrame:_CGRectMakeZero()];
 
         --_recursionCount;
 
@@ -1118,14 +1106,14 @@ Notifies the delegate when the scroll view has finished scrolling.
     var documentFrame = [documentView frame], // the size of the whole document
         contentFrame = [self _insetBounds], // assume it takes up the entire size of the scrollview (no scrollers)
         headerClipViewFrame = [self _headerClipViewFrame],
-        headerClipViewHeight = CGRectGetHeight(headerClipViewFrame);
+        headerClipViewHeight = _CGRectGetHeight(headerClipViewFrame);
 
     contentFrame.origin.y += headerClipViewHeight;
     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]],
+    var difference = _CGSizeMake(_CGRectGetWidth(documentFrame) - _CGRectGetWidth(contentFrame), _CGRectGetHeight(documentFrame) - _CGRectGetHeight(contentFrame)),
+        verticalScrollerWidth = _CGRectGetWidth([_verticalScroller frame]),
+        horizontalScrollerHeight = _CGRectGetHeight([_horizontalScroller frame]),
         hasVerticalScroll = difference.height > 0.0,
         hasHorizontalScroll = difference.width > 0.0,
         shouldShowVerticalScroller = _hasVerticalScroller && (!_autohidesScrollers || hasVerticalScroll),
@@ -1174,18 +1162,18 @@ Notifies the delegate when the scroll view has finished scrolling.
     if (shouldShowVerticalScroller)
     {
         var verticalScrollerY =
-            MAX(CGRectGetMinY(contentFrame), MAX(CGRectGetMaxY([self _cornerViewFrame]), CGRectGetMaxY(headerClipViewFrame)));
+            MAX(_CGRectGetMinY(contentFrame), MAX(_CGRectGetMaxY([self _cornerViewFrame]), _CGRectGetMaxY(headerClipViewFrame)));
 
-        var verticalScrollerHeight = CGRectGetMaxY(contentFrame) - verticalScrollerY;
+        var verticalScrollerHeight = _CGRectGetMaxY(contentFrame) - verticalScrollerY;
 
         // Make a gap at the bottom of the vertical scroller so that the horizontal and vertical can't overlap.
         if (_scrollerStyle === CPScrollerStyleOverlay && hasHorizontalScroll)
             verticalScrollerHeight -= horizontalScrollerHeight;
 
-        var documentHeight = CGRectGetHeight(documentFrame);
+        var documentHeight = _CGRectGetHeight(documentFrame);
         [_verticalScroller setFloatValue:(difference.height <= 0.0) ? 0.0 : scrollPoint.y / difference.height];
-        [_verticalScroller setKnobProportion:documentHeight > 0 ? CGRectGetHeight(contentFrame) / documentHeight : 1.0];
-        [_verticalScroller setFrame:CGRectMake(CGRectGetMaxX(contentFrame) - overlay, verticalScrollerY, verticalScrollerWidth, verticalScrollerHeight)];
+        [_verticalScroller setKnobProportion:documentHeight > 0 ? _CGRectGetHeight(contentFrame) / documentHeight : 1.0];
+        [_verticalScroller setFrame:_CGRectMake(_CGRectGetMaxX(contentFrame) - overlay, verticalScrollerY, verticalScrollerWidth, verticalScrollerHeight)];
     }
     else if (wasShowingVerticalScroller)
     {
@@ -1195,16 +1183,16 @@ Notifies the delegate when the scroll view has finished scrolling.
 
     if (shouldShowHorizontalScroller)
     {
-        var horizontalScrollerWidth = CGRectGetWidth(contentFrame);
+        var horizontalScrollerWidth = _CGRectGetWidth(contentFrame);
         // Make a gap at the bottom of the vertical scroller so that the horizontal and vertical can't overlap.
         if (_scrollerStyle === CPScrollerStyleOverlay && hasVerticalScroll)
             horizontalScrollerWidth -= verticalScrollerWidth;
 
-        var documentWidth = CGRectGetWidth(documentFrame);
+        var documentWidth = _CGRectGetWidth(documentFrame);
 
         [_horizontalScroller setFloatValue:(difference.width <= 0.0) ? 0.0 : scrollPoint.x / difference.width];
-        [_horizontalScroller setKnobProportion:documentWidth > 0 ? CGRectGetWidth(contentFrame) / documentWidth : 1.0];
-        [_horizontalScroller setFrame:CGRectMake(CGRectGetMinX(contentFrame), CGRectGetMaxY(contentFrame) - overlay, horizontalScrollerWidth, horizontalScrollerHeight)];
+        [_horizontalScroller setKnobProportion:documentWidth > 0 ? _CGRectGetWidth(contentFrame) / documentWidth : 1.0];
+        [_horizontalScroller setFrame:_CGRectMake(_CGRectGetMinX(contentFrame), _CGRectGetMaxY(contentFrame) - overlay, horizontalScrollerWidth, horizontalScrollerHeight)];
     }
     else if (wasShowingHorizontalScroller)
     {
@@ -1264,46 +1252,11 @@ Notifies the delegate when the scroll view has finished scrolling.
     [self reflectScrolledClipView:_contentView];
 }
 
-- (CGRect)documentVisibleRect
-{
-    return [_contentView documentVisibleRect];
-}
 
 #pragma mark -
 #pragma mark Overrides
 
-
-- (void)_removeObservers
-{
-    if (!_isObserving)
-        return;
-
-    [[CPNotificationCenter defaultCenter] removeObserver:self
-                                                    name:CPScrollerStyleGlobalChangeNotification
-                                                  object:nil];
-
-    [super _removeObservers];
-}
-
-- (void)_addObservers
-{
-    if (_isObserving)
-        return;
-
-    //Make sure to have the last global style for the scroller
-    [self _didReceiveDefaultStyleChange:nil];
-
-    [[CPNotificationCenter defaultCenter] addObserver:self
-                                             selector:@selector(_didReceiveDefaultStyleChange:)
-                                                 name:CPScrollerStyleGlobalChangeNotification
-                                               object:nil];
-
-    [super _addObservers];
-}
-
-
-
-- (void)drawRect:(CGRect)aRect
+- (void)drawRect:(CPRect)aRect
 {
     [super drawRect:aRect];
 
@@ -1319,7 +1272,7 @@ Notifies the delegate when the scroll view has finished scrolling.
     {
         case CPLineBorder:
             CGContextSetStrokeColor(context, [self currentValueForThemeAttribute:@"border-color"]);
-            CGContextStrokeRect(context, CGRectInset(strokeRect, 0.5, 0.5));
+            CGContextStrokeRect(context, _CGRectInset(strokeRect, 0.5, 0.5));
             break;
 
         case CPBezelBorder:
@@ -1337,10 +1290,10 @@ Notifies the delegate when the scroll view has finished scrolling.
 
 - (void)_drawGrayBezelInContext:(CGContext)context bounds:(CGRect)aRect
 {
-    var minX = CGRectGetMinX(aRect),
-        maxX = CGRectGetMaxX(aRect),
-        minY = CGRectGetMinY(aRect),
-        maxY = CGRectGetMaxY(aRect),
+    var minX = _CGRectGetMinX(aRect),
+        maxX = _CGRectGetMaxX(aRect),
+        minY = _CGRectGetMinY(aRect),
+        maxY = _CGRectGetMaxY(aRect),
         y = minY + 0.5;
 
     // Slightly darker line on top.
@@ -1371,10 +1324,10 @@ Notifies the delegate when the scroll view has finished scrolling.
 
 - (void)_drawGrooveInContext:(CGContext)context bounds:(CGRect)aRect
 {
-    var minX = CGRectGetMinX(aRect),
-        maxX = CGRectGetMaxX(aRect),
-        minY = CGRectGetMinY(aRect),
-        maxY = CGRectGetMaxY(aRect);
+    var minX = _CGRectGetMinX(aRect),
+        maxX = _CGRectGetMaxX(aRect),
+        minY = _CGRectGetMinY(aRect),
+        maxY = _CGRectGetMaxY(aRect);
 
     CGContextBeginPath(context);
     CGContextSetStrokeColor(context, [CPColor colorWithWhite:159.0 / 255.0 alpha:1.0]);
@@ -1404,11 +1357,11 @@ Notifies the delegate when the scroll view has finished scrolling.
     CGContextBeginPath(context);
     CGContextSetStrokeColor(context, [CPColor whiteColor]);
 
-    var rect = CGRectOffset(aRect, 1.0, 1.0);
+    var rect = _CGRectOffset(aRect, 1.0, 1.0);
 
     rect.size.width -= 1.0;
     rect.size.height -= 1.0;
-    CGContextStrokeRect(context, CGRectInset(rect, 0.5, 0.5));
+    CGContextStrokeRect(context, _CGRectInset(rect, 0.5, 0.5));
 
     CGContextBeginPath(context);
     CGContextSetStrokeColor(context, [CPColor colorWithWhite:192.0 / 255.0 alpha:1.0]);
@@ -1436,44 +1389,35 @@ Notifies the delegate when the scroll view has finished scrolling.
     if (![_horizontalScroller isHidden] || ![_verticalScroller isHidden])
         _timerScrollersHide = [CPTimer scheduledTimerWithTimeInterval:CPScrollViewFadeOutTime target:self selector:@selector(_hideScrollers:) userInfo:nil repeats:NO];
 
-    var deltaX = [anEvent scrollingDeltaX],
-        deltaY = [anEvent scrollingDeltaY];
-
-    if (![anEvent hasPreciseScrollingDeltas])
-    {
-        deltaX *= (_horizontalLineScroll || 1.0);
-        deltaY *= (_verticalLineScroll || 1.0);
-    }
-
-    [self _respondToScrollWheelEventWithDeltaX:deltaX deltaY:deltaY];
+    [self _respondToScrollWheelEventWithDeltaX:[anEvent deltaX] deltaY:[anEvent deltaY]];
 }
 
 - (void)scrollPageUp:(id)sender
 {
     var contentBounds = [_contentView bounds];
-    [self moveByOffset:CGSizeMake(0.0, -(CGRectGetHeight(contentBounds) - _verticalPageScroll))];
+    [self moveByOffset:CGSizeMake(0.0, -(_CGRectGetHeight(contentBounds) - _verticalPageScroll))];
 }
 
 - (void)scrollPageDown:(id)sender
 {
     var contentBounds = [_contentView bounds];
-    [self moveByOffset:CGSizeMake(0.0, CGRectGetHeight(contentBounds) - _verticalPageScroll)];
+    [self moveByOffset:CGSizeMake(0.0, _CGRectGetHeight(contentBounds) - _verticalPageScroll)];
 }
 
 - (void)scrollToBeginningOfDocument:(id)sender
 {
-    [_contentView scrollToPoint:CGPointMakeZero()];
-    [_headerClipView scrollToPoint:CGPointMakeZero()];
+    [_contentView scrollToPoint:_CGPointMakeZero()];
+    [_headerClipView scrollToPoint:_CGPointMakeZero()];
 }
 
 - (void)scrollToEndOfDocument:(id)sender
 {
     var contentBounds = [_contentView bounds],
         documentFrame = [[self documentView] frame],
-        scrollPoint = CGPointMake(0.0, CGRectGetHeight(documentFrame) - CGRectGetHeight(contentBounds));
+        scrollPoint = _CGPointMake(0.0, _CGRectGetHeight(documentFrame) - _CGRectGetHeight(contentBounds));
 
     [_contentView scrollToPoint:scrollPoint];
-    [_headerClipView scrollToPoint:CGPointMakeZero()];
+    [_headerClipView scrollToPoint:_CGPointMakeZero()];
 }
 
 - (void)moveLeft:(id)sender
@@ -1582,8 +1526,6 @@ var CPScrollViewContentViewKey          = @"CPScrollViewContentView",
 */
 - (void)awakeFromCib
 {
-    [super awakeFromCib];
-
     [self _updateScrollerStyle];
     [self _updateCornerAndHeaderView];
 }

AppKit/CPScroller.j

@@ -25,15 +25,9 @@
 
 #include "../Foundation/Foundation.h"
 
-@import "CPAnimation.j"
 @import "CPControl.j"
-@import "CPWindow_Constants.j"
-@import "CPViewAnimation.j"
-
-@global CPApp
 
 // CPScroller Constants
-@typedef CPScrollerPart
 CPScrollerNoPart            = 0;
 CPScrollerDecrementPage     = 1;
 CPScrollerKnob              = 2;
@@ -45,17 +39,19 @@ CPScrollerKnobSlot          = 6;
 CPScrollerIncrementArrow    = 0;
 CPScrollerDecrementArrow    = 1;
 
-@typedef CPUsableScrollerParts
 CPNoScrollerParts           = 0;
 CPOnlyScrollerArrows        = 1;
 CPAllScrollerParts          = 2;
 
+/*!
+    @ingroup appkit
+    @class CPScroller
+*/
+
 var PARTS_ARRANGEMENT   = [CPScrollerKnobSlot, CPScrollerDecrementLine, CPScrollerIncrementLine, CPScrollerKnob],
     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";
@@ -73,13 +69,9 @@ CPThemeStateScrollViewLegacy    = CPThemeState("scroller-style-legacy");
 CPThemeStateScrollerKnobLight   = CPThemeState("scroller-knob-light");
 CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
 
-/*!
-    @ingroup appkit
-    @class CPScroller
-*/
-
 @implementation CPScroller : CPControl
 {
+    CPControlSize           _controlSize;
     CPUsableScrollerParts   _usableParts;
     CPArray                 _partRects;
 
@@ -109,21 +101,21 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
     return "scroller";
 }
 
-+ (CPDictionary)themeAttributes
++ (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
@@ -136,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"];
 }
 
 /*!
@@ -150,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"];
 }
 
 /*!
@@ -173,6 +160,7 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
 {
     if (self = [super initWithFrame:aFrame])
     {
+        _controlSize = CPRegularControlSize;
         _partRects = [];
 
         [self setFloatValue:0.0];
@@ -182,20 +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;
@@ -235,7 +217,7 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
         [self unsetThemeState:CPThemeStateScrollViewLegacy];
     }
 
-    //[self _adjustScrollerSize];
+    [self _adjustScrollerSize];
 }
 
 - (void)setObjectValue:(id)aValue
@@ -243,6 +225,29 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
     [super setObjectValue:MIN(1.0, MAX(0.0, +aValue))];
 }
 
+/*!
+    Returns the scroller's control size
+*/
+- (CPControlSize)controlSize
+{
+    return _controlSize;
+}
+
+/*!
+    Sets the scroller's size.
+    @param aControlSize the scroller's size
+*/
+- (void)setControlSize:(CPControlSize)aControlSize
+{
+    if (_controlSize == aControlSize)
+        return;
+
+    _controlSize = aControlSize;
+
+    [self setNeedsLayout];
+    [self setNeedsDisplay:YES];
+}
+
 /*!
     Return's the knob's proportion
 */
@@ -299,7 +304,7 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
 - (CGRect)rectForPart:(CPScrollerPart)aPart
 {
     if (aPart == CPScrollerNoPart)
-        return CGRectMakeZero();
+        return _CGRectMakeZero();
 
     return _partRects[aPart];
 }
@@ -369,8 +374,8 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
 
     var knobInset = [self currentValueForThemeAttribute:@"knob-inset"],
         trackInset = [self currentValueForThemeAttribute:@"track-inset"],
-        width = CGRectGetWidth(bounds),
-        height = CGRectGetHeight(bounds);
+        width = _CGRectGetWidth(bounds),
+        height = _CGRectGetHeight(bounds);
 
     if ([self isVertical])
     {
@@ -384,21 +389,21 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
             knobHeight = MAX(minimumKnobLength, (slotSize * _knobProportion)),
             knobLocation = effectiveDecrementLineHeight + (slotSize - knobHeight) * [self floatValue];
 
-        _partRects[CPScrollerDecrementPage] = CGRectMake(0.0, effectiveDecrementLineHeight, width, knobLocation - effectiveDecrementLineHeight);
-        _partRects[CPScrollerKnob]          = CGRectMake(knobInset.left, knobLocation, knobWidth, knobHeight);
-        _partRects[CPScrollerIncrementPage] = CGRectMake(0.0, knobLocation + knobHeight, width, height - (knobLocation + knobHeight) - effectiveIncrementLineHeight);
-        _partRects[CPScrollerKnobSlot]      = CGRectMake(trackInset.left, effectiveDecrementLineHeight, width - trackInset.left - trackInset.right, slotSize);
-        _partRects[CPScrollerDecrementLine] = CGRectMake(0.0, 0.0, decrementLineSize.width, decrementLineSize.height);
-        _partRects[CPScrollerIncrementLine] = CGRectMake(0.0, height - incrementLineSize.height, incrementLineSize.width, incrementLineSize.height);
+        _partRects[CPScrollerDecrementPage] = _CGRectMake(0.0, effectiveDecrementLineHeight, width, knobLocation - effectiveDecrementLineHeight);
+        _partRects[CPScrollerKnob]          = _CGRectMake(knobInset.left, knobLocation, knobWidth, knobHeight);
+        _partRects[CPScrollerIncrementPage] = _CGRectMake(0.0, knobLocation + knobHeight, width, height - (knobLocation + knobHeight) - effectiveIncrementLineHeight);
+        _partRects[CPScrollerKnobSlot]      = _CGRectMake(trackInset.left, effectiveDecrementLineHeight, width - trackInset.left - trackInset.right, slotSize);
+        _partRects[CPScrollerDecrementLine] = _CGRectMake(0.0, 0.0, decrementLineSize.width, decrementLineSize.height);
+        _partRects[CPScrollerIncrementLine] = _CGRectMake(0.0, height - incrementLineSize.height, incrementLineSize.width, incrementLineSize.height);
 
         if (height < knobHeight + decrementLineSize.height + incrementLineSize.height + trackInset.top + trackInset.bottom)
-            _partRects[CPScrollerKnob] = CGRectMakeZero();
+            _partRects[CPScrollerKnob] = _CGRectMakeZero();
 
         if (height < decrementLineSize.height + incrementLineSize.height - 2)
         {
-            _partRects[CPScrollerIncrementLine] = CGRectMakeZero();
-            _partRects[CPScrollerDecrementLine] = CGRectMakeZero();
-            _partRects[CPScrollerKnobSlot]      = CGRectMake(trackInset.left, 0,  width - trackInset.left - trackInset.right, height);
+            _partRects[CPScrollerIncrementLine] = _CGRectMakeZero();
+            _partRects[CPScrollerDecrementLine] = _CGRectMakeZero();
+            _partRects[CPScrollerKnobSlot]      = _CGRectMake(trackInset.left, 0,  width - trackInset.left - trackInset.right, height);
         }
     }
     else
@@ -413,21 +418,21 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
             knobHeight = height - knobInset.top - knobInset.bottom,
             knobLocation = effectiveDecrementLineWidth + (slotSize - knobWidth) * [self floatValue];
 
-        _partRects[CPScrollerDecrementPage] = CGRectMake(effectiveDecrementLineWidth, 0.0, knobLocation - effectiveDecrementLineWidth, height);
-        _partRects[CPScrollerKnob]          = CGRectMake(knobLocation, knobInset.top, knobWidth, knobHeight);
-        _partRects[CPScrollerIncrementPage] = CGRectMake(knobLocation + knobWidth, 0.0, width - (knobLocation + knobWidth) - effectiveIncrementLineWidth, height);
-        _partRects[CPScrollerKnobSlot]      = CGRectMake(effectiveDecrementLineWidth, trackInset.top, slotSize, height - trackInset.top - trackInset.bottom);
-        _partRects[CPScrollerDecrementLine] = CGRectMake(0.0, 0.0, decrementLineSize.width, decrementLineSize.height);
-        _partRects[CPScrollerIncrementLine] = CGRectMake(width - incrementLineSize.width, 0.0, incrementLineSize.width, incrementLineSize.height);
+        _partRects[CPScrollerDecrementPage] = _CGRectMake(effectiveDecrementLineWidth, 0.0, knobLocation - effectiveDecrementLineWidth, height);
+        _partRects[CPScrollerKnob]          = _CGRectMake(knobLocation, knobInset.top, knobWidth, knobHeight);
+        _partRects[CPScrollerIncrementPage] = _CGRectMake(knobLocation + knobWidth, 0.0, width - (knobLocation + knobWidth) - effectiveIncrementLineWidth, height);
+        _partRects[CPScrollerKnobSlot]      = _CGRectMake(effectiveDecrementLineWidth, trackInset.top, slotSize, height - trackInset.top - trackInset.bottom);
+        _partRects[CPScrollerDecrementLine] = _CGRectMake(0.0, 0.0, decrementLineSize.width, decrementLineSize.height);
+        _partRects[CPScrollerIncrementLine] = _CGRectMake(width - incrementLineSize.width, 0.0, incrementLineSize.width, incrementLineSize.height);
 
         if (width < knobWidth + decrementLineSize.width + incrementLineSize.width + trackInset.left + trackInset.right)
-            _partRects[CPScrollerKnob] = CGRectMakeZero();
+            _partRects[CPScrollerKnob] = _CGRectMakeZero();
 
         if (width < decrementLineSize.width + incrementLineSize.width - 2)
         {
-            _partRects[CPScrollerIncrementLine] = CGRectMakeZero();
-            _partRects[CPScrollerDecrementLine] = CGRectMakeZero();
-            _partRects[CPScrollerKnobSlot]      = CGRectMake(0.0, 0.0,  width, slotSize);
+            _partRects[CPScrollerIncrementLine] = _CGRectMakeZero();
+            _partRects[CPScrollerDecrementLine] = _CGRectMakeZero();
+            _partRects[CPScrollerKnobSlot]      = _CGRectMake(0.0, 0.0,  width, slotSize);
         }
     }
 }
@@ -495,7 +500,7 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
 
 - (CPView)createViewForPart:(CPScrollerPart)aPart
 {
-    var view = [[CPView alloc] initWithFrame:CGRectMakeZero()];
+    var view = [[CPView alloc] initWithFrame:_CGRectMakeZero()];
 
     [view setHitTests:NO];
 
@@ -509,7 +514,7 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
 
 - (CPView)createEphemeralSubviewNamed:(CPString)aName
 {
-    var view = [[CPView alloc] initWithFrame:CGRectMakeZero()];
+    var view = [[CPView alloc] initWithFrame:_CGRectMakeZero()];
 
     [view setHitTests:NO];
 
@@ -518,7 +523,6 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
 
 - (void)layoutSubviews
 {
-    [self _adjustScrollerSize];
     [self checkSpaceForParts];
 
     var index = 0,
@@ -584,7 +588,7 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
     {
         var knobRect = [self rectForPart:CPScrollerKnob],
             knobSlotRect = [self rectForPart:CPScrollerKnobSlot],
-            remainder = ![self isVertical] ? (CGRectGetWidth(knobSlotRect) - CGRectGetWidth(knobRect)) : (CGRectGetHeight(knobSlotRect) - CGRectGetHeight(knobRect));
+            remainder = ![self isVertical] ? (_CGRectGetWidth(knobSlotRect) - _CGRectGetWidth(knobRect)) : (_CGRectGetHeight(knobSlotRect) - _CGRectGetHeight(knobRect));
 
         if (remainder <= 0)
             [self setFloatValue:0.0];
@@ -629,20 +633,20 @@ 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),
+                    knobWidth = ![self isVertical] ? _CGRectGetWidth(knobRect) : _CGRectGetHeight(knobRect),
                     knobSlotRect = [self rectForPart:CPScrollerKnobSlot],
-                    remainder = (![self isVertical] ? CGRectGetWidth(knobSlotRect) : CGRectGetHeight(knobSlotRect)) - knobWidth;
+                    remainder = (![self isVertical] ? _CGRectGetWidth(knobSlotRect) : _CGRectGetHeight(knobSlotRect)) - knobWidth;
 
-                [self setFloatValue:((![self isVertical] ? _trackingStartPoint.x - CGRectGetMinX(knobSlotRect) : _trackingStartPoint.y - CGRectGetMinY(knobSlotRect)) - knobWidth / 2.0) / remainder];
+                [self setFloatValue:((![self isVertical] ? _trackingStartPoint.x - _CGRectGetMinX(knobSlotRect) : _trackingStartPoint.y - _CGRectGetMinY(knobSlotRect)) - knobWidth / 2.0) / remainder];
 
                 _hitPart = CPScrollerKnob;
 
@@ -663,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;
@@ -683,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];
 }
 
@@ -710,7 +719,7 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
     var themeState = _themeState;
 
     if (NAMES_FOR_PARTS[_hitPart] + "-color" !== anAttributeName)
-        themeState = themeState.without(CPThemeStateHighlighted);
+        themeState &= ~CPThemeStateHighlighted;
 
     return [self valueForThemeAttribute:anAttributeName inState:themeState];
 }
@@ -724,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];
     }
 }
 
@@ -779,9 +786,9 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
 
 @end
 
-var CPScrollerIsVerticalKey     = @"CPScrollerIsVerticalKey",
+var CPScrollerControlSizeKey = @"CPScrollerControlSize",
     CPScrollerKnobProportionKey = @"CPScrollerKnobProportion",
-    CPScrollerStyleKey          = @"CPScrollerStyleKey";
+    CPScrollerStyleKey = @"CPScrollerStyleKey";
 
 @implementation CPScroller (CPCoding)
 
@@ -789,6 +796,11 @@ var CPScrollerIsVerticalKey     = @"CPScrollerIsVerticalKey",
 {
     if (self = [super initWithCoder:aCoder])
     {
+        _controlSize = CPRegularControlSize;
+
+        if ([aCoder containsValueForKey:CPScrollerControlSizeKey])
+            _controlSize = [aCoder decodeIntForKey:CPScrollerControlSizeKey];
+
         _knobProportion = 1.0;
 
         if ([aCoder containsValueForKey:CPScrollerKnobProportionKey])
@@ -801,19 +813,17 @@ var CPScrollerIsVerticalKey     = @"CPScrollerIsVerticalKey",
         _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;
@@ -823,7 +833,7 @@ var CPScrollerIsVerticalKey     = @"CPScrollerIsVerticalKey",
 {
     [super encodeWithCoder:aCoder];
 
-    [aCoder encodeInt:_isVertical forKey:CPScrollerIsVerticalKey];
+    [aCoder encodeInt:_controlSize forKey:CPScrollerControlSizeKey];
     [aCoder encodeFloat:_knobProportion forKey:CPScrollerKnobProportionKey];
     [aCoder encodeInt:_style forKey:CPScrollerStyleKey];
 }

AppKit/CPSearchField.j

@@ -21,21 +21,25 @@
  */
 
 @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 CPAutosavedRecentsChangedNotification = @"CPAutosavedRecentsChangedNotification",
-    RECENT_SEARCH_PREFIX = @"   ";
+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 = @"   ";
 
 /*!
     @ingroup appkit
@@ -66,16 +70,16 @@ var CPAutosavedRecentsChangedNotification = @"CPAutosavedRecentsChangedNotificat
     return @"searchfield"
 }
 
-+ (CPDictionary)themeAttributes
++ (void)initialize
 {
-    return @{
-            @"image-search": [CPNull null],
-            @"image-find": [CPNull null],
-            @"image-cancel": [CPNull null],
-            @"image-cancel-pressed": [CPNull null],
-            @"image-search-inset" : CGInsetMake(0, 0, 0, 5),
-            @"image-cancel-inset" : CGInsetMake(0, 5, 0, 0)
-        };
+    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
@@ -120,28 +124,16 @@ var CPAutosavedRecentsChangedNotification = @"CPAutosavedRecentsChangedNotificat
     _canResignFirstResponder = YES;
 }
 
-
-#pragma mark -
-#pragma mark Override observers
-
-- (void)_removeObservers
+- (void)viewWillMoveToSuperview:(CPView)aView
 {
-    if (!_isObserving)
-        return;
-
-    [super _removeObservers];
+    [super viewWillMoveToSuperview:aView];
 
+    // First we remove any observer that may have been in place to avoid memory leakage.
     [[CPNotificationCenter defaultCenter] removeObserver:self name:CPControlTextDidChangeNotification object:self];
-}
 
-- (void)_addObservers
-{
-    if (_isObserving)
-        return;
-
-    [super _addObservers];
-
-    [[CPNotificationCenter defaultCenter] addObserver:self selector:@selector(_searchFieldTextDidChange:) name:CPControlTextDidChangeNotification object:self];
+    // Register the observe here if we need to.
+    if (aView)
+        [[CPNotificationCenter defaultCenter] addObserver:self selector:@selector(_searchFieldTextDidChange:) name:CPControlTextDidChangeNotification object:self];
 }
 
 // Managing Buttons
@@ -178,7 +170,7 @@ var CPAutosavedRecentsChangedNotification = @"CPAutosavedRecentsChangedNotificat
 - (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];
@@ -201,7 +193,6 @@ var CPAutosavedRecentsChangedNotification = @"CPAutosavedRecentsChangedNotificat
         [_cancelButton setAutoresizingMask:CPViewMinXMargin];
         [_cancelButton setTarget:self];
         [_cancelButton setAction:@selector(cancelOperation:)];
-        [_cancelButton setButtonType:CPMomentaryChangeButton];
         [self _updateCancelButtonVisibility];
         [self addSubview:_cancelButton];
     }
@@ -225,8 +216,8 @@ var CPAutosavedRecentsChangedNotification = @"CPAutosavedRecentsChangedNotificat
     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:)];
@@ -242,22 +233,22 @@ var CPAutosavedRecentsChangedNotification = @"CPAutosavedRecentsChangedNotificat
 - (CGRect)searchTextRectForBounds:(CGRect)rect
 {
     var leftOffset = 0,
-        width = CGRectGetWidth(rect),
+        width = _CGRectGetWidth(rect),
         bounds = [self bounds];
 
     if (_searchButton)
     {
         var searchBounds = [self searchButtonRectForBounds:bounds];
-        leftOffset = CGRectGetMaxX(searchBounds) + 2;
+        leftOffset = _CGRectGetMaxX(searchBounds) + 2;
     }
 
     if (_cancelButton)
     {
         var cancelRect = [self cancelButtonRectForBounds:bounds];
-        width = CGRectGetMinX(cancelRect) - leftOffset;
+        width = _CGRectGetMinX(cancelRect) - leftOffset;
     }
 
-    return CGRectMake(leftOffset, CGRectGetMinY(rect), width, CGRectGetHeight(rect));
+    return _CGRectMake(leftOffset, _CGRectGetMinY(rect), width, _CGRectGetHeight(rect));
 }
 
 /*!
@@ -267,10 +258,7 @@ var CPAutosavedRecentsChangedNotification = @"CPAutosavedRecentsChangedNotificat
 */
 - (CGRect)searchButtonRectForBounds:(CGRect)rect
 {
-    var size = [[self currentValueForThemeAttribute:@"image-search"] size] || CGSizeMakeZero(),
-        inset = [self currentValueForThemeAttribute:@"image-search-inset"];
-
-    return CGRectMake(inset.left - inset.right, inset.top - inset.bottom + (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);
 }
 
 /*!
@@ -280,10 +268,7 @@ var CPAutosavedRecentsChangedNotification = @"CPAutosavedRecentsChangedNotificat
 */
 - (CGRect)cancelButtonRectForBounds:(CGRect)rect
 {
-    var size = [[self currentValueForThemeAttribute:@"image-cancel"] size] || CGSizeMakeZero(),
-        inset = [self currentValueForThemeAttribute:@"image-cancel-inset"];
-
-    return CGRectMake(CGRectGetWidth(rect) - size.width + inset.left - inset.right, inset.top - inset.bottom + (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
@@ -473,7 +458,7 @@ var CPAutosavedRecentsChangedNotification = @"CPAutosavedRecentsChangedNotificat
     [self sendAction:[self action] to:[self target]];
 }
 
-- (BOOL)sendAction:(SEL)anAction to:(id)anObject
+- (void)sendAction:(SEL)anAction to:(id)anObject
 {
     [super sendAction:anAction to:anObject];
 
@@ -497,7 +482,7 @@ var CPAutosavedRecentsChangedNotification = @"CPAutosavedRecentsChangedNotificat
 - (CPView)hitTest:(CGPoint)aPoint
 {
     // Make sure a hit anywhere within the search field returns the search field itself
-    if (CGRectContainsPoint([self frame], aPoint))
+    if (_CGRectContainsPoint([self frame], aPoint))
         return self;
     else
         return nil;
@@ -513,7 +498,7 @@ var CPAutosavedRecentsChangedNotification = @"CPAutosavedRecentsChangedNotificat
     var location = [anEvent locationInWindow],
         point = [self convertPoint:location fromView:nil];
 
-    if (CGRectContainsPoint([self searchButtonRectForBounds:[self bounds]], point))
+    if (_CGRectContainsPoint([self searchButtonRectForBounds:[self bounds]], point))
     {
         if (_searchMenuTemplate == nil)
         {
@@ -525,7 +510,7 @@ var CPAutosavedRecentsChangedNotification = @"CPAutosavedRecentsChangedNotificat
         else
            [self _showMenu];
     }
-    else if (CGRectContainsPoint([self cancelButtonRectForBounds:[self bounds]], point))
+    else if (_CGRectContainsPoint([self cancelButtonRectForBounds:[self bounds]], point))
         [_cancelButton mouseDown:anEvent];
     else
         [super mouseDown:anEvent];
@@ -694,7 +679,7 @@ var CPAutosavedRecentsChangedNotification = @"CPAutosavedRecentsChangedNotificat
         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,13 +23,8 @@
 @import <Foundation/CPArray.j>
 
 @import "CPControl.j"
-@import "CPWindow_Constants.j"
-@import "_CPImageAndTextView.j"
-@import "CPMenu.j"
 
-@global CPApp
 
-@typedef CPSegmentSwitchTracking
 CPSegmentSwitchTrackingSelectOne = 0;
 CPSegmentSwitchTrackingSelectAny = 1;
 CPSegmentSwitchTrackingMomentary = 2;
@@ -42,7 +37,7 @@ CPSegmentSwitchTrackingMomentary = 2;
 */
 @implementation CPSegmentedControl : CPControl
 {
-    CPArray                 _segments @accessors(getter=segments);
+    CPArray                 _segments;
     CPArray                 _themeStates;
 
     int                     _selectedSegment;
@@ -58,21 +53,10 @@ CPSegmentSwitchTrackingMomentary = 2;
     return "segmented-control";
 }
 
-+ (CPDictionary)themeAttributes
++ (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,
-        };
+    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
@@ -87,76 +71,17 @@ CPSegmentSwitchTrackingMomentary = 2;
         _selectedSegment = -1;
 
         _trackingMode = CPSegmentSwitchTrackingSelectOne;
-        _trackingHighlighted = NO;
-        _trackingSegment = -1;
     }
 
     return self;
 }
 
-/*!
-    Sets the control's size.
-    @param aControlSize the control's size
-*/
-- (void)setControlSize:(CPControlSize)aControlSize
-{
-    [super setControlSize:aControlSize];
-    [self _sizeToControlSize];
-}
-
 /*!
     Returns the tag of the selected segment.
 */
 - (int)selectedTag
 {
-    return [[_segments objectAtIndex:_selectedSegment] tag];
-}
-
-/*! @ignore */
-- (void)setSegments:(CPArray)segments
-{
-    [self removeSegmentsAtIndexes:[CPIndexSet indexSetWithIndexesInRange:CPMakeRange(0, [self  segmentCount])]];
-
-    [self insertSegments:segments atIndexes:[CPIndexSet indexSetWithIndexesInRange:CPMakeRange(0, [segments count])]];
-}
-
-/*! @ignore */
-- (void)insertSegments:(CPArray)segments atIndexes:(CPIndexSet)indices
-{
-    if ([segments count] == 0)
-        return;
-
-    var newStates = @[],
-        count = [indices count];
-
-    while (count--)
-        [newStates addObject:CPThemeStateNormal];
-
-    [_segments insertObjects:segments atIndexes:indices];
-    [_themeStates insertObjects:newStates atIndexes:indices];
-
-    if (_selectedSegment >= [indices firstIndex])
-        _selectedSegment += [indices count];
-}
-
-/*! @ignore */
-- (void)removeSegmentsAtIndexes:(CPIndexSet)indices
-{
-    if ([indices count] == 0)
-        return;
-
-    [indices enumerateIndexesUsingBlock:function(idx, stop)
-    {
-        [[_segments objectAtIndex:idx] setSelected:NO];
-    }];
-
-    if ([indices containsIndex:_selectedSegment])
-        _selectedSegment = -1;
-    else if ([indices lastIndex] < _selectedSegment)
-        _selectedSegment -= [indices count];
-
-    [_segments removeObjectsAtIndexes:indices];
-    [_themeStates removeObjectsAtIndexes:indices];
+    return [_segments[_selectedSegment] tag];
 }
 
 // Specifying the number of segments
@@ -166,32 +91,39 @@ CPSegmentSwitchTrackingMomentary = 2;
 */
 - (void)setSegmentCount:(unsigned)aCount
 {
-    var prevCount = [_segments count];
-
-    if (aCount == prevCount)
+    if (_segments.length == aCount)
         return;
 
-    if (aCount > prevCount)
+    var height = CGRectGetHeight([self bounds]),
+        dividersBefore = MAX(0, _segments.length - 1),
+        dividersAfter = MAX(0, aCount - 1);
+
+    if (_segments.length < aCount)
     {
-        var count = aCount - prevCount,
-            segments = @[];
-
-        while (count--)
-            [segments addObject:[[_CPSegmentItem alloc] init]];
-
-        [self insertSegments:segments atIndexes:[CPIndexSet indexSetWithIndexesInRange:CPMakeRange(prevCount, aCount - prevCount)]];
+        for (var index = _segments.length; index < aCount; ++index)
+        {
+            _segments[index] = [[_CPSegmentItem alloc] init];
+            _themeStates[index] = CPThemeStateNormal;
+        }
+    }
+    else if (aCount < _segments.length)
+    {
+        _segments.length = aCount;
+        _themeStates.length = aCount;
     }
-    else
-        [self removeSegmentsAtIndexes:[CPIndexSet indexSetWithIndexesInRange:CPMakeRange(aCount, prevCount - aCount)]];
 
-    [self _updateSelectionIfNeeded];
-    [self tileWithChangedSegment:MAX(MIN(prevCount, aCount) - 1, 0)];
-}
-
-- (void)_updateSelectionIfNeeded
-{
-    if (_selectedSegment >= [self segmentCount])
+    if (_selectedSegment >= _segments.length)
         _selectedSegment = -1;
+
+    // Make space for/remove space used by dividers.
+    var thickness = [self currentValueForThemeAttribute:@"divider-thickness"],
+        delta = thickness * (dividersAfter - dividersBefore),
+        frame = [self frame];
+
+    if (delta)
+        [self setFrameSize:CGSizeMake(frame.size.width + delta, frame.size.height)];
+
+    [self tileWithChangedSegment:0];
 }
 
 /*!
@@ -199,7 +131,7 @@ CPSegmentSwitchTrackingMomentary = 2;
 */
 - (unsigned)segmentCount
 {
-    return [_segments count];
+    return _segments.length;
 }
 
 // Specifying Selected Segment
@@ -211,20 +143,7 @@ CPSegmentSwitchTrackingMomentary = 2;
 - (void)setSelectedSegment:(unsigned)aSegment
 {
     // setSelected:forSegment throws the exception for us (if necessary)
-    if (_selectedSegment == aSegment)
-        return;
-
-    if (aSegment == -1)
-    {
-        var count = [self segmentCount];
-
-        while (count--)
-            [self setSelected:NO forSegment:count];
-
-        _selectedSegment = -1;
-    }
-    else
-        [self setSelected:YES forSegment:aSegment];
+    [self setSelected:YES forSegment:aSegment];
 }
 
 /*!
@@ -242,23 +161,8 @@ CPSegmentSwitchTrackingMomentary = 2;
 {
     var index = 0;
 
-    for (; index < [_segments count]; ++index)
-        if ([[_segments objectAtIndex:index] tag] == aTag)
-        {
-            [self setSelectedSegment:index];
-
-            return YES;
-        }
-
-    return NO;
-}
-
-- (BOOL)_selectSegmentWithLabel:(CPString)aLabel
-{
-    var index = 0;
-
-    for (; index < [_segments count]; ++index)
-        if ([[_segments objectAtIndex:index] label] == aLabel)
+    for (; index < _segments.length; ++index)
+        if (_segments[index].tag == aTag)
         {
             [self setSelectedSegment:index];
 
@@ -269,7 +173,7 @@ CPSegmentSwitchTrackingMomentary = 2;
 }
 
 // Specifying Tracking Mode
-/*! @ignore */
+
 - (BOOL)isTracking
 {
 
@@ -287,7 +191,7 @@ CPSegmentSwitchTrackingMomentary = 2;
         var index = 0,
             selected = NO;
 
-        for (; index < [self segmentCount]; ++index)
+        for (; index < _segments.length; ++index)
             if ([_segments[index] selected])
                 if (selected)
                     [self setSelected:NO forSegment:index];
@@ -299,7 +203,7 @@ CPSegmentSwitchTrackingMomentary = 2;
     {
         var index = 0;
 
-        for (; index < [self segmentCount]; ++index)
+        for (; index < _segments.length; ++index)
             if ([_segments[index] selected])
                 [self setSelected:NO forSegment:index];
     }
@@ -322,7 +226,8 @@ CPSegmentSwitchTrackingMomentary = 2;
 */
 - (void)setWidth:(float)aWidth forSegment:(unsigned)aSegment
 {
-    [[_segments objectAtIndex:aSegment] setWidth:aWidth];
+    [_segments[aSegment] setWidth:aWidth];
+
     [self tileWithChangedSegment:aSegment];
 }
 
@@ -333,7 +238,7 @@ CPSegmentSwitchTrackingMomentary = 2;
 */
 - (float)widthForSegment:(unsigned)aSegment
 {
-    return [[_segments objectAtIndex:aSegment] width];
+    return [_segments[aSegment] width];
 }
 
 /*!
@@ -344,7 +249,7 @@ CPSegmentSwitchTrackingMomentary = 2;
 */
 - (void)setImage:(CPImage)anImage forSegment:(unsigned)aSegment
 {
-    [[_segments objectAtIndex:aSegment] setImage:anImage];
+    [_segments[aSegment] setImage:anImage];
 
     [self tileWithChangedSegment:aSegment];
 }
@@ -356,7 +261,7 @@ CPSegmentSwitchTrackingMomentary = 2;
 */
 - (CPImage)imageForSegment:(unsigned)aSegment
 {
-    return [[_segments objectAtIndex:aSegment] image];
+    return [_segments[aSegment] image];
 }
 
 /*!
@@ -367,7 +272,7 @@ CPSegmentSwitchTrackingMomentary = 2;
 */
 - (void)setLabel:(CPString)aLabel forSegment:(unsigned)aSegment
 {
-    [[_segments objectAtIndex:aSegment] setLabel:aLabel];
+    [_segments[aSegment] setLabel:aLabel];
 
     [self tileWithChangedSegment:aSegment];
 }
@@ -379,7 +284,7 @@ CPSegmentSwitchTrackingMomentary = 2;
 */
 - (CPString)labelForSegment:(unsigned)aSegment
 {
-    return [[_segments objectAtIndex:aSegment] label];
+    return [_segments[aSegment] label];
 }
 
 /*!
@@ -390,7 +295,7 @@ CPSegmentSwitchTrackingMomentary = 2;
 */
 - (void)setMenu:(CPMenu)aMenu forSegment:(unsigned)aSegment
 {
-    [[_segments objectAtIndex:aSegment] setMenu:aMenu];
+    [_segments[aSegment] setMenu:aMenu];
 }
 
 /*!
@@ -400,7 +305,7 @@ CPSegmentSwitchTrackingMomentary = 2;
 */
 - (CPMenu)menuForSegment:(unsigned)aSegment
 {
-    return [[_segments objectAtIndex:aSegment] menu];
+    return [_segments[aSegment] menu];
 }
 
 /*!
@@ -412,7 +317,7 @@ CPSegmentSwitchTrackingMomentary = 2;
 */
 - (void)setSelected:(BOOL)isSelected forSegment:(unsigned)aSegment
 {
-    var segment = [_segments objectAtIndex:aSegment];
+    var segment = _segments[aSegment];
 
     // If we're already in this state, bail.
     if ([segment selected] == isSelected)
@@ -429,7 +334,7 @@ CPSegmentSwitchTrackingMomentary = 2;
 
         _selectedSegment = aSegment;
 
-        if (_trackingMode == CPSegmentSwitchTrackingSelectOne && oldSelectedSegment != aSegment && oldSelectedSegment != -1 && oldSelectedSegment < _segments.length)
+        if (_trackingMode == CPSegmentSwitchTrackingSelectOne && oldSelectedSegment != aSegment && oldSelectedSegment != -1)
         {
             [_segments[oldSelectedSegment] setSelected:NO];
             _themeStates[oldSelectedSegment] = CPThemeStateNormal;
@@ -452,7 +357,7 @@ CPSegmentSwitchTrackingMomentary = 2;
 */
 - (BOOL)isSelectedForSegment:(unsigned)aSegment
 {
-    return [[_segments objectAtIndex:aSegment] selected];
+    return [_segments[aSegment] selected];
 }
 
 /*!
@@ -463,17 +368,15 @@ CPSegmentSwitchTrackingMomentary = 2;
 */
 - (void)setEnabled:(BOOL)shouldBeEnabled forSegment:(unsigned)aSegment
 {
-    var segment = [_segments objectAtIndex:aSegment];
-
-    if ([segment enabled] === shouldBeEnabled)
+    if ([_segments[aSegment] enabled] === shouldBeEnabled)
         return;
 
-    [segment setEnabled:shouldBeEnabled];
+    [_segments[aSegment] setEnabled:shouldBeEnabled];
 
     if (shouldBeEnabled)
-        _themeStates[aSegment] = _themeStates[aSegment].without(CPThemeStateDisabled);
+        _themeStates[aSegment] &= ~CPThemeStateDisabled;
     else
-        _themeStates[aSegment] = _themeStates[aSegment].and(CPThemeStateDisabled);
+        _themeStates[aSegment] |= CPThemeStateDisabled;
 
     [self setNeedsLayout];
     [self setNeedsDisplay:YES];
@@ -486,7 +389,7 @@ CPSegmentSwitchTrackingMomentary = 2;
 */
 - (BOOL)isEnabledForSegment:(unsigned)aSegment
 {
-    return [[_segments objectAtIndex:aSegment] enabled];
+    return [_segments[aSegment] enabled];
 }
 
 /*!
@@ -496,7 +399,7 @@ CPSegmentSwitchTrackingMomentary = 2;
 */
 - (void)setTag:(int)aTag forSegment:(unsigned)aSegment
 {
-    [[_segments objectAtIndex:aSegment] setTag:aTag];
+    [_segments[aSegment] setTag:aTag];
 }
 
 /*!
@@ -505,7 +408,7 @@ CPSegmentSwitchTrackingMomentary = 2;
 */
 - (int)tagForSegment:(unsigned)aSegment
 {
-    return [[_segments objectAtIndex:aSegment] tag];
+    return [_segments[aSegment] tag];
 }
 
 // Drawings
@@ -516,13 +419,10 @@ CPSegmentSwitchTrackingMomentary = 2;
 */
 - (void)drawSegmentBezel:(int)aSegment highlight:(BOOL)shouldHighlight
 {
-    if (aSegment < _themeStates.length)
-    {
-        if (shouldHighlight)
-            _themeStates[aSegment] = _themeStates[aSegment].and(CPThemeStateHighlighted);
-        else
-            _themeStates[aSegment] = _themeStates[aSegment].without(CPThemeStateHighlighted);
-    }
+    if (shouldHighlight)
+        _themeStates[aSegment] |= CPThemeStateHighlighted;
+    else
+        _themeStates[aSegment] &= ~CPThemeStateHighlighted;
 
     [self setNeedsLayout];
     [self setNeedsDisplay:YES];
@@ -530,12 +430,14 @@ CPSegmentSwitchTrackingMomentary = 2;
 
 - (float)_leftOffsetForSegment:(unsigned)segment
 {
+    var bezelInset = [self currentValueForThemeAttribute:@"bezel-inset"];
+
     if (segment == 0)
-        return [self currentValueForThemeAttribute:@"bezel-inset"].left;
+        return bezelInset.left;
 
     var thickness = [self currentValueForThemeAttribute:@"divider-thickness"];
 
-    return [self _leftOffsetForSegment:segment - 1] + CGRectGetWidth([self frameForSegment:segment - 1]) + thickness;
+    return [self _leftOffsetForSegment:segment - 1] + [self widthForSegment:segment - 1] + thickness;
 }
 
 - (unsigned)_indexOfLastSegment
@@ -550,7 +452,7 @@ CPSegmentSwitchTrackingMomentary = 2;
 
 - (CGRect)rectForEphemeralSubviewNamed:(CPString)aName
 {
-    var height = [self currentValueForThemeAttribute:@"min-size"].height,
+    var height = [self currentValueForThemeAttribute:@"default-height"],
         contentInset = [self currentValueForThemeAttribute:@"content-inset"],
         bezelInset = [self currentValueForThemeAttribute:@"bezel-inset"],
         bounds = [self bounds];
@@ -561,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);
@@ -569,7 +471,7 @@ CPSegmentSwitchTrackingMomentary = 2;
     else if (aName.indexOf("segment-bezel") === 0)
     {
         var segment = parseInt(aName.substring("segment-bezel-".length), 10),
-            frame = CGRectCreateCopy([self frameForSegment:segment]);
+            frame = CGRectCreateCopy([_segments[segment] frame]);
 
         if (segment === 0)
         {
@@ -577,7 +479,7 @@ CPSegmentSwitchTrackingMomentary = 2;
             frame.size.width -= contentInset.left;
         }
 
-        if (segment === [self segmentCount] - 1)
+        if (segment === _segments.length - 1)
             frame.size.width = CGRectGetWidth([self bounds]) - contentInset.right - frame.origin.x;
 
         return frame;
@@ -585,7 +487,7 @@ CPSegmentSwitchTrackingMomentary = 2;
     else if (aName.indexOf("divider-bezel") === 0)
     {
         var segment = parseInt(aName.substring("divider-bezel-".length), 10),
-            width = CGRectGetWidth([self frameForSegment:segment]),
+            width = [self widthForSegment:segment],
             left = [self _leftOffsetForSegment:segment],
             thickness = [self currentValueForThemeAttribute:@"divider-thickness"];
 
@@ -604,27 +506,19 @@ CPSegmentSwitchTrackingMomentary = 2;
 - (CPView)createEphemeralSubviewNamed:(CPString)aName
 {
     if ([aName hasPrefix:@"segment-content"])
-        return [[_CPImageAndTextView alloc] initWithFrame:CGRectMakeZero()];
+        return [[_CPImageAndTextView alloc] initWithFrame:_CGRectMakeZero()];
 
-    return [[CPView alloc] initWithFrame:CGRectMakeZero()];
+    return [[CPView alloc] initWithFrame:_CGRectMakeZero()];
 }
 
 - (void)layoutSubviews
 {
-    if ([self segmentCount] <= 0)
+    if (_segments.length <= 0)
         return;
 
-    var themeState = _themeStates[0],
-        isDisabled = [self hasThemeState:CPThemeStateDisabled],
-        isControlSizeSmall = [self hasThemeState:CPThemeStateControlSizeSmall],
-        isControlSizeMini = [self hasThemeState:CPThemeStateControlSizeMini];
+    var themeState = _themeStates[0];
 
-    themeState = isDisabled ? themeState.and(CPThemeStateDisabled) : themeState;
-
-    if (isControlSizeSmall)
-        themeState = themeState.and(CPThemeStateControlSizeSmall);
-    else if (isControlSizeMini)
-        themeState = themeState.and(CPThemeStateControlSizeMini);
+    themeState |= _themeState & CPThemeStateDisabled;
 
     var leftCapColor = [self valueForThemeAttribute:@"left-segment-bezel-color"
                                             inState:themeState],
@@ -637,12 +531,7 @@ CPSegmentSwitchTrackingMomentary = 2;
 
     var themeState = _themeStates[_themeStates.length - 1];
 
-    themeState = isDisabled ? themeState.and(CPThemeStateDisabled) : themeState;
-
-    if (isControlSizeSmall)
-        themeState = themeState.and(CPThemeStateControlSizeSmall);
-    else if (isControlSizeMini)
-        themeState = themeState.and(CPThemeStateControlSizeMini);
+    themeState |= _themeState & CPThemeStateDisabled;
 
     var rightCapColor = [self valueForThemeAttribute:@"right-segment-bezel-color"
                                              inState:themeState],
@@ -657,12 +546,7 @@ CPSegmentSwitchTrackingMomentary = 2;
     {
         var themeState = _themeStates[i];
 
-        themeState = isDisabled ? themeState.and(CPThemeStateDisabled) : themeState;
-
-        if (isControlSizeSmall)
-            themeState = themeState.and(CPThemeStateControlSizeSmall);
-        else if (isControlSizeMini)
-            themeState = themeState.and(CPThemeStateControlSizeMini);
+        themeState |= _themeState & CPThemeStateDisabled;
 
         var bezelColor = [self valueForThemeAttribute:@"center-segment-bezel-color"
                                               inState:themeState],
@@ -673,6 +557,7 @@ CPSegmentSwitchTrackingMomentary = 2;
 
         [bezelView setBackgroundColor:bezelColor];
 
+
         // layout image/title views
         var segment = _segments[i],
             contentView = [self layoutEphemeralSubviewNamed:@"segment-content-" + i
@@ -699,15 +584,11 @@ CPSegmentSwitchTrackingMomentary = 2;
         if (i == count - 1)
             continue;
 
+        var borderState = _themeStates[i] | _themeStates[i + 1];
 
-        var borderState = _themeStates[i].and(_themeStates[i + 1]);
+        borderState = (borderState & CPThemeStateSelected & ~CPThemeStateHighlighted) ? CPThemeStateSelected : CPThemeStateNormal;
 
-        borderState = isDisabled ? borderState.and(CPThemeStateDisabled) : borderState;
-
-        if (isControlSizeSmall)
-            borderState = borderState.and(CPThemeStateControlSizeSmall);
-        else if (isControlSizeMini)
-            borderState = borderState.and(CPThemeStateControlSizeMini);
+        borderState |= _themeState & CPThemeStateDisabled;
 
         var borderColor = [self valueForThemeAttribute:@"divider-bezel-color"
                                                inState:borderState],
@@ -730,33 +611,61 @@ CPSegmentSwitchTrackingMomentary = 2;
 {
 }
 
-/*! @ignore */
-- (void)tile
+- (void)tileWithChangedSegment:(unsigned)aSegment
 {
-    [self tileWithChangedSegment:0];
-}
-
-/*! @ignore */
-- (void)tileWithChangedSegment:(CPInteger)aSegment
-{
-    var segmentCount = [self segmentCount];
-
-    // Corner case: when segmentCount == 0 and aSegment == 0, we do not return here because we still need to set the new frameSize bellow.
-    if (aSegment < 0 || (segmentCount > 0 && aSegment >= segmentCount))
+    if (aSegment >= _segments.length)
         return;
 
-    var width = 0;
+    var segment = _segments[aSegment],
+        segmentWidth = [segment width],
+        themeState = _themeStates[aSegment] | (_themeState & CPThemeStateDisabled),
+        contentInset = [self valueForThemeAttribute:@"content-inset" inState:themeState],
+        font = [self font];
 
-    if (segmentCount > 0)
+    if (!segmentWidth)
     {
-        // Invalidate frames for segments on the right. They will be lazily computed by -frameForSegment:.
-        for (var i = aSegment; i < segmentCount; i++)
-            [_segments[i] setFrame:CGRectMakeZero()];
-
-        width = CGRectGetMaxX([self frameForSegment:(segmentCount - 1)]);
+        if ([segment image] && [segment label])
+            segmentWidth = [[segment label] sizeWithFont:font].width + [[segment image] size].width + contentInset.left + contentInset.right;
+        else if (segment.image)
+            segmentWidth = [[segment image] size].width + contentInset.left + contentInset.right;
+        else if (segment.label)
+            segmentWidth = [[segment label] sizeWithFont:font].width + contentInset.left + contentInset.right;
+        else
+            segmentWidth = 0.0;
     }
 
-    [self setFrameSize:CGSizeMake(width, CGRectGetHeight([self frame]))];
+    var delta = segmentWidth - CGRectGetWidth([segment frame]);
+
+    if (!delta)
+    {
+        [self setNeedsLayout];
+        [self setNeedsDisplay:YES];
+
+        return;
+    }
+
+    // Update control size
+    var frame = [self frame];
+
+    [self setFrameSize:CGSizeMake(CGRectGetWidth(frame) + delta, CGRectGetHeight(frame))];
+
+    // Update segment width
+    [segment setWidth:segmentWidth];
+    [segment setFrame:[self frameForSegment:aSegment]];
+
+    // Update following segments widths
+    var index = aSegment + 1;
+
+    for (; index < _segments.length; ++index)
+    {
+        [_segments[index] frame].origin.x += delta;
+
+        [self drawSegmentBezel:index highlight:NO];
+        [self drawSegment:index highlight:NO];
+    }
+
+    [self drawSegmentBezel:aSegment highlight:NO];
+    [self drawSegment:aSegment highlight:NO];
 
     [self setNeedsLayout];
     [self setNeedsDisplay:YES];
@@ -768,57 +677,29 @@ CPSegmentSwitchTrackingMomentary = 2;
 */
 - (CGRect)frameForSegment:(unsigned)aSegment
 {
-    var segment = [_segments objectAtIndex:aSegment],
-        frame = [segment frame];
-
-    if (CGRectEqualToRect(frame, CGRectMakeZero()))
-    {
-        frame = [self bezelFrameForSegment:aSegment];
-        [segment setFrame:frame];
-    }
-
-    return frame;
+    return [self bezelFrameForSegment:aSegment];
 }
 
 - (CGRect)bezelFrameForSegment:(unsigned)aSegment
 {
-    var left = [self _leftOffsetForSegment:aSegment],
-        top = [self currentValueForThemeAttribute:@"bezel-inset"].top,
+    var height = [self currentValueForThemeAttribute:@"default-height"],
+        bezelInset = [self currentValueForThemeAttribute:@"bezel-inset"],
         width = [self widthForSegment:aSegment],
-        height = [self currentValueForThemeAttribute:@"min-size"].height;
+        left = [self _leftOffsetForSegment:aSegment];
 
-    if (width == 0)
-    {
-        var themeState = _themeState.hasThemeState(CPThemeStateDisabled) ? _themeStates[aSegment].and(CPThemeStateDisabled) : _themeStates[aSegment],
-            contentInset = [self valueForThemeAttribute:@"content-inset" inState:themeState],
-            contentInsetWidth = contentInset.left + contentInset.right,
-
-            segment = _segments[aSegment],
-            label = [segment label],
-            image = [segment image];
-
-        width = (label ? [label sizeWithFont:[self font]].width : 4.0) + (image ? [image size].width : 0) + contentInsetWidth;
-    }
-
-    return CGRectMake(left, top, width, height);
+    return CGRectMake(left, bezelInset.top, width, height);
 }
 
 - (CGRect)contentFrameForSegment:(unsigned)aSegment
 {
-    var height = [self currentValueForThemeAttribute:@"min-size"].height,
+    var height = [self currentValueForThemeAttribute:@"default-height"],
         contentInset = [self currentValueForThemeAttribute:@"content-inset"],
-        width = CGRectGetWidth([self frameForSegment:aSegment]),
+        width = [self widthForSegment:aSegment],
         left = [self _leftOffsetForSegment:aSegment];
 
     return CGRectMake(left + contentInset.left, contentInset.top, width - contentInset.left - contentInset.right, height - contentInset.top - contentInset.bottom);
 }
 
-- (CGSize)_minimumFrameSize
-{
-    // The current width is always the minimum width.
-    return CGSizeMake(CGRectGetWidth([self frame]), [self currentValueForThemeAttribute:@"min-size"].height);
-}
-
 /*!
     Returns the segment that is hit by the specified point.
     @param aPoint the point to test for a segment hit
@@ -827,19 +708,19 @@ CPSegmentSwitchTrackingMomentary = 2;
 - (unsigned)testSegment:(CGPoint)aPoint
 {
     var location = [self convertPoint:aPoint fromView:nil],
-        count = [self segmentCount];
+        count = _segments.length;
 
     while (count--)
-        if (CGRectContainsPoint([self frameForSegment:count], aPoint))
+        if (CGRectContainsPoint([_segments[count] frame], aPoint))
             return count;
 
-    if ([self segmentCount])
+    if (_segments.length)
     {
-        var adjustedLastFrame = CGRectCreateCopy([self frameForSegment:(_segments.length - 1)]);
+        var adjustedLastFrame = CGRectCreateCopy([_segments[_segments.length - 1] frame]);
         adjustedLastFrame.size.width = CGRectGetWidth([self bounds]) - adjustedLastFrame.origin.x;
 
         if (CGRectContainsPoint(adjustedLastFrame, aPoint))
-            return [self segmentCount] - 1;
+            return _segments.length - 1;
     }
 
     return -1;
@@ -890,7 +771,7 @@ CPSegmentSwitchTrackingMomentary = 2;
             {
                 [self setSelected:NO forSegment:_trackingSegment];
 
-                _selectedSegment = CPNotFound;
+                _selectedSegment = -1;
             }
         }
 
@@ -918,7 +799,6 @@ CPSegmentSwitchTrackingMomentary = 2;
             return;
 
         var highlighted = [self testSegment:location] === _trackingSegment;
-
         if (highlighted != _trackingHighlighted)
         {
             _trackingHighlighted = highlighted;
@@ -934,7 +814,7 @@ CPSegmentSwitchTrackingMomentary = 2;
 {
     [super setFont:aFont];
 
-    [self tile];
+    [self tileWithChangedSegment:0];
 }
 
 @end
@@ -966,49 +846,28 @@ var CPSegmentedControlSegmentsKey       = "CPSegmentedControlSegmentsKey",
         if ([aCoder containsValueForKey:CPSegmentedControlSelectedKey])
             _selectedSegment = [aCoder decodeIntForKey:CPSegmentedControlSelectedKey];
         else
-            _selectedSegment = CPNotFound;
+            _selectedSegment = -1;
 
         if ([aCoder containsValueForKey:CPSegmentedControlTrackingModeKey])
             _trackingMode = [aCoder decodeIntForKey:CPSegmentedControlTrackingModeKey];
         else
             _trackingMode = CPSegmentSwitchTrackingSelectOne;
 
-        // Here we update the themeStates array for each segments to know if there are selected or not
-        for (var i = 0; i < [self segmentCount]; i++)
+        // HACK
+
+        for (var i = 0; i < _segments.length; i++)
+        {
             _themeStates[i] = [_segments[i] selected] ? CPThemeStateSelected : CPThemeStateNormal;
-
-        [self tile];
-
-        var thickness = [self currentValueForThemeAttribute:@"divider-thickness"],
-            dividerExtraSpace = ([_segments count] - 1) * thickness,
-            difference = MAX(originalWidth - [self frame].size.width - dividerExtraSpace, 0.0),
-            remainingWidth = FLOOR(difference / [self segmentCount]),
-            widthOfAllSegments = 0;
-
-        // We do this in a second loop because it relies on all the themeStates being set first
-        for (var i = 0; i < [self segmentCount]; i++)
-        {
-            var frame = [_segments[i] frame];
-            frame.size.width += remainingWidth;
-
-            widthOfAllSegments += CGRectGetWidth(frame);
+            [self tileWithChangedSegment:i];
         }
 
-        // Here we handle the leftovers pixel, and we will add one pixel to each segment cell till we have the same size as the originalSize.
-        // This is needed to have a perfect/same alignment between our application and xCode.
-        var leftOversPixel = originalWidth - (widthOfAllSegments + dividerExtraSpace);
+        var difference = MAX(originalWidth - [self frame].size.width, 0.0),
+            remainingWidth = FLOOR(difference / _segments.length);
 
-        // Make sure we don't make an out of range
-        if (leftOversPixel < [self segmentCount] - 1)
-        {
-            for (var i = 0; i < leftOversPixel; i++)
-            {
-                [_segments[i] frame].size.width += 1;
-            }
-        }
+        for (var i = 0; i < _segments.length; i++)
+            [self setWidth:[_segments[i] width] + remainingWidth forSegment:i];
 
-        [self setFrameSize:CGSizeMake(originalWidth, CGRectGetHeight([self frame]))];
-        [self tile];
+        [self tileWithChangedSegment:0];
     }
 
     return self;
@@ -1026,91 +885,6 @@ var CPSegmentedControlSegmentsKey       = "CPSegmentedControlSegmentsKey",
 
 @end
 
-@implementation CPSegmentedControl (BindingSupport)
-
-+ (Class)_binderClassForBinding:(CPString)aBinding
-{
-    if ([self _isSelectionBinding:aBinding])
-        return [_CPSegmentedControlBinder class];
-
-    return [super _binderClassForBinding:aBinding];
-}
-
-+ (BOOL)_isSelectionBinding:(CPString)aBinding
-{
-    return (aBinding === CPSelectedIndexBinding || aBinding === CPSelectedLabelBinding || aBinding === CPSelectedTagBinding);
-}
-
-+ (BOOL)isBindingExclusive:(CPString)aBinding
-{
-    return [self _isSelectionBinding:aBinding];
-}
-
-- (void)bind:(CPString)aBinding toObject:(id)anObject withKeyPath:(CPString)aKeyPath options:(CPDictionary)options
-{
-    if ([[self class] _isSelectionBinding:aBinding] && _trackingMode !== CPSegmentSwitchTrackingSelectOne)
-    {
-        CPLog.warn("Binding " + aBinding + " needs CPSegmentSwitchTrackingSelectOne tracking mode");
-        return;
-    }
-
-    [super bind:aBinding toObject:anObject withKeyPath:aKeyPath options:options];
-}
-
-- (void)_reverseSetBinding
-{
-    [_CPSegmentedControlBinder _reverseSetValueFromExclusiveBinderForObject:self];
-}
-
-@end
-
-var CPSegmentedControlNoSelectionPlaceholder = "CPSegmentedControlNoSelectionPlaceholder";
-
-@implementation _CPSegmentedControlBinder : CPBinder
-{
-}
-
-- (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

@@ -22,9 +22,6 @@
 
 @import <Foundation/CPObject.j>
 
-@import "CGGeometry.j"
-@import "CPColor.j"
-@import "CPGraphicsContext.j"
 
 /*!
     @deprecated
@@ -34,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;
 }
 
 /*!
@@ -52,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];
 
@@ -61,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;
 }
 
 /*!
@@ -78,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"
 
-@typedef CPShadowWeight
+
 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;
 
-+ (CPDictionary)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
@@ -49,14 +46,10 @@ CPCircularSlider    = 1;
     return "slider";
 }
 
-+ (CPDictionary)themeAttributes
++ (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
@@ -162,16 +155,16 @@ CPCircularSlider    = 1;
         var trackWidth = [self currentValueForThemeAttribute:@"track-width"];
 
         if (trackWidth <= 0)
-            return CGRectMakeZero();
+            return _CGRectMakeZero();
 
         if ([self isVertical])
         {
-            bounds.origin.x = (CGRectGetWidth(bounds) - trackWidth) / 2.0;
+            bounds.origin.x = (_CGRectGetWidth(bounds) - trackWidth) / 2.0;
             bounds.size.width = trackWidth;
         }
         else
         {
-            bounds.origin.y = (CGRectGetHeight(bounds) - trackWidth) / 2.0;
+            bounds.origin.y = (_CGRectGetHeight(bounds) - trackWidth) / 2.0;
             bounds.size.height = trackWidth;
         }
     }
@@ -184,13 +177,13 @@ CPCircularSlider    = 1;
     var knobSize = [self currentValueForThemeAttribute:@"knob-size"];
 
     if (knobSize.width <= 0 || knobSize.height <= 0)
-        return CGRectMakeZero();
+        return _CGRectMakeZero();
 
-    var knobRect = CGRectMake(0.0, 0.0, knobSize.width, knobSize.height),
+    var knobRect = _CGRectMake(0.0, 0.0, knobSize.width, knobSize.height),
         trackRect = [self trackRectForBounds:bounds];
 
     // No track, do our best to approximate a place for this thing.
-    if (!trackRect || CGRectIsEmpty(trackRect))
+    if (!trackRect || _CGRectIsEmpty(trackRect))
         trackRect = bounds;
 
     if ([self hasThemeState:CPThemeStateCircular])
@@ -203,13 +196,13 @@ CPCircularSlider    = 1;
     }
     else if ([self isVertical])
     {
-        knobRect.origin.x = CGRectGetMidX(trackRect) - knobSize.width / 2.0;
-        knobRect.origin.y = ((_maxValue - [self doubleValue]) / (_maxValue - _minValue)) * (CGRectGetHeight(trackRect) - knobSize.height);
+        knobRect.origin.x = _CGRectGetMidX(trackRect) - knobSize.width / 2.0;
+        knobRect.origin.y = ((_maxValue - [self doubleValue]) / (_maxValue - _minValue)) * (_CGRectGetHeight(trackRect) - knobSize.height);
     }
     else
     {
-        knobRect.origin.x = (([self doubleValue] - _minValue) / (_maxValue - _minValue)) * (CGRectGetWidth(trackRect) - knobSize.width);
-        knobRect.origin.y = CGRectGetMidY(trackRect) - knobSize.height / 2.0;
+        knobRect.origin.x = (([self doubleValue] - _minValue) / (_maxValue - _minValue)) * (_CGRectGetWidth(trackRect) - knobSize.width);
+        knobRect.origin.y = _CGRectGetMidY(trackRect) - knobSize.height / 2.0;
     }
 
     return knobRect;
@@ -260,8 +253,8 @@ CPCircularSlider    = 1;
 {
     // Recalculate isVertical.
     var bounds = [self bounds],
-        width = CGRectGetWidth(bounds),
-        height = CGRectGetHeight(bounds);
+        width = _CGRectGetWidth(bounds),
+        height = _CGRectGetHeight(bounds);
 
     _isVertical = width < height ? 1 : (width > height ? 0 : -1);
 
@@ -306,55 +299,55 @@ CPCircularSlider    = 1;
 
     if ([self hasThemeState:CPThemeStateCircular])
     {
-        var knobWidth = CGRectGetWidth(knobRect);
+        var knobWidth = _CGRectGetWidth(knobRect);
 
         trackRect.origin.x += knobWidth / 2;
         trackRect.size.width -= knobWidth;
 
         var minValue = [self minValue],
-            dx = aPoint.x - CGRectGetMidX(trackRect),
-            dy = aPoint.y - CGRectGetMidY(trackRect);
+            dx = aPoint.x - _CGRectGetMidX(trackRect),
+            dy = aPoint.y - _CGRectGetMidY(trackRect);
 
         return MAX(0.0, MIN(1.0, 1.0 - (3 * PI_2 - ATAN2(dy, dx)) % PI2 / PI2)) * ([self maxValue] - minValue) + minValue;
     }
     else if ([self isVertical])
     {
-        var knobHeight = CGRectGetHeight(knobRect);
+        var knobHeight = _CGRectGetHeight(knobRect);
 
         trackRect.origin.y += knobHeight / 2;
         trackRect.size.height -= knobHeight;
 
         var minValue = [self minValue];
 
-        return MAX(0.0, MIN(1.0, (CGRectGetMaxY(trackRect) - aPoint.y) / CGRectGetHeight(trackRect))) * ([self maxValue] - minValue) + minValue;
+        return MAX(0.0, MIN(1.0, (_CGRectGetMaxY(trackRect) - aPoint.y) / _CGRectGetHeight(trackRect))) * ([self maxValue] - minValue) + minValue;
     }
     else
     {
-        var knobWidth = CGRectGetWidth(knobRect);
+        var knobWidth = _CGRectGetWidth(knobRect);
 
         trackRect.origin.x += knobWidth / 2;
         trackRect.size.width -= knobWidth;
 
         var minValue = [self minValue];
 
-        return MAX(0.0, MIN(1.0, (aPoint.x - CGRectGetMinX(trackRect)) / CGRectGetWidth(trackRect))) * ([self maxValue] - minValue) + minValue;
+        return MAX(0.0, MIN(1.0, (aPoint.x - _CGRectGetMinX(trackRect)) / _CGRectGetWidth(trackRect))) * ([self maxValue] - minValue) + minValue;
     }
 }
 
 - (BOOL)startTrackingAt:(CGPoint)aPoint
 {
     var bounds = [self bounds],
-        knobRect = [self knobRectForBounds:CGRectMakeCopy(bounds)];
+        knobRect = [self knobRectForBounds:_CGRectMakeCopy(bounds)];
 
-    if (CGRectContainsPoint(knobRect, aPoint))
-        _dragOffset = CGSizeMake(CGRectGetMidX(knobRect) - aPoint.x, CGRectGetMidY(knobRect) - aPoint.y);
+    if (_CGRectContainsPoint(knobRect, aPoint))
+        _dragOffset = _CGSizeMake(_CGRectGetMidX(knobRect) - aPoint.x, _CGRectGetMidY(knobRect) - aPoint.y);
     else
     {
         var trackRect = [self trackRectForBounds:bounds];
 
-        if (trackRect && CGRectContainsPoint(trackRect, aPoint))
+        if (trackRect && _CGRectContainsPoint(trackRect, aPoint))
         {
-            _dragOffset = CGSizeMakeZero();
+            _dragOffset = _CGSizeMakeZero();
 
             [self setObjectValue:[self _valueAtPoint:aPoint]];
         }
@@ -373,7 +366,7 @@ CPCircularSlider    = 1;
 
 - (BOOL)continueTracking:(CGPoint)lastPoint at:(CGPoint)aPoint
 {
-    [self setObjectValue:[self _valueAtPoint:CGPointMake(aPoint.x + _dragOffset.width, aPoint.y + _dragOffset.height)]];
+    [self setObjectValue:[self _valueAtPoint:_CGPointMake(aPoint.x + _dragOffset.width, aPoint.y + _dragOffset.height)]];
 
     return YES;
 }

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"
 
 
 /*
@@ -55,6 +49,7 @@
     CPTextField _hexLabel;
     CPTextField _hexValue;
 
+    CPTextField _hexValue;
     CPTextField _redValue;
     CPTextField _greenValue;
     CPTextField _blueValue;
@@ -70,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];
@@ -145,7 +140,7 @@
     [_hueLabel setTextColor:[CPColor blackColor]];
 
     _hueSlider = [[CPSlider alloc] initWithFrame:CGRectMake(15, 143, aFrame.size.width - 70, 20)];
-    [_hueSlider setMaxValue:0.999];
+    [_hueSlider setMaxValue:359.0];
     [_hueSlider setMinValue:0.0];
     [_hueSlider setTarget:self];
     [_hueSlider setAction:@selector(sliderChanged:)];
@@ -164,7 +159,7 @@
     [_saturationLabel setTextColor:[CPColor blackColor]];
 
     _saturationSlider = [[CPSlider alloc] initWithFrame:CGRectMake(15, 168, aFrame.size.width - 70, 20)];
-    [_saturationSlider setMaxValue:1.0];
+    [_saturationSlider setMaxValue:100.0];
     [_saturationSlider setMinValue:0.0];
     [_saturationSlider setTarget:self];
     [_saturationSlider setAction:@selector(sliderChanged:)];
@@ -183,7 +178,7 @@
     [_brightnessLabel setTextColor:[CPColor blackColor]];
 
     _brightnessSlider = [[CPSlider alloc] initWithFrame:CGRectMake(15, 194, aFrame.size.width - 70, 20)];
-    [_brightnessSlider setMaxValue:1.0];
+    [_brightnessSlider setMaxValue:100.0];
     [_brightnessSlider setMinValue:0.0];
     [_brightnessSlider setTarget:self];
     [_brightnessSlider setAction:@selector(sliderChanged:)];
@@ -281,9 +276,6 @@
 
 - (void)setColor:(CPColor)aColor
 {
-    if (!aColor)
-        [CPException raise:CPInvalidArgumentException reason:"aColor can't be nil"];
-
     [self updateRGBSliders:aColor];
     [self updateHSBSliders:aColor];
     [self updateHex:aColor];
@@ -315,9 +307,9 @@
 
 - (void)updateLabels
 {
-    [_hueValue setStringValue:ROUND([_hueSlider floatValue] * 360.0)];
-    [_saturationValue setStringValue:ROUND([_saturationSlider floatValue] * 100.0)];
-    [_brightnessValue setStringValue:ROUND([_brightnessSlider floatValue] * 100.0)];
+    [_hueValue setStringValue:ROUND([_hueSlider floatValue])];
+    [_saturationValue setStringValue:ROUND([_saturationSlider floatValue])];
+    [_brightnessValue setStringValue:ROUND([_brightnessSlider floatValue])];
 
     [_redValue setStringValue:ROUND([_redSlider floatValue] * 255)];
     [_greenValue setStringValue:ROUND([_greenSlider floatValue] * 255)];
@@ -365,15 +357,15 @@
                                    [self sliderChanged:_blueSlider];
                                    break;
 
-            case _hueValue:        [_hueSlider setFloatValue:MAX(MIN(ROUND(value), 360) / 360.0, 0)];
+            case _hueValue:        [_hueSlider setFloatValue:MAX(MIN(ROUND(value), 360), 0)];
                                    [self sliderChanged:_hueSlider];
                                    break;
 
-            case _saturationValue: [_saturationSlider setFloatValue:MAX(MIN(ROUND(value), 100) / 100.0, 0)];
+            case _saturationValue: [_saturationSlider setFloatValue:MAX(MIN(ROUND(value), 100), 0)];
                                    [self sliderChanged:_saturationSlider];
                                    break;
 
-            case _brightnessValue: [_brightnessSlider setFloatValue:MAX(MIN(ROUND(value), 100) / 100.0, 0)];
+            case _brightnessValue: [_brightnessSlider setFloatValue:MAX(MIN(ROUND(value), 100), 0)];
                                    [self sliderChanged:_brightnessSlider];
                                    break;
         }

AppKit/CPSound.j

@@ -21,19 +21,6 @@
  */
 
 @import <Foundation/CPObject.j>
-@import <Foundation/CPRunLoop.j>
-
-@typedef HTMLAudioElement
-
-@protocol CPSoundDelegate <CPObject>
-
-@optional
-- (void)sound:(CPSound)aSound didFinishPlaying:(BOOL)finishedLoading;
-
-@end
-
-
-var CPSoundDelegate_sound_didFinishPlaying_ = 1 << 1;
 
 CPSoundLoadStateEmpty       = 0;
 CPSoundLoadStateLoading     = 1;
@@ -62,7 +49,6 @@ CPSoundPlayBackStatePause   = 2;
     HTMLAudioElement    _audioTag;
     int                 _loadStatus;
     int                 _playBackStatus;
-    unsigned            _implementedDelegateMethods;
 }
 
 #pragma mark -
@@ -73,7 +59,7 @@ CPSoundPlayBackStatePause   = 2;
     if (self = [super init])
     {
         _loadStatus = CPSoundLoadStateEmpty;
-//        _loops = NO;
+        _loops = NO;
         _audioTag = document.createElement("audio");
         _audioTag.preload = YES;
         _playRequestBeforeLoad = NO;
@@ -146,25 +132,6 @@ CPSoundPlayBackStatePause   = 2;
 }
 
 
-#pragma mark -
-#pragma mark Delegate methods
-
-/*!
-    Sets the sound's delegate.
-    @param aDelegate the new delegate
-*/
-- (void)setDelegate:(id)aDelegate
-{
-    if (_delegate === aDelegate)
-        return;
-
-    _delegate = aDelegate;
-    _implementedDelegateMethods = 0;
-
-    if ([_delegate respondsToSelector:@selector(sound:didFinishPlaying:)])
-        _implementedDelegateMethods |= CPSoundDelegate_sound_didFinishPlaying_;
-}
-
 #pragma mark -
 #pragma mark Events listener
 
@@ -239,7 +206,8 @@ CPSoundPlayBackStatePause   = 2;
     _audioTag.currentTime = 0.0;
     _playBackStatus = CPSoundPlayBackStateStop;
 
-    [self _sendDelegateSoundDidFinishPlaying:YES];
+    if (_delegate && [_delegate respondsToSelector:@selector(sound:didFinishPlaying:)])
+        [_delegate sound:self didFinishPlaying:YES];
 
     return YES;
 }
@@ -347,20 +315,3 @@ CPSoundPlayBackStatePause   = 2;
 }
 
 @end
-
-
-@implementation CPSound (CPSoundDelegate)
-
-/*!
-    @ignore
-    Call delegate sound:didFinishPlaying:
-*/
-- (void)_sendDelegateSoundDidFinishPlaying:(BOOL)finishedPlaying
-{
-    if (!(_implementedDelegateMethods & CPSoundDelegate_sound_didFinishPlaying_))
-        return;
-
-    [_delegate sound:self didFinishPlaying:finishedPlaying];
-}
-
-@end

AppKit/CPSplitView.j

@@ -25,40 +25,6 @@
 @import "CPButtonBar.j"
 @import "CPImage.j"
 @import "CPView.j"
-@import "CPCursor.j"
-@import "CPTrackingArea.j"
-
-@class CPUserDefaults
-@global CPApp
-
-@protocol CPSplitViewDelegate <CPObject>
-
-@optional
-- (BOOL)splitView:(CPSplitView)splitView canCollapseSubview:(CPView)subview;
-- (BOOL)splitView:(CPSplitView)splitView shouldAdjustSizeOfSubview:(CPView)subview;
-- (BOOL)splitView:(CPSplitView)splitView shouldCollapseSubview:(CPView)subview forDoubleClickOnDividerAtIndex:(CPInteger)dividerIndex;
-- (CGRect)splitView:(CPSplitView)splitView additionalEffectiveRectOfDividerAtIndex:(CPInteger)dividerIndex;
-- (CGRect)splitView:(CPSplitView)splitView effectiveRect:(CGRect)proposedEffectiveRect forDrawnRect:(CGRect)drawnRect ofDividerAtIndex:(CPInteger)dividerIndex;
-- (float)splitView:(CPSplitView)splitView constrainMaxCoordinate:(float)proposedMax ofSubviewAt:(CPInteger)dividerIndex;
-- (float)splitView:(CPSplitView)splitView constrainMinCoordinate:(float)proposedMin ofSubviewAt:(CPInteger)dividerIndex;
-- (float)splitView:(CPSplitView)splitView constrainSplitPosition:(float)proposedPosition ofSubviewAt:(CPInteger)dividerIndex;
-- (void)splitView:(CPSplitView)splitView resizeSubviewsWithOldSize:(CGSize)oldSize;
-- (void)splitViewDidResizeSubviews:(CPNotification)aNotification;
-- (void)splitViewWillResizeSubviews:(CPNotification)aNotification;
-
-@end
-
-var CPSplitViewDelegate_splitView_canCollapseSubview_                                   = 1 << 0,
-    CPSplitViewDelegate_splitView_shouldAdjustSizeOfSubview_                            = 1 << 1,
-    CPSplitViewDelegate_splitView_shouldCollapseSubview_forDoubleClickOnDividerAtIndex_ = 1 << 2,
-    CPSplitViewDelegate_splitView_additionalEffectiveRectOfDividerAtIndex_              = 1 << 3,
-    CPSplitViewDelegate_splitView_effectiveRect_forDrawnRect_ofDividerAtIndex_          = 1 << 4,
-    CPSplitViewDelegate_splitView_constrainMaxCoordinate_ofSubviewAt_                   = 1 << 5,
-    CPSplitViewDelegate_splitView_constrainMinCoordinate_ofSubviewAt_                   = 1 << 6,
-    CPSplitViewDelegate_splitView_constrainSplitPosition_ofSubviewAt_                   = 1 << 7,
-    CPSplitViewDelegate_splitView_resizeSubviewsWithOldSize_                            = 1 << 8,
-    CPSplitViewDelegate_splitViewDidResizeSubviews_                                     = 1 << 9,
-    CPSplitViewDelegate_splitViewWillResizeSubviews_                                    = 1 << 10;
 
 #define SPLIT_VIEW_MAYBE_POST_WILL_RESIZE() \
     if ((_suppressResizeNotificationsMask & DidPostWillResizeNotification) === 0) \
@@ -85,7 +51,10 @@ var CPSplitViewDelegate_splitView_canCollapseSubview_
 CPSplitViewDidResizeSubviewsNotification = @"CPSplitViewDidResizeSubviewsNotification";
 CPSplitViewWillResizeSubviewsNotification = @"CPSplitViewWillResizeSubviewsNotification";
 
-var ShouldSuppressResizeNotifications   = 1,
+var CPSplitViewHorizontalImage = nil,
+    CPSplitViewVerticalImage = nil,
+
+    ShouldSuppressResizeNotifications   = 1,
     DidPostWillResizeNotification       = 1 << 1,
     DidSuppressResizeNotification       = 1 << 2;
 
@@ -103,31 +72,29 @@ var ShouldSuppressResizeNotifications   = 1,
 
 @implementation CPSplitView : CPView
 {
-    id <CPSplitViewDelegate>    _delegate;
-    BOOL                        _isVertical;
-    BOOL                        _isPaneSplitter;
+    id              _delegate;
+    BOOL            _isVertical;
+    BOOL            _isPaneSplitter;
 
-    int                         _currentDivider;
-    float                       _initialOffset;
-    CPDictionary                _preCollapsePositions;
+    int             _currentDivider;
+    float           _initialOffset;
+    CPDictionary    _preCollapsePositions;
 
-    CPString                    _originComponent;
-    CPString                    _sizeComponent;
+    CPString        _originComponent;
+    CPString        _sizeComponent;
 
-    CPArray                     _DOMDividerElements;
-    CPString                    _dividerImagePath;
-    int                         _drawingDivider;
+    CPArray         _DOMDividerElements;
+    CPString        _dividerImagePath;
+    int             _drawingDivider;
 
-    CPString                    _autosaveName;
-    BOOL                        _shouldAutosave;
-    CGSize                      _shouldRestoreFromAutosaveUnlessFrameSize;
+    CPString        _autosaveName;
+    BOOL            _shouldAutosave;
+    CGSize          _shouldRestoreFromAutosaveUnlessFrameSize;
 
-    BOOL                        _needsResizeSubviews;
-    int                         _suppressResizeNotificationsMask;
+    BOOL            _needsResizeSubviews;
+    int             _suppressResizeNotificationsMask;
 
-    CPArray                     _buttonBars;
-
-    unsigned                    _implementedDelegateMethods;
+    CPArray         _buttonBars;
 }
 
 + (CPString)defaultThemeClass
@@ -135,15 +102,24 @@ var ShouldSuppressResizeNotifications   = 1,
     return @"splitview";
 }
 
-+ (CPDictionary)themeAttributes
++ (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
@@ -226,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;
 }
@@ -366,8 +342,8 @@ var ShouldSuppressResizeNotifications   = 1,
     }
 
     [self _setupDOMDivider];
-    CPDOMDisplayServerSetStyleLeftTop(_DOMDividerElements[_drawingDivider], NULL, CGRectGetMinX(aRect), CGRectGetMinY(aRect));
-    CPDOMDisplayServerSetStyleSize(_DOMDividerElements[_drawingDivider], CGRectGetWidth(aRect), CGRectGetHeight(aRect));
+    CPDOMDisplayServerSetStyleLeftTop(_DOMDividerElements[_drawingDivider], NULL, _CGRectGetMinX(aRect), _CGRectGetMinY(aRect));
+    CPDOMDisplayServerSetStyleSize(_DOMDividerElements[_drawingDivider], _CGRectGetWidth(aRect), _CGRectGetHeight(aRect));
 #endif
 }
 
@@ -438,8 +414,11 @@ var ShouldSuppressResizeNotifications   = 1,
         buttonBarRect.origin = [self convertPoint:buttonBarRect.origin fromView:buttonBar];
     }
 
-    effectiveRect = [self _sendDelegateSplitViewEffectiveRect:effectiveRect forDrawnRect:effectiveRect ofDividerAtIndex:anIndex];
-    additionalRect = [self _sendDelegateSplitViewAdditionalEffectiveRectOfDividerAtIndex:anIndex];
+    if ([_delegate respondsToSelector:@selector(splitView:effectiveRect:forDrawnRect:ofDividerAtIndex:)])
+        effectiveRect = [_delegate splitView:self effectiveRect:effectiveRect forDrawnRect:effectiveRect ofDividerAtIndex:anIndex];
+
+    if ([_delegate respondsToSelector:@selector(splitView:additionalEffectiveRectOfDividerAtIndex:)])
+        additionalRect = [_delegate splitView:self additionalEffectiveRectOfDividerAtIndex:anIndex];
 
     return CGRectContainsPoint(effectiveRect, aPoint) ||
            (additionalRect && CGRectContainsPoint(additionalRect, aPoint)) ||
@@ -501,21 +480,21 @@ var ShouldSuppressResizeNotifications   = 1,
             if ([self cursorAtPoint:point hitDividerAtIndex:i])
             {
                 if ([anEvent clickCount] == 2 &&
-                    [self _delegateRespondsToSplitViewCanCollapseSubview] &&
-                    [self _delegateRespondsToSplitViewshouldCollapseSubviewForDoubleClickOnDividerAtIndex])
+                    [_delegate respondsToSelector:@selector(splitView:canCollapseSubview:)] &&
+                    [_delegate respondsToSelector:@selector(splitView:shouldCollapseSubview:forDoubleClickOnDividerAtIndex:)])
                 {
                     var minPosition = [self minPossiblePositionOfDividerAtIndex:i],
                         maxPosition = [self maxPossiblePositionOfDividerAtIndex:i],
                         preCollapsePosition = [_preCollapsePositions objectForKey:"" + i] || 0;
 
-                    if ([self _sendDelegateSplitViewCanCollapseSubview:_subviews[i]] && [self _sendDelegateSplitViewShouldCollapseSubview:_subviews[i] forDoubleClickOnDividerAtIndex:i])
+                    if ([_delegate splitView:self canCollapseSubview:_subviews[i]] && [_delegate splitView:self shouldCollapseSubview:_subviews[i] forDoubleClickOnDividerAtIndex:i])
                     {
                         if ([self isSubviewCollapsed:_subviews[i]])
                             [self setPosition:preCollapsePosition ? preCollapsePosition : (minPosition + (maxPosition - minPosition) / 2) ofDividerAtIndex:i];
                         else
                             [self setPosition:minPosition ofDividerAtIndex:i];
                     }
-                    else if ([self _sendDelegateSplitViewCanCollapseSubview:_subviews[i + 1]] && [self _sendDelegateSplitViewShouldCollapseSubview:_subviews[i + 1] forDoubleClickOnDividerAtIndex:i])
+                    else if ([_delegate splitView:self canCollapseSubview:_subviews[i + 1]] && [_delegate splitView:self shouldCollapseSubview:_subviews[i + 1] forDoubleClickOnDividerAtIndex:i])
                     {
                         if ([self isSubviewCollapsed:_subviews[i + 1]])
                             [self setPosition:preCollapsePosition ? preCollapsePosition : (minPosition + (maxPosition - minPosition) / 2) ofDividerAtIndex:i];
@@ -563,6 +542,26 @@ var ShouldSuppressResizeNotifications   = 1,
     //[[self window] setAcceptsMouseMovedEvents:YES];
 }
 
+- (void)mouseEntered:(CPEvent)anEvent
+{
+    // Tracking code handles cursor by itself.
+    if (_currentDivider == CPNotFound)
+        [self _updateResizeCursor:anEvent];
+}
+
+- (void)mouseMoved:(CPEvent)anEvent
+{
+    if (_currentDivider == CPNotFound)
+        [self _updateResizeCursor:anEvent];
+}
+
+- (void)mouseExited:(CPEvent)anEvent
+{
+    if (_currentDivider == CPNotFound)
+        // FIXME: we should use CPCursor push/pop (if previous currentCursor != arrow).
+        [[CPCursor arrowCursor] set];
+}
+
 - (void)_updateResizeCursor:(CPEvent)anEvent
 {
     var point = [self convertPoint:[anEvent locationInWindow] fromView:nil];
@@ -589,8 +588,12 @@ var ShouldSuppressResizeNotifications   = 1,
 
             if (sizeA === 0)
                 canGrow = YES; // Subview is collapsed.
-            else if (!canShrink && [self _sendDelegateSplitViewCanCollapseSubview:_subviews[i]])
+            else if (!canShrink &&
+                     [_delegate respondsToSelector:@selector(splitView:canCollapseSubview:)] &&
+                     [_delegate splitView:self canCollapseSubview:_subviews[i]])
+            {
                 canShrink = YES; // Subview is collapsible.
+            }
 
             if (sizeB === 0)
             {
@@ -599,7 +602,9 @@ var ShouldSuppressResizeNotifications   = 1,
                 // It's safe to assume it can always be uncollapsed.
                 canShrink = YES;
             }
-            else if (!canGrow && [self _sendDelegateSplitViewCanCollapseSubview:_subviews[i + 1]])
+            else if (!canGrow &&
+                     [_delegate respondsToSelector:@selector(splitView:canCollapseSubview:)] &&
+                     [_delegate splitView:self canCollapseSubview:_subviews[i + 1]])
             {
                 canGrow = YES; // Right/lower subview is collapsible.
             }
@@ -660,38 +665,53 @@ var ShouldSuppressResizeNotifications   = 1,
 - (int)_realPositionForPosition:(float)position ofDividerAtIndex:(int)dividerIndex
 {
     // not sure where this should override other positions?
-    var proposedPosition = [self _sendDelegateSplitViewConstrainSplitPosition:position ofSubviewAt:dividerIndex];
+    if ([_delegate respondsToSelector:@selector(splitView:constrainSplitPosition:ofSubviewAt:)])
+    {
+        var proposedPosition = [_delegate splitView:self constrainSplitPosition:position ofSubviewAt:dividerIndex];
 
-    // Silently ignore bad positions which could result from odd delegate responses. We don't want these
-    // bad results to go into the system and cause havoc with frame sizes as the split view tries to resize
-    // its subviews.
-    if (_IS_NUMERIC(proposedPosition))
-        position = proposedPosition;
+        // Silently ignore bad positions which could result from odd delegate responses. We don't want these
+        // bad results to go into the system and cause havoc with frame sizes as the split view tries to resize
+        // its subviews.
+        if (_IS_NUMERIC(proposedPosition))
+            position = proposedPosition;
+    }
 
     var proposedMax = [self maxPossiblePositionOfDividerAtIndex:dividerIndex],
         proposedMin = [self minPossiblePositionOfDividerAtIndex:dividerIndex],
         actualMax = proposedMax,
-        actualMin = proposedMin,
-        proposedActualMin = [self _sendDelegateSplitViewConstrainMinCoordinate:proposedMin ofSubviewAt:dividerIndex],
-        proposedActualMax = [self _sendDelegateSplitViewConstrainMaxCoordinate:proposedMax ofSubviewAt:dividerIndex];
+        actualMin = proposedMin;
 
-    if (_IS_NUMERIC(proposedActualMin))
-        actualMin = proposedActualMin;
+    if ([_delegate respondsToSelector:@selector(splitView:constrainMinCoordinate:ofSubviewAt:)])
+    {
+        var proposedActualMin = [_delegate splitView:self constrainMinCoordinate:proposedMin ofSubviewAt:dividerIndex];
 
-    if (_IS_NUMERIC(proposedActualMax))
-        actualMax = proposedActualMax;
+        if (_IS_NUMERIC(proposedActualMin))
+            actualMin = proposedActualMin;
+    }
+
+    if ([_delegate respondsToSelector:@selector(splitView:constrainMaxCoordinate:ofSubviewAt:)])
+    {
+        var proposedActualMax = [_delegate splitView:self constrainMaxCoordinate:proposedMax ofSubviewAt:dividerIndex];
+
+        if (_IS_NUMERIC(proposedActualMax))
+            actualMax = proposedActualMax;
+    }
 
     var viewA = _subviews[dividerIndex],
         viewB = _subviews[dividerIndex + 1],
         realPosition = MAX(MIN(position, actualMax), actualMin);
 
     // Is this position past the halfway point to collapse?
-    if ((position < proposedMin + (actualMin - proposedMin) / 2) && [self _sendDelegateSplitViewCanCollapseSubview:viewA])
-        realPosition = proposedMin;
+    if (position < proposedMin + (actualMin - proposedMin) / 2)
+        if ([_delegate respondsToSelector:@selector(splitView:canCollapseSubview:)])
+            if ([_delegate splitView:self canCollapseSubview:viewA])
+                realPosition = proposedMin;
 
     // We can also collapse to the right.
-    if ((position > proposedMax - (proposedMax - actualMax) / 2) && [self _sendDelegateSplitViewCanCollapseSubview:viewB])
-        realPosition = proposedMax;
+    if (position > proposedMax - (proposedMax - actualMax) / 2)
+        if ([_delegate respondsToSelector:@selector(splitView:canCollapseSubview:)])
+            if ([_delegate splitView:self canCollapseSubview:viewB])
+                realPosition = proposedMax;
 
     return realPosition;
 }
@@ -773,11 +793,11 @@ var ShouldSuppressResizeNotifications   = 1,
     [self setNeedsDisplay:YES];
 }
 
-- (void)resizeSubviewsWithOldSize:(CGSize)oldSize
+- (void)resizeSubviewsWithOldSize:(CPSize)oldSize
 {
-    if ([self _delegateRespondsToSplitViewResizeSubviewsWithOldSize])
+    if ([_delegate respondsToSelector:@selector(splitView:resizeSubviewsWithOldSize:)])
     {
-        [self _sendDelegateSplitViewResizeSubviewsWithOldSize:oldSize];
+        [_delegate splitView:self resizeSubviewsWithOldSize:oldSize];
         return;
     }
 
@@ -803,7 +823,8 @@ var ShouldSuppressResizeNotifications   = 1,
         oldFlexibleSpace = 0,
         totalSizablePanes = 0,
         isSizableMap = {},
-        viewSizes = [];
+        viewSizes = [],
+        delegateRespondsToShouldAdjust = [_delegate respondsToSelector:@selector(splitView:shouldAdjustSizeOfSubview:)];
 
     // What we want to do is to preserve non resizable sizes first, and then to preserve the ratio of size to available
     // non fixed space for every other subview. E.g. assume fixed space was 20 pixels initially, view 1 was 20 and
@@ -819,7 +840,7 @@ var ShouldSuppressResizeNotifications   = 1,
     for (index = 0; index < count; ++index)
     {
         var view = _subviews[index],
-            isSizable = [self _sendDelegateSplitViewShouldAdjustSizeOfSubview:view],
+            isSizable = !delegateRespondsToShouldAdjust || [_delegate splitView:self shouldAdjustSizeOfSubview:view],
             size = [view frame].size[_sizeComponent];
 
         isSizableMap[index] = isSizable;
@@ -945,47 +966,25 @@ The sum of the views and the sum of the dividers should be equal to the size of
 
     @param delegate - The delegate of the splitview.
 */
-- (void)setDelegate:(id <CPSplitViewDelegate>)aDelegate
+- (void)setDelegate:(id)delegate
 {
-    if (_delegate === aDelegate)
-        return;
-
-    _delegate = aDelegate;
-    _implementedDelegateMethods = 0;
-
-    if ([_delegate respondsToSelector:@selector(splitViewWillResizeSubviews:)])
-        _implementedDelegateMethods |= CPSplitViewDelegate_splitViewWillResizeSubviews_;
-
     if ([_delegate respondsToSelector:@selector(splitViewDidResizeSubviews:)])
-        _implementedDelegateMethods |= CPSplitViewDelegate_splitViewDidResizeSubviews_;
+        [[CPNotificationCenter defaultCenter] removeObserver:_delegate name:CPSplitViewDidResizeSubviewsNotification object:self];
+    if ([_delegate respondsToSelector:@selector(splitViewWillResizeSubviews:)])
+        [[CPNotificationCenter defaultCenter] removeObserver:_delegate name:CPSplitViewWillResizeSubviewsNotification object:self];
 
-    if ([_delegate respondsToSelector:@selector(splitView:canCollapseSubview:)])
-        _implementedDelegateMethods |= CPSplitViewDelegate_splitView_canCollapseSubview_;
-
-    if ([_delegate respondsToSelector:@selector(splitView:shouldAdjustSizeOfSubview:)])
-        _implementedDelegateMethods |= CPSplitViewDelegate_splitView_shouldAdjustSizeOfSubview_;
-
-    if ([_delegate respondsToSelector:@selector(splitView:shouldCollapseSubview:forDoubleClickOnDividerAtIndex:)])
-        _implementedDelegateMethods |= CPSplitViewDelegate_splitView_shouldCollapseSubview_forDoubleClickOnDividerAtIndex_;
-
-    if ([_delegate respondsToSelector:@selector(splitView:additionalEffectiveRectOfDividerAtIndex:)])
-        _implementedDelegateMethods |= CPSplitViewDelegate_splitView_additionalEffectiveRectOfDividerAtIndex_;
-
-    if ([_delegate respondsToSelector:@selector(splitView:effectiveRect:forDrawnRect:ofDividerAtIndex:)])
-        _implementedDelegateMethods |= CPSplitViewDelegate_splitView_effectiveRect_forDrawnRect_ofDividerAtIndex_;
-
-    if ([_delegate respondsToSelector:@selector(splitView:constrainMaxCoordinate:ofSubviewAt:)])
-        _implementedDelegateMethods |= CPSplitViewDelegate_splitView_constrainMaxCoordinate_ofSubviewAt_;
-
-    if ([_delegate respondsToSelector:@selector(splitView:constrainMinCoordinate:ofSubviewAt:)])
-        _implementedDelegateMethods |= CPSplitViewDelegate_splitView_constrainMinCoordinate_ofSubviewAt_;
-
-    if ([_delegate respondsToSelector:@selector(splitView:constrainSplitPosition:ofSubviewAt:)])
-        _implementedDelegateMethods |= CPSplitViewDelegate_splitView_constrainSplitPosition_ofSubviewAt_;
-
-    if ([_delegate respondsToSelector:@selector(splitView:resizeSubviewsWithOldSize:)])
-        _implementedDelegateMethods |= CPSplitViewDelegate_splitView_resizeSubviewsWithOldSize_;
+   _delegate = delegate;
 
+   if ([_delegate respondsToSelector:@selector(splitViewDidResizeSubviews:)])
+       [[CPNotificationCenter defaultCenter] addObserver:_delegate
+                                                selector:@selector(splitViewDidResizeSubviews:)
+                                                    name:CPSplitViewDidResizeSubviewsNotification
+                                                  object:self];
+   if ([_delegate respondsToSelector:@selector(splitViewWillResizeSubviews:)])
+       [[CPNotificationCenter defaultCenter] addObserver:_delegate
+                                                selector:@selector(splitViewWillResizeSubviews:)
+                                                    name:CPSplitViewWillResizeSubviewsNotification
+                                                  object:self];
 }
 
 /*!
@@ -1004,7 +1003,7 @@ The sum of the views and the sum of the dividers should be equal to the size of
     @param unsigned int - The divider index the button bar will be assigned to.
 */
 // FIXME Should be renamed to setButtonBar:ofDividerAtIndex:.
-- (void)setButtonBar:(CPButtonBar)aButtonBar forDividerAtIndex:(CPUInteger)dividerIndex
+- (void)setButtonBar:(CPButtonBar)aButtonBar forDividerAtIndex:(unsigned)dividerIndex
 {
     if (!aButtonBar)
     {
@@ -1035,12 +1034,27 @@ The sum of the views and the sum of the dividers should be equal to the size of
 
 - (void)_postNotificationWillResize
 {
-    [self _sendDelegateSplitViewWillResizeSubviews];
+    var userInfo = nil;
+
+    if (_currentDivider !== CPNotFound)
+        userInfo = [CPDictionary dictionaryWithObject:_currentDivider forKey:@"CPSplitViewDividerIndex"];
+
+    [[CPNotificationCenter defaultCenter] postNotificationName:CPSplitViewWillResizeSubviewsNotification
+                                                        object:self
+                                                      userInfo:userInfo];
 }
 
 - (void)_postNotificationDidResize
 {
-    [self _sendDelegateSplitViewDidResizeSubviews];
+    var userInfo = nil;
+
+    if (_currentDivider !== CPNotFound)
+        userInfo = [CPDictionary dictionaryWithObject:_currentDivider forKey:@"CPSplitViewDividerIndex"];
+
+    [[CPNotificationCenter defaultCenter] postNotificationName:CPSplitViewDidResizeSubviewsNotification
+                                                        object:self
+                                                      userInfo:userInfo];
+
 
     // TODO Cocoa always autosaves on "viewDidEndLiveResize". If Cappuccino adds support for this we
     // should do the same.
@@ -1088,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]];
     }
 
@@ -1104,7 +1118,7 @@ The sum of the views and the sum of the dividers should be equal to the size of
 */
 - (void)_restoreFromAutosaveIfNeeded
 {
-    if (_shouldRestoreFromAutosaveUnlessFrameSize && !CGSizeEqualToSize([self frameSize], _shouldRestoreFromAutosaveUnlessFrameSize))
+    if (_shouldRestoreFromAutosaveUnlessFrameSize && !_CGSizeEqualToSize([self frameSize], _shouldRestoreFromAutosaveUnlessFrameSize))
     {
         [self _restoreFromAutosave];
     }
@@ -1135,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];
@@ -1151,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 + ""];
     }
 }
 
@@ -1186,207 +1193,6 @@ The sum of the views and the sum of the dividers should be equal to the size of
 
 @end
 
-@implementation CPSplitView (CPTrackingArea)
-
-- (void)updateTrackingAreas
-{
-    [self removeAllTrackingAreas];
-
-    var options = CPTrackingCursorUpdate | CPTrackingActiveInKeyWindow;
-    
-    for (var i = 0; i < _subviews.length - 1; i++)
-        [self addTrackingArea:[[CPTrackingArea alloc] initWithRect:[self effectiveRectOfDividerAtIndex:i]
-                                                           options:options
-                                                             owner:self
-                                                          userInfo:nil]];
-}
-
-- (void)cursorUpdate:(CPEvent)anEvent
-{
-    if (_currentDivider === CPNotFound)
-        [self _updateResizeCursor:anEvent];
-}
-
-@end
-
-
-@implementation CPSplitView (CPSplitViewDelegate)
-
-/*!
-    @ignore
-    Return YES if the delegate implements splitView:resizeSubviewsWithOldSize:
-*/
-- (BOOL)_delegateRespondsToSplitViewResizeSubviewsWithOldSize
-{
-    return _implementedDelegateMethods & CPSplitViewDelegate_splitView_resizeSubviewsWithOldSize_;
-}
-
-/*!
-    @ignore
-    Return YES if the delegate implements splitView:canCollapseSubview:
-*/
-- (BOOL)_delegateRespondsToSplitViewCanCollapseSubview
-{
-    return _implementedDelegateMethods & CPSplitViewDelegate_splitView_canCollapseSubview_;
-}
-
-/*!
-    @ignore
-    Return YES if the delegate implements splitView:shouldCollapseSubview:forDoubleClickOnDividerAtIndex
-*/
-- (BOOL)_delegateRespondsToSplitViewshouldCollapseSubviewForDoubleClickOnDividerAtIndex
-{
-    return _implementedDelegateMethods & CPSplitViewDelegate_splitView_shouldCollapseSubview_forDoubleClickOnDividerAtIndex_;
-}
-
-
-/*!
-    @ignore
-    Call the delegate splitView:canCollapseSubview:
-*/
-- (BOOL)_sendDelegateSplitViewCanCollapseSubview:(CPView)aView
-{
-    if (!(_implementedDelegateMethods & CPSplitViewDelegate_splitView_canCollapseSubview_))
-        return NO;
-
-    return [_delegate splitView:self canCollapseSubview:aView];
-}
-
-/*!
-    @ignore
-    Call the delegate splitView:shouldAdjustSizeOfSubview:
-*/
-- (BOOL)_sendDelegateSplitViewShouldAdjustSizeOfSubview:(CPView)aView
-{
-    if (!(_implementedDelegateMethods & CPSplitViewDelegate_splitView_shouldAdjustSizeOfSubview_))
-        return YES;
-
-    return [_delegate splitView:self shouldAdjustSizeOfSubview:aView];
-}
-
-/*!
-    @ignore
-    Call the delegate splitView:shouldCollapseSubview:forDoubleClickOnDividerAtIndex:
-*/
-- (BOOL)_sendDelegateSplitViewShouldCollapseSubview:(CPView)aView forDoubleClickOnDividerAtIndex:(int)anIndex
-{
-    if (!(_implementedDelegateMethods & CPSplitViewDelegate_splitView_shouldCollapseSubview_forDoubleClickOnDividerAtIndex_))
-        return NO;
-
-    return [_delegate splitView:self shouldCollapseSubview:aView forDoubleClickOnDividerAtIndex:anIndex];
-}
-
-/*!
-    @ignore
-    Call the delegate splitView:additionalEffectiveRectOfDividerAtIndex:
-*/
-- (CGRect)_sendDelegateSplitViewAdditionalEffectiveRectOfDividerAtIndex:(int)anIndex
-{
-    if (!(_implementedDelegateMethods & CPSplitViewDelegate_splitView_additionalEffectiveRectOfDividerAtIndex_))
-        return nil;
-
-    return [_delegate splitView:self additionalEffectiveRectOfDividerAtIndex:anIndex];
-}
-
-/*!
-    @ignore
-    Call the delegate splitView:effectiveRect:forDrawnRect:ofDividerAtIndex:
-*/
-- (CGRect)_sendDelegateSplitViewEffectiveRect:(CGRect)proposedEffectiveRect forDrawnRect:(CGRect)drawnRect ofDividerAtIndex:(CPInteger)dividerIndex
-{
-    if (!(_implementedDelegateMethods & CPSplitViewDelegate_splitView_effectiveRect_forDrawnRect_ofDividerAtIndex_))
-        return proposedEffectiveRect;
-
-    return [_delegate splitView:self effectiveRect:proposedEffectiveRect forDrawnRect:drawnRect ofDividerAtIndex:dividerIndex];
-}
-
-/*!
-    @ignore
-    Call the delegate splitView:constrainMaxCoordinate:ofSubviewAt:
-*/
-- (float)_sendDelegateSplitViewConstrainMaxCoordinate:(float)proposedMax ofSubviewAt:(CPInteger)dividerIndex
-{
-    if (!(_implementedDelegateMethods & CPSplitViewDelegate_splitView_constrainMaxCoordinate_ofSubviewAt_))
-        return nil;
-
-    return [_delegate splitView:self constrainMaxCoordinate:proposedMax ofSubviewAt:dividerIndex];
-}
-
-/*!
-    @ignore
-    Call the delegate splitView:constrainMinCoordinate:ofSubviewAt:
-*/
-- (float)_sendDelegateSplitViewConstrainMinCoordinate:(float)proposedMin ofSubviewAt:(CPInteger)dividerIndex
-{
-    if (!(_implementedDelegateMethods & CPSplitViewDelegate_splitView_constrainMinCoordinate_ofSubviewAt_))
-        return nil;
-
-    return [_delegate splitView:self constrainMinCoordinate:proposedMin ofSubviewAt:dividerIndex];
-}
-
-/*!
-    @ignore
-    Call the delegate splitView:constrainSplitPosition:ofSubviewAt:
-*/
-- (float)_sendDelegateSplitViewConstrainSplitPosition:(float)proposedMax ofSubviewAt:(CPInteger)dividerIndex
-{
-    if (!(_implementedDelegateMethods & CPSplitViewDelegate_splitView_constrainSplitPosition_ofSubviewAt_))
-        return nil;
-
-    return [_delegate splitView:self constrainSplitPosition:proposedMax ofSubviewAt:dividerIndex];
-}
-
-/*!
-    @ignore
-    Call the delegate splitView:resizeSubviewsWithOldSize:
-*/
-- (void)_sendDelegateSplitViewResizeSubviewsWithOldSize:(CGSize)oldSize
-{
-    if (!(_implementedDelegateMethods & CPSplitViewDelegate_splitView_resizeSubviewsWithOldSize_))
-        return;
-
-    [_delegate splitView:self resizeSubviewsWithOldSize:oldSize];
-}
-
-/*!
-    @ignore
-    Call the delegate splitViewWillResizeSubviews:
-*/
-- (void)_sendDelegateSplitViewWillResizeSubviews
-{
-    var userInfo = nil;
-
-    if (_currentDivider !== CPNotFound)
-        userInfo = @{ @"CPSplitViewDividerIndex": _currentDivider };
-
-    if (_implementedDelegateMethods & CPSplitViewDelegate_splitViewWillResizeSubviews_)
-        [_delegate splitViewWillResizeSubviews:[[CPNotification alloc] initWithName:CPSplitViewWillResizeSubviewsNotification object:self userInfo:userInfo]];
-
-    [[CPNotificationCenter defaultCenter] postNotificationName:CPSplitViewWillResizeSubviewsNotification object:self userInfo:userInfo];
-}
-
-/*!
-    @ignore
-    Call the delegate splitViewDidResizeSubviews:
-*/
-- (void)_sendDelegateSplitViewDidResizeSubviews
-{
-    var userInfo = nil;
-
-    if (_currentDivider !== CPNotFound)
-        userInfo = @{ @"CPSplitViewDividerIndex": _currentDivider };
-
-    if (_implementedDelegateMethods & CPSplitViewDelegate_splitViewDidResizeSubviews_)
-        [_delegate splitViewDidResizeSubviews:[[CPNotification alloc] initWithName:CPSplitViewDidResizeSubviewsNotification object:self userInfo:userInfo]];
-
-    [[CPNotificationCenter defaultCenter] postNotificationName:CPSplitViewDidResizeSubviewsNotification object:self userInfo:userInfo];
-
-    [self updateTrackingAreas];
-}
-
-@end
-
-
 var CPSplitViewDelegateKey          = "CPSplitViewDelegateKey",
     CPSplitViewIsVerticalKey        = "CPSplitViewIsVerticalKey",
     CPSplitViewIsPaneSplitterKey    = "CPSplitViewIsPaneSplitterKey",

AppKit/CPStepper.j

@@ -20,9 +20,10 @@
  * 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>
+
 
 
 /*!
@@ -52,17 +53,13 @@
     @param maxValue the maximal acceptable value of the stepper
     @return Initialized CPStepper
 */
-+ (id)stepperWithInitialValue:(float)aValue minValue:(float)aMinValue maxValue:(float)aMaxValue
++ (CPStepper)stepperWithInitialValue:(float)aValue minValue:(float)aMinValue maxValue:(float)aMaxValue
 {
-    var stepper = [[self 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;
 }
 
@@ -74,22 +71,22 @@
 
     @return Initialized CPStepper
 */
-+ (id)stepper
++ (CPStepper)stepper
 {
     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)
+    if (aBinding == CPValueBinding)
         return @"doubleValue";
 
     return [super _replacementKeyPathForBinding:aBinding];
@@ -121,14 +118,14 @@
 
 - (void)_init
 {
-    _buttonUp = [[CPButton alloc] initWithFrame:CGRectMakeZero()];
+    _buttonUp = [[CPButton alloc] initWithFrame:_CGRectMakeZero()];
     [_buttonUp setContinuous:_autorepeat];
     [_buttonUp setTarget:self];
     [_buttonUp setAction:@selector(_buttonDidClick:)];
     [_buttonUp setAutoresizingMask:CPViewNotSizable];
     [self addSubview:_buttonUp];
 
-    _buttonDown = [[CPButton alloc] initWithFrame:CGRectMakeZero()];
+    _buttonDown = [[CPButton alloc] initWithFrame:_CGRectMakeZero()];
     [_buttonDown setContinuous:_autorepeat];
     [_buttonDown setTarget:self];
     [_buttonDown setAction:@selector(_buttonDidClick:)];
@@ -137,16 +134,9 @@
     [self setContinuous:_autorepeat];
     [self addSubview:_buttonDown];
 
-    [self _sizeToFit];
     [self setNeedsLayout];
 }
 
-- (void)setControlSize:(CPControlSize)aControlSize
-{
-    [super setControlSize:aControlSize];
-    [self _sizeToFit];
-}
-
 #pragma mark -
 #pragma mark Superclass overrides
 
@@ -165,10 +155,10 @@
 
 - (void)setFrame:(CGRect)aFrame
 {
-    var upSize = [self currentValueForThemeAttribute:@"up-button-size"],
-        downSize = [self currentValueForThemeAttribute:@"down-button-size"],
-        minSize = CGSizeMake(upSize.width, upSize.height + downSize.height),
-        frame = CGRectMakeCopy(aFrame);
+    var upSize = [self valueForThemeAttribute:@"up-button-size"],
+        downSize = [self valueForThemeAttribute:@"down-button-size"],
+        minSize = _CGSizeMake(upSize.width, upSize.height + downSize.height),
+        frame = _CGRectMakeCopy(aFrame);
 
     frame.size.width = MAX(minSize.width, frame.size.width);
     frame.size.height = MAX(minSize.height, frame.size.height);
@@ -178,27 +168,20 @@
 /*! @ignore */
 - (void)layoutSubviews
 {
-    var controlSizeThemeState = [self _controlSizeThemeState],
-        aFrame = [self frame],
-        upSize = [self valueForThemeAttribute:@"up-button-size" inState:controlSizeThemeState],
-        downSize = [self valueForThemeAttribute:@"down-button-size" inState:controlSizeThemeState],
-        upFrame = CGRectMake(0, 0, upSize.width, upSize.height),
-        downFrame = CGRectMake(0, upSize.height, downSize.width, downSize.height);
-
+    var aFrame = [self frame],
+        upSize = [self valueForThemeAttribute:@"up-button-size"],
+        downSize = [self valueForThemeAttribute:@"down-button-size"],
+        upFrame = _CGRectMake(aFrame.size.width - upSize.width, 0, upSize.width, upSize.height),
+        downFrame = _CGRectMake(aFrame.size.width - downSize.width, upSize.height, downSize.width, downSize.height);
     [_buttonUp setFrame:upFrame];
     [_buttonDown setFrame:downFrame];
 
-    [_buttonUp setValue:[self valueForThemeAttribute:@"bezel-color-up-button" inStates:[controlSizeThemeState, CPThemeStateBordered]] forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered];
-    [_buttonUp setValue:[self valueForThemeAttribute:@"bezel-color-up-button" inStates:[controlSizeThemeState, CPThemeStateBordered, CPThemeStateDisabled]] forThemeAttribute:@"bezel-color" inStates:[CPThemeStateBordered, CPThemeStateDisabled]];
-    [_buttonUp setValue:[self valueForThemeAttribute:@"bezel-color-up-button" inStates:[controlSizeThemeState, CPThemeStateBordered, CPThemeStateHighlighted]] forThemeAttribute:@"bezel-color" inStates:[CPThemeStateBordered, CPThemeStateHighlighted]];
-    [_buttonDown setValue:[self valueForThemeAttribute:@"bezel-color-down-button" inStates:[controlSizeThemeState, CPThemeStateBordered]] forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered];
-    [_buttonDown setValue:[self valueForThemeAttribute:@"bezel-color-down-button" inStates:[controlSizeThemeState, CPThemeStateBordered, CPThemeStateDisabled]] forThemeAttribute:@"bezel-color" inStates:[CPThemeStateBordered, CPThemeStateDisabled]];
-    [_buttonDown setValue:[self valueForThemeAttribute:@"bezel-color-down-button" inStates:[controlSizeThemeState, CPThemeStateBordered, CPThemeStateHighlighted]] forThemeAttribute:@"bezel-color" inStates:[CPThemeStateBordered, CPThemeStateHighlighted]];
-}
-
-- (void)_sizeToFit
-{
-    [self setFrame:CGRectMake([self frameOrigin].x, [self frameOrigin].y, 0, 0)];
+    [_buttonUp setValue:[self valueForThemeAttribute:@"bezel-color-up-button" inState:CPThemeStateBordered] forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered];
+    [_buttonUp setValue:[self valueForThemeAttribute:@"bezel-color-up-button" inState:CPThemeStateBordered | CPThemeStateDisabled] forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered | CPThemeStateDisabled];
+    [_buttonUp setValue:[self valueForThemeAttribute:@"bezel-color-up-button" inState:CPThemeStateBordered | CPThemeStateHighlighted] forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered | CPThemeStateHighlighted];
+    [_buttonDown setValue:[self valueForThemeAttribute:@"bezel-color-down-button" inState:CPThemeStateBordered] forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered];
+    [_buttonDown setValue:[self valueForThemeAttribute:@"bezel-color-down-button" inState:CPThemeStateBordered | CPThemeStateDisabled] forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered | CPThemeStateDisabled];
+    [_buttonDown setValue:[self valueForThemeAttribute:@"bezel-color-down-button" inState:CPThemeStateBordered | CPThemeStateHighlighted] forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered | CPThemeStateHighlighted];
 }
 
 /*!
@@ -220,7 +203,7 @@
     Set the current value of the stepper.
     @param aValue a float containing the value
 */
-- (void)setDoubleValue:(double)aValue
+- (void)setDoubleValue:(float)aValue
 {
     if (aValue > _maxValue)
         [super setDoubleValue:_valueWraps ? _minValue : _maxValue];
@@ -239,7 +222,7 @@
     if (![self isEnabled])
         return;
 
-    if (aSender === _buttonUp)
+    if (aSender == _buttonUp)
         [self setDoubleValue:([self doubleValue] + _increment)];
     else
         [self setDoubleValue:([self doubleValue] - _increment)];
@@ -274,14 +257,10 @@
     return @"stepper";
 }
 
-+ (CPDictionary)themeAttributes
++ (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
@@ -292,7 +271,7 @@
 
 - (void)_updatePlaceholdersWithOptions:(CPDictionary)options forBinding:(CPString)aBinding
 {
-    var placeholder = (aBinding === CPMaxValueBinding) ? [_source maxValue] : [_source minValue];
+    var placeholder = (aBinding == CPMaxValueBinding) ? [_source maxValue] : [_source minValue];
 
     [super _updatePlaceholdersWithOptions:options];
 

AppKit/CPStringDrawing.j

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

AppKit/CPTabView.j

@@ -25,7 +25,6 @@
 @import "CPTabViewItem.j"
 @import "CPView.j"
 
-@typedef CPTabViewType
 CPTopTabsBezelBorder     = 0;
 //CPLeftTabsBezelBorder  = 1;
 CPBottomTabsBezelBorder  = 2;
@@ -34,24 +33,10 @@ CPNoTabsBezelBorder      = 4; //Displays no tabs and has a bezeled border.
 CPNoTabsLineBorder       = 5; //Has no tabs and displays a line border.
 CPNoTabsNoBorder         = 6; //Displays no tabs and no border.
 
-@class _CPTabViewBox
-
-var CPTabViewDidSelectTabViewItemSelector           = 1 << 1,
-    CPTabViewShouldSelectTabViewItemSelector        = 1 << 2,
-    CPTabViewWillSelectTabViewItemSelector          = 1 << 3,
-    CPTabViewDidChangeNumberOfTabViewItemsSelector  = 1 << 4;
-
-
-@protocol CPTabViewDelegate <CPObject>
-
-@optional
-- (BOOL)tabView:(CPTabView)tabView shouldSelectTabViewItem:(CPTabViewItem)tabViewItem;
-- (void)tabView:(CPTabView)tabView didSelectTabViewItem:(CPTabViewItem)tabViewItem;
-- (void)tabView:(CPTabView)tabView willSelectTabViewItem:(CPTabViewItem)tabViewItem;
-- (void)tabViewDidChangeNumberOfTabViewItems:(CPTabView)tabView;
-
-@end
-
+var CPTabViewDidSelectTabViewItemSelector           = 1,
+    CPTabViewShouldSelectTabViewItemSelector        = 2,
+    CPTabViewWillSelectTabViewItemSelector          = 4,
+    CPTabViewDidChangeNumberOfTabViewItemsSelector  = 8;
 
 /*!
     @ingroup appkit
@@ -63,27 +48,27 @@ var CPTabViewDidSelectTabViewItemSelector           = 1 << 1,
 */
 @implementation CPTabView : CPView
 {
-    CPArray                 _items;
+    CPArray             _items;
 
-    CPSegmentedControl      _tabs;
-    _CPTabViewBox           _box;
-    CPView                  _placeHolderView;
+    CPSegmentedControl  _tabs;
+    CPBox               _box;
 
-    CPTabViewItem           _selectedTabViewItem;
+    CPNumber            _selectedIndex;
 
-    CPTabViewType           _type;
-    CPFont                  _font;
+    CPTabViewType       _type;
+    CPFont              _font;
 
-    id <CPTabViewDelegate>  _delegate;
-    unsigned                _delegateSelectors;
+    id                  _delegate;
+    unsigned            _delegateSelectors;
 }
 
 - (id)initWithFrame:(CGRect)aFrame
 {
     if (self = [super initWithFrame:aFrame])
     {
+        _items = [CPArray array];
+
         [self _init];
-        _selectedTabViewItem = nil;
         [self setTabViewType:CPTopTabsBezelBorder];
     }
 
@@ -92,26 +77,19 @@ var CPTabViewDidSelectTabViewItemSelector           = 1 << 1,
 
 - (void)_init
 {
-    _tabs = [[CPSegmentedControl alloc] initWithFrame:CGRectMakeZero()];
+    _selectedIndex = CPNotFound;
+
+    _tabs = [[CPSegmentedControl alloc] initWithFrame:_CGRectMake(0, 0, 0, 0)];
     [_tabs setHitTests:NO];
-    [_tabs setSegments:[CPArray array]];
 
-    var height = [_tabs valueForThemeAttribute:@"min-size"].height;
-    [_tabs setFrameSize:CGSizeMake(0, height)];
+    var height = [_tabs valueForThemeAttribute:@"default-height"];
+    [_tabs setFrameSize:_CGSizeMake(0, height)];
 
-    _box = [[_CPTabViewBox alloc] initWithFrame:[self  bounds]];
-    [_box setTabView:self];
+    _box = [[CPBox alloc] initWithFrame:[self  bounds]];
     [self setBackgroundColor:[CPColor colorWithCalibratedWhite:0.95 alpha:1.0]];
 
     [self addSubview:_box];
     [self addSubview:_tabs];
-
-    _placeHolderView = nil;
-}
-
-- (CPArray)items
-{
-    return [_tabs segments];
 }
 
 // Adding and Removing Tabs
@@ -121,7 +99,7 @@ var CPTabViewDidSelectTabViewItemSelector           = 1 << 1,
 */
 - (void)addTabViewItem:(CPTabViewItem)aTabViewItem
 {
-    [self insertTabViewItem:aTabViewItem atIndex:[self numberOfTabViewItems]];
+    [self insertTabViewItem:aTabViewItem atIndex:[_items count]];
 }
 
 /*!
@@ -129,20 +107,17 @@ var CPTabViewDidSelectTabViewItemSelector           = 1 << 1,
     @param aTabViewItem the item to insert
     @param anIndex the index for the item
 */
-- (void)insertTabViewItem:(CPTabViewItem)aTabViewItem atIndex:(CPUInteger)anIndex
+- (void)insertTabViewItem:(CPTabViewItem)aTabViewItem atIndex:(unsigned)anIndex
 {
-    [self _insertTabViewItems:[aTabViewItem] atIndexes:[CPIndexSet indexSetWithIndex:anIndex]];
-}
+    [_items insertObject:aTabViewItem atIndex:anIndex];
 
-- (void)_insertTabViewItems:(CPArray)tabViewItems atIndexes:(CPIndexSet)indexes
-{
-    [_tabs insertSegments:tabViewItems atIndexes:indexes];
-    [tabViewItems makeObjectsPerformSelector:@selector(_setTabView:) withObject:self];
+    [self _updateItems];
+    [self _repositionTabs];
 
-    [self tileWithChangedItem:[tabViewItems firstObject]];
-    [self _reverseSetContent];
+    [aTabViewItem _setTabView:self];
 
-    [self _sendDelegateTabViewDidChangeNumberOfTabViewItems];
+    if (_delegateSelectors & CPTabViewDidChangeNumberOfTabViewItemsSelector)
+        [_delegate tabViewDidChangeNumberOfTabViewItems:self];
 }
 
 /*!
@@ -151,39 +126,23 @@ var CPTabViewDidSelectTabViewItemSelector           = 1 << 1,
 */
 - (void)removeTabViewItem:(CPTabViewItem)aTabViewItem
 {
-    var idx = [[self items] indexOfObjectIdenticalTo:aTabViewItem];
+    var count = [_items count];
+    for (var i = 0; i < count; i++)
+    {
+        if ([_items objectAtIndex:i] === aTabViewItem)
+        {
+            [_items removeObjectAtIndex:i];
+            break;
+        }
+    }
 
-    if (idx == CPNotFound)
-        return;
+    [self _updateItems];
+    [self _repositionTabs];
 
-    [_tabs removeSegmentsAtIndexes:[CPIndexSet indexSetWithIndex:idx]];
     [aTabViewItem _setTabView:nil];
 
-    [self tileWithChangedItem:nil];
-    [self _didRemoveTabViewItem:aTabViewItem atIndex:idx];
-    [self _reverseSetContent];
-
-    [self _sendDelegateTabViewDidChangeNumberOfTabViewItems];
-}
-
-- (void)_didRemoveTabViewItem:(CPTabViewItem)aTabViewItem atIndex:(CPInteger)idx
-{
-    // If the selection is managed by bindings, let the binder do that.
-    if ([self binderForBinding:CPSelectionIndexesBinding] || [self binderForBinding:CPSelectedIndexBinding])
-        return;
-
-    if (_selectedTabViewItem == aTabViewItem)
-    {
-        var didSelect = NO;
-
-        if (idx > 0)
-            didSelect = [self selectTabViewItemAtIndex:idx - 1];
-        else if ([self numberOfTabViewItems] > 0)
-            didSelect = [self selectTabViewItemAtIndex:0];
-
-        if (didSelect == NO)
-            _selectedTabViewItem == nil;
-    }
+    if (_delegateSelectors & CPTabViewDidChangeNumberOfTabViewItemsSelector)
+        [_delegate tabViewDidChangeNumberOfTabViewItems:self];
 }
 
 // Accessing Tabs
@@ -194,7 +153,7 @@ var CPTabViewDidSelectTabViewItemSelector           = 1 << 1,
 */
 - (int)indexOfTabViewItem:(CPTabViewItem)aTabViewItem
 {
-    return [[self items] indexOfObjectIdenticalTo:aTabViewItem];
+    return [_items indexOfObjectIdenticalTo:aTabViewItem];
 }
 
 /*!
@@ -204,10 +163,11 @@ var CPTabViewDidSelectTabViewItemSelector           = 1 << 1,
 */
 - (int)indexOfTabViewItemWithIdentifier:(CPString)anIdentifier
 {
-    return [[self items] indexOfObjectPassingTest:function(item, idx, stop)
-    {
-        return [[item identifier] isEqual:anIdentifier];
-    }];
+    for (var index = [_items count]; index >= 0; index--)
+        if ([[_items[index] identifier] isEqual:anIdentifier])
+            return index;
+
+    return CPNotFound;
 }
 
 /*!
@@ -216,16 +176,16 @@ var CPTabViewDidSelectTabViewItemSelector           = 1 << 1,
 */
 - (unsigned)numberOfTabViewItems
 {
-    return [[self items] count];
+    return [_items count];
 }
 
 /*!
     Returns the CPTabViewItem at the specified index.
     @return a tab view item, or nil
 */
-- (CPTabViewItem)tabViewItemAtIndex:(CPUInteger)anIndex
+- (CPTabViewItem)tabViewItemAtIndex:(unsigned)anIndex
 {
-    return [[self items] objectAtIndex:anIndex];
+    return [_items objectAtIndex:anIndex];
 }
 
 /*!
@@ -234,7 +194,7 @@ var CPTabViewDidSelectTabViewItemSelector           = 1 << 1,
 */
 - (CPArray)tabViewItems
 {
-    return [[self items] copy]; // Copy?
+    return [_items copy]; // Copy?
 }
 
 // Selecting a Tab
@@ -244,7 +204,7 @@ var CPTabViewDidSelectTabViewItemSelector           = 1 << 1,
 */
 - (void)selectFirstTabViewItem:(id)aSender
 {
-    if ([self numberOfTabViewItems] === 0)
+    if ([_items count] === 0)
         return; // throw?
 
     [self selectTabViewItemAtIndex:0];
@@ -256,10 +216,10 @@ var CPTabViewDidSelectTabViewItemSelector           = 1 << 1,
 */
 - (void)selectLastTabViewItem:(id)aSender
 {
-    if ([self numberOfTabViewItems] === 0)
+    if ([_items count] === 0)
         return; // throw?
 
-    [self selectTabViewItemAtIndex:[self numberOfTabViewItems] - 1];
+    [self selectTabViewItemAtIndex:[_items count] - 1];
 }
 
 /*!
@@ -268,12 +228,12 @@ var CPTabViewDidSelectTabViewItemSelector           = 1 << 1,
 */
 - (void)selectNextTabViewItem:(id)aSender
 {
-    if (_selectedTabViewItem === nil)
+    if (_selectedIndex === CPNotFound)
         return;
 
-    var nextIndex = [self indexOfTabViewItem:_selectedTabViewItem] + 1;
+    var nextIndex = _selectedIndex + 1;
 
-    if (nextIndex === [self numberOfTabViewItems])
+    if (nextIndex === [_items count])
         // does nothing. According to spec at (http://developer.apple.com/mac/library/DOCUMENTATION/Cocoa/Reference/ApplicationKit/Classes/NSTabView_Class/Reference/Reference.html#//apple_ref/occ/instm/NSTabView/selectNextTabViewItem:)
         return;
 
@@ -286,10 +246,10 @@ var CPTabViewDidSelectTabViewItemSelector           = 1 << 1,
 */
 - (void)selectPreviousTabViewItem:(id)aSender
 {
-    if (_selectedTabViewItem === nil)
+    if (_selectedIndex === CPNotFound)
         return;
 
-    var previousIndex = [self indexOfTabViewItem:_selectedTabViewItem] - 1;
+    var previousIndex = _selectedIndex - 1;
 
     if (previousIndex < 0)
         return; // does nothing. See above.
@@ -310,34 +270,24 @@ var CPTabViewDidSelectTabViewItemSelector           = 1 << 1,
     Selects the item at the specified index.
     @param anIndex the index of the item to display.
 */
-- (BOOL)selectTabViewItemAtIndex:(CPUInteger)anIndex
+- (BOOL)selectTabViewItemAtIndex:(unsigned)anIndex
 {
-    if (![self _selectTabViewItemAtIndex:anIndex])
-        return NO;
+    if (anIndex === _selectedIndex)
+        return;
 
-    [self _reverseSetSelectedIndex];
-
-    return YES;
-}
-
-// Like selectTabViewItemAtIndex: but without bindings interaction
-- (BOOL)_selectTabViewItemAtIndex:(CPUInteger)anIndex
-{
     var aTabViewItem = [self tabViewItemAtIndex:anIndex];
 
-    if (aTabViewItem == _selectedTabViewItem)
+    if ((_delegateSelectors & CPTabViewShouldSelectTabViewItemSelector) && ![_delegate tabView:self shouldSelectTabViewItem:aTabViewItem])
         return NO;
 
-    if (![self _sendDelegateShouldSelectTabViewItem:aTabViewItem])
-        return NO;
+    if (_delegateSelectors & CPTabViewWillSelectTabViewItemSelector)
+        [_delegate tabView:self willSelectTabViewItem:aTabViewItem];
 
-    [self _sendDelegateWillSelectTabViewItem:aTabViewItem];
+    [_tabs selectSegmentWithTag:anIndex];
+    [self _setSelectedIndex:anIndex];
 
-    [_tabs setSelectedSegment:anIndex];
-    _selectedTabViewItem = aTabViewItem;
-    [self _displayItemView:[aTabViewItem view]];
-
-    [self _sendDelegateDidSelectTabViewItem:aTabViewItem];
+    if (_delegateSelectors & CPTabViewDidSelectTabViewItemSelector)
+        [_delegate tabView:self didSelectTabViewItem:aTabViewItem];
 
     return YES;
 }
@@ -348,7 +298,10 @@ var CPTabViewDidSelectTabViewItemSelector           = 1 << 1,
 */
 - (CPTabViewItem)selectedTabViewItem
 {
-    return _selectedTabViewItem;
+    if (_selectedIndex != CPNotFound)
+        return [_items objectAtIndex:_selectedIndex];
+
+    return nil;
 }
 
 // Modifying the font
@@ -409,14 +362,6 @@ var CPTabViewDidSelectTabViewItemSelector           = 1 << 1,
     [self setNeedsLayout];
 }
 
-- (void)tileWithChangedItem:(CPTabViewItem)aTabViewItem
-{
-    var segment = aTabViewItem ? [self indexOfTabViewItem:aTabViewItem] : 0;
-    [_tabs tileWithChangedSegment:segment];
-
-    [self setNeedsLayout];
-}
-
 - (void)layoutSubviews
 {
     // Even if CPTabView's autoresizesSubviews is NO, _tabs and _box has to be laid out.
@@ -428,11 +373,11 @@ var CPTabViewDidSelectTabViewItemSelector           = 1 << 1,
     else
     {
         var aFrame = [self frame],
-            segmentedHeight = CGRectGetHeight([_tabs frame]),
+            segmentedHeight = _CGRectGetHeight([_tabs frame]),
             origin = _type === CPTopTabsBezelBorder ? segmentedHeight / 2 : 0;
 
-        [_box setFrame:CGRectMake(0, origin, CGRectGetWidth(aFrame),
-                                   CGRectGetHeight(aFrame) - segmentedHeight / 2)];
+        [_box setFrame:_CGRectMake(0, origin, _CGRectGetWidth(aFrame),
+                                   _CGRectGetHeight(aFrame) - segmentedHeight / 2)];
 
         [self _repositionTabs];
     }
@@ -460,7 +405,7 @@ var CPTabViewDidSelectTabViewItemSelector           = 1 << 1,
     Sets the delegate for this tab view.
     @param aDelegate the tab view's delegate
 */
-- (void)setDelegate:(id <CPTabViewDelegate>)aDelegate
+- (void)setDelegate:(id)aDelegate
 {
     if (_delegate == aDelegate)
         return;
@@ -502,247 +447,39 @@ var CPTabViewDidSelectTabViewItemSelector           = 1 << 1,
 
 - (void)_repositionTabs
 {
-    var horizontalCenterOfSelf = CGRectGetWidth([self bounds]) / 2,
-        verticalCenterOfTabs = CGRectGetHeight([_tabs bounds]) / 2;
+    var horizontalCenterOfSelf = _CGRectGetWidth([self bounds]) / 2,
+        verticalCenterOfTabs = _CGRectGetHeight([_tabs bounds]) / 2;
 
     if (_type === CPBottomTabsBezelBorder)
-        [_tabs setCenter:CGPointMake(horizontalCenterOfSelf, CGRectGetHeight([self bounds]) - verticalCenterOfTabs)];
+        [_tabs setCenter:_CGPointMake(horizontalCenterOfSelf, _CGRectGetHeight([self bounds]) - verticalCenterOfTabs)];
     else
-        [_tabs setCenter:CGPointMake(horizontalCenterOfSelf, verticalCenterOfTabs)];
+        [_tabs setCenter:_CGPointMake(horizontalCenterOfSelf, verticalCenterOfTabs)];
 }
 
-- (void)_displayItemView:(CPView)aView
+- (void)_setSelectedIndex:(CPNumber)index
 {
-    [_box setContentView:aView];
+    _selectedIndex = index;
+    [self _setContentViewFromItem:[_items objectAtIndex:_selectedIndex]];
 }
 
-// DELEGATE METHODS
-
-- (BOOL)_sendDelegateShouldSelectTabViewItem:(CPTabViewItem)aTabViewItem
+- (void)_setContentViewFromItem:(CPTabViewItem)anItem
 {
-    if (_delegateSelectors & CPTabViewShouldSelectTabViewItemSelector)
-        return [_delegate tabView:self shouldSelectTabViewItem:aTabViewItem];
-
-    return YES;
+    [_box setContentView:[anItem view]];
 }
 
-- (void)_sendDelegateWillSelectTabViewItem:(CPTabViewItem)aTabViewItem
+- (void)_updateItems
 {
-    if (_delegateSelectors & CPTabViewWillSelectTabViewItemSelector)
-        [_delegate tabView:self willSelectTabViewItem:aTabViewItem];
-}
+    var count = [_items count];
+    [_tabs setSegmentCount:count];
 
-- (void)_sendDelegateDidSelectTabViewItem:(CPTabViewItem)aTabViewItem
-{
-    if (_delegateSelectors & CPTabViewDidSelectTabViewItemSelector)
-        [_delegate tabView:self didSelectTabViewItem:aTabViewItem];
-}
-
-- (void)_sendDelegateTabViewDidChangeNumberOfTabViewItems
-{
-    if (_delegateSelectors & CPTabViewDidChangeNumberOfTabViewItemsSelector)
-        [_delegate tabViewDidChangeNumberOfTabViewItems:self];
-}
-
-@end
-
-@implementation CPTabView (BindingSupport)
-
-+ (Class)_binderClassForBinding:(CPString)aBinding
-{
-    if (aBinding == CPContentBinding)
-        return [_CPTabViewContentBinder class];
-    else if (aBinding == CPSelectionIndexesBinding || aBinding == CPSelectedIndexBinding)
-        return [_CPTabViewSelectionBinder class];
-
-    return [super _binderClassForBinding:aBinding];
-}
-
-+ (BOOL)isBindingExclusive:(CPString)aBinding
-{
-    return (aBinding == CPSelectionIndexesBinding || aBinding == CPSelectedIndexBinding);
-}
-
-- (void)_reverseSetContent
-{
-    var theBinder = [self binderForBinding:CPContentBinding];
-    [theBinder reverseSetValueFor:@"items"];
-}
-
-- (void)_reverseSetSelectedIndex
-{
-    var theBinder = [self binderForBinding:CPSelectionIndexesBinding];
-
-    if (theBinder !== nil)
-        [theBinder reverseSetValueFor:@"selectionIndexes"];
-    else
+    for (var i = 0; i < count; i++)
     {
-        theBinder = [self binderForBinding:CPSelectedIndexBinding];
-        [theBinder reverseSetValueFor:@"selectedIndex"];
-    }
-}
-
-- (CPBinder)binderForBinding:(CPString)aBinding
-{
-    var cls = [[self class] _binderClassForBinding:aBinding]
-    return [cls getBinding:aBinding forObject:self];
-}
-
-- (void)setItems:(CPArray)tabViewItems
-{
-    if ([tabViewItems isEqualToArray:[_tabs segments]])
-        return;
-
-    [[self items] makeObjectsPerformSelector:@selector(_setTabView:) withObject:nil];
-    [_tabs setSegments:tabViewItems];
-    [tabViewItems makeObjectsPerformSelector:@selector(_setTabView:) withObject:self];
-
-    [self tileWithChangedItem:nil];
-
-    // Update the selection because setSegments: did remove all previous segments AND the selection.
-    [_tabs setSelectedSegment:[self indexOfTabViewItem:_selectedTabViewItem]];
-
-    // should we send delegate methods in bindings mode ?
-    //[self _delegateTabViewDidChangeNumberOfTabViewItems:self];
-}
-
-- (void)_deselectAll
-{
-    [_tabs setSelectedSegment:-1];
-    _selectedTabViewItem = nil;
-}
-
-- (void)_displayPlaceholder:(CPString)aPlaceholder
-{
-    if (_placeHolderView == nil)
-    {
-        _placeHolderView = [[CPView alloc] initWithFrame:CGRectMakeZero()];
-        var textField = [[CPTextField alloc] initWithFrame:CGRectMakeZero()];
-        [textField setTag:1000];
-        [textField setTextColor:[CPColor whiteColor]];
-        [textField setFont:[CPFont boldFontWithName:@"Geneva" size:18 italic:YES]];
-        [_placeHolderView addSubview:textField];
+        [_tabs setLabel:[[_items objectAtIndex:i] label] forSegment:i];
+        [_tabs setTag:i forSegment:i];
     }
 
-    var textField = [_placeHolderView viewWithTag:1000];
-    [textField setStringValue:aPlaceholder];
-    [textField sizeToFit];
-
-    var boxBounds = [_box bounds],
-        textFieldBounds = [textField bounds],
-        origin = CGPointMake(CGRectGetWidth(boxBounds)/2 - CGRectGetWidth(textFieldBounds)/2, CGRectGetHeight(boxBounds)/2 - CGRectGetHeight(textFieldBounds));
-
-    [textField setFrameOrigin:origin];
-
-    [self _displayItemView:_placeHolderView];
-}
-
-#pragma mark -
-#pragma mark Override
-
-/*!
-    Enabled controls accept first mouse by default.
-*/
-- (BOOL)acceptsFirstMouse:(CPEvent)anEvent
-{
-    return YES;
-}
-
-@end
-
-var _CPTabViewContentBinderNull = @"NO CONTENT";
-
-@implementation _CPTabViewContentBinder : CPBinder
-{
-}
-
-- (void)_updatePlaceholdersWithOptions:(CPDictionary)options
-{
-    [super _updatePlaceholdersWithOptions:options];
-    [self _setPlaceholder:_CPTabViewContentBinderNull forMarker:CPNullMarker isDefault:YES];
-}
-
-- (void)setPlaceholderValue:(id)aValue withMarker:(CPString)aMarker forBinding:(CPString)aBinding
-{
-    [_source setItems:@[]];
-    [_source _setPlaceholderView:aValue];
-}
-
-- (void)setValue:(id)aValue forBinding:(CPString)aBinding
-{
-    [_source setItems:aValue];
-}
-
-- (id)valueForBinding:(CPString)aBinding
-{
-    return [_source items];
-}
-
-@end
-
-var _CPTabViewSelectionBinderMultipleValues = @"Multiple Selection",
-    _CPTabViewSelectionBinderNoSelection = @"No Selection";
-
-@implementation _CPTabViewSelectionBinder : CPBinder
-{
-}
-
-- (void)_updatePlaceholdersWithOptions:(CPDictionary)options
-{
-    [super _updatePlaceholdersWithOptions:options];
-
-    [self _setPlaceholder:_CPTabViewSelectionBinderMultipleValues forMarker:CPMultipleValuesMarker isDefault:YES];
-    [self _setPlaceholder:_CPTabViewSelectionBinderNoSelection forMarker:CPNoSelectionMarker isDefault:YES];
-}
-
-- (void)setPlaceholderValue:(id)aValue withMarker:(CPString)aMarker forBinding:(CPString)aBinding
-{
-    if (aMarker == CPNoSelectionMarker || aMarker == CPNullMarker)
-        [_source _deselectAll];
-
-    [_source _displayPlaceholder:aValue];
-}
-
-- (void)setValue:(id)aValue forBinding:(CPString)aBinding
-{
-    if (aBinding == CPSelectionIndexesBinding)
-    {
-        if (aValue == nil || [aValue count] == 0)
-        {
-            [_source _deselectAll];
-            [_source _displayPlaceholder:_CPTabViewSelectionBinderNoSelection];
-        }
-        else if ([aValue count] > 1)
-            [_source _displayPlaceholder:_CPTabViewSelectionBinderMultipleValues];
-        else if ([aValue firstIndex] < [_source numberOfTabViewItems])
-            [_source _selectTabViewItemAtIndex:[aValue firstIndex]];
-    }
-    else if (aBinding == CPSelectedIndexBinding)
-    {
-        if (aValue == CPNotFound)
-        {
-            [_source _deselectAll];
-            [_source _displayPlaceholder:_CPTabViewSelectionBinderNoSelection];
-        }
-        else if (aValue < [_source numberOfTabViewItems])
-            [_source _selectTabViewItemAtIndex:aValue];
-    }
-}
-
-- (id)valueForBinding:(CPString)aBinding
-{
-    if (aBinding == CPSelectionIndexesBinding)
-    {
-        var result = [CPIndexSet indexSet],
-            idx = [_source indexOfTabViewItem:[_source selectedTabViewItem]];
-
-        if (idx !== CPNotFound)
-            [result addIndex:idx];
-
-        return result;
-    }
-    else if (aBinding == CPSelectedIndexBinding)
-        return [_source indexOfTabViewItem:[_source selectedTabViewItem]];
+    if (_selectedIndex === CPNotFound)
+        [self selectFirstTabViewItem:self];
 }
 
 @end
@@ -764,60 +501,34 @@ var CPTabViewItemsKey               = "CPTabViewItemsKey",
         _font = [aCoder decodeObjectForKey:CPTabViewFontKey];
         [_tabs setFont:_font];
 
-        var items = [aCoder decodeObjectForKey:CPTabViewItemsKey] || [CPArray array];
-        [self _insertTabViewItems:items atIndexes:[CPIndexSet indexSetWithIndexesInRange:CPMakeRange(0, [items count])]];
+        _items = [aCoder decodeObjectForKey:CPTabViewItemsKey];
+        [_items makeObjectsPerformSelector:@selector(_setTabView:) withObject:self];
+
+        [self _updateItems];
 
         [self setDelegate:[aCoder decodeObjectForKey:CPTabViewDelegateKey]];
 
-        _selectedTabViewItem = [aCoder decodeObjectForKey:CPTabViewSelectedItemKey];
+        var selected = [aCoder decodeObjectForKey:CPTabViewSelectedItemKey];
+        if (selected)
+            [self selectTabViewItem:selected];
 
-        _type = [aCoder decodeIntForKey:CPTabViewTypeKey];
+        [self setTabViewType:[aCoder decodeIntForKey:CPTabViewTypeKey]];
+
+        [self setNeedsLayout];
     }
 
     return self;
 }
 
-- (void)awakeFromCib
-{
-    [super awakeFromCib];
-
-    // This cannot be run in initWithCoder because it might call selectTabViewItem:, which is
-    // not safe to call before the views of the tab views items are fully decoded.
-
-    if (_selectedTabViewItem)
-    {
-        var idx = [self indexOfTabViewItem:_selectedTabViewItem];
-
-        if (idx !== CPNotFound)
-        {
-            // Temporarily set the selected item to not selected.
-            // It allows the initial selection to be made correctly.
-            _selectedTabViewItem = nil;
-
-            [self selectTabViewItemAtIndex:idx];
-        }
-    }
-
-    var type = _type;
-    _type = nil;
-    [self setTabViewType:type];
-
-    [self setNeedsLayout];
-}
-
 - (void)encodeWithCoder:(CPCoder)aCoder
 {
-    // Don't bother to encode the CPBox. We will recreate it on decode and its content view is already
-    // stored by the tab view item. Not encoding _box makes the resulting archive smaller and reduces
-    // the surface for decoding bugs (of which we've had many in tab view).
-    var subviews = [self subviews];
-    [_box removeFromSuperview];
     [super encodeWithCoder:aCoder];
-    [self setSubviews:subviews];
 
     [aCoder encodeObject:_items forKey:CPTabViewItemsKey];
 
-    [aCoder encodeConditionalObject:_selectedTabViewItem forKey:CPTabViewSelectedItemKey];
+    var selected = [self selectedTabViewItem];
+    if (selected)
+        [aCoder encodeObject:selected forKey:CPTabViewSelectedItemKey];
 
     [aCoder encodeInt:_type forKey:CPTabViewTypeKey];
     [aCoder encodeObject:_font forKey:CPTabViewFontKey];
@@ -826,26 +537,3 @@ var CPTabViewItemsKey               = "CPTabViewItemsKey",
 }
 
 @end
-
-@implementation _CPTabViewBox : CPBox
-{
-    CPTabView _tabView @accessors(property=tabView);
-}
-
-
-#pragma mark -
-#pragma mark Override
-
-- (CPView)hitTest:(CGPoint)aPoint
-{
-    // Here we check if we have clicked on the segmentedControl of the tabView or not
-    // If YES, the CPBox should not handle the click
-    var segmentIndex = [_tabView._tabs testSegment:[_tabView._tabs convertPoint:aPoint fromView:[self superview]]];
-
-    if (segmentIndex != CPNotFound)
-        return nil;
-
-    return [super hitTest:aPoint];
-}
-
-@end

AppKit/CPTabViewItem.j

@@ -23,8 +23,7 @@
 @import <Foundation/CPObject.j>
 
 @import "CPView.j"
-@class CPTabView
-@class CPViewController
+
 
 /*
     The tab is currently selected.
@@ -54,34 +53,13 @@ CPPressedTab    = 2;
 */
 @implementation CPTabViewItem : CPObject
 {
-    id               _identifier;
-    CPString         _label;
-    CPInteger        _tag            @accessors(property=tag);
+    id          _identifier;
+    CPString    _label;
 
-    CPView           _view;
-    CPView           _auxiliaryView;
+    CPView      _view;
+    CPView      _auxiliaryView;
 
-    CPTabView        _tabView;
-    unsigned         _tabState;      // Looks like it is not yet implemented
-
-    CPImage          _image          @accessors(property=image);
-    CPViewController _viewController @accessors(getter=viewController);
-
-    BOOL             _enabled        @accessors(property=enabled);
-    BOOL             _selected       @accessors(property=selected);
-    CGRect           _tabRect        @accessors(property=frame);
-    float            _width          @accessors(property=width);
-}
-
-/*
-
-*/
-+ (CPTabViewItem)tabViewItemWithViewController:(CPViewController)aViewController
-{
-    var item = [[CPTabViewItem alloc] init];
-    [item setViewController:aViewController];
-
-    return item;
+    CPTabView   _tabView;
 }
 
 - (id)init
@@ -89,19 +67,6 @@ CPPressedTab    = 2;
     return [self initWithIdentifier:@""];
 }
 
-- (void)_init
-{
-    _tag = 0;
-    _viewController = nil;
-    _image = nil;
-    _tabState = 0;
-    _tabView = nil;
-    _enabled = YES;
-    _selected = NO;
-    _tabRect = CGRectMakeZero();
-    _width = 0;
-}
-
 /*!
     Initializes the tab view item with the specified identifier.
     @return the initialized CPTabViewItem
@@ -110,12 +75,8 @@ CPPressedTab    = 2;
 {
     self = [super init];
 
-    [self _init];
-
-    _identifier = anIdentifier;
-    _label = nil;
-    _view = nil;
-    //_auxiliaryView = nil;
+    if (self)
+        _identifier = anIdentifier;
 
     return self;
 }
@@ -127,11 +88,7 @@ CPPressedTab    = 2;
 */
 - (void)setLabel:(CPString)aLabel
 {
-    if ([aLabel isEqualToString:_label])
-        return;
-
     _label = aLabel;
-    [_tabView tileWithChangedItem:self];
 }
 
 /*!
@@ -142,28 +99,6 @@ CPPressedTab    = 2;
     return _label;
 }
 
-// Working With Images
-/*!
-    Sets the CPTabViewItem's image.
-    @param anImage the image for the item
-*/
-- (void)setImage:(CPImage)anImage
-{
-    if ([anImage isEqual:_image])
-        return;
-
-    _image = anImage;
-    [_tabView tileWithChangedItem:self];
-}
-
-/*!
-    Returns the CPTabViewItem's image
-*/
-- (CPImage)image
-{
-    return _image;
-}
-
 // Checking the Tab Display State
 /*!
     Returns the tab's current state.
@@ -203,7 +138,7 @@ CPPressedTab    = 2;
     _view = aView;
 
     if ([_tabView selectedTabViewItem] == self)
-        [_tabView _displayItemView:_view];
+        [_tabView _setContentViewFromItem:self];
 }
 
 /*!
@@ -211,9 +146,6 @@ CPPressedTab    = 2;
 */
 - (CPView)view
 {
-    if (!_view && _viewController)
-        return [_viewController view]; // The view controller loads here.
-
     return _view;
 }
 
@@ -252,32 +184,10 @@ CPPressedTab    = 2;
     _tabView = aView;
 }
 
-/*!
-    Sets the specified view controller for the tab view item.
-    @param aViewController an instance of CPViewController.
-*/
-- (void)setViewController:(CPViewController)aViewController
-{
-    _viewController = aViewController;
-
-    var identifier = [aViewController cibName],
-        title = [_viewController title];
-
-    if (identifier)
-        _identifier = identifier;
-
-    if (title)
-        [self setLabel:title];
-
-    if ([_tabView selectedTabViewItem] == self)
-        [_tabView _displayItemView:[_viewController view]];
-}
-
 @end
 
 var CPTabViewItemIdentifierKey  = "CPTabViewItemIdentifierKey",
     CPTabViewItemLabelKey       = "CPTabViewItemLabelKey",
-    CPTabViewItemImageKey       = "CPTabViewItemImageKey",
     CPTabViewItemViewKey        = "CPTabViewItemViewKey",
     CPTabViewItemAuxViewKey     = "CPTabViewItemAuxViewKey";
 
@@ -290,11 +200,8 @@ var CPTabViewItemIdentifierKey  = "CPTabViewItemIdentifierKey",
 
     if (self)
     {
-       [self _init];
-
         _identifier     = [aCoder decodeObjectForKey:CPTabViewItemIdentifierKey];
         _label          = [aCoder decodeObjectForKey:CPTabViewItemLabelKey];
-        _image          = [aCoder decodeObjectForKey:CPTabViewItemImageKey];
 
         _view           = [aCoder decodeObjectForKey:CPTabViewItemViewKey];
         _auxiliaryView  = [aCoder decodeObjectForKey:CPTabViewItemAuxViewKey];
@@ -307,7 +214,6 @@ var CPTabViewItemIdentifierKey  = "CPTabViewItemIdentifierKey",
 {
     [aCoder encodeObject:_identifier    forKey:CPTabViewItemIdentifierKey];
     [aCoder encodeObject:_label         forKey:CPTabViewItemLabelKey];
-    [aCoder encodeObject:_image         forKey:CPTabViewItemImageKey];
 
     [aCoder encodeObject:_view          forKey:CPTabViewItemViewKey];
     [aCoder encodeObject:_auxiliaryView forKey:CPTabViewItemAuxViewKey];

AppKit/CPTableColumn.j

@@ -26,10 +26,8 @@
 @import <Foundation/CPSortDescriptor.j>
 @import <Foundation/CPString.j>
 
-@import "CPTextField.j"
+@import "CPTableHeaderView.j"
 
-@class _CPTableColumnHeaderView
-@class CPTableView
 
 CPTableColumnNoResizing         = 0;
 CPTableColumnAutoresizingMask   = 1 << 0;
@@ -51,7 +49,7 @@ CPTableColumnUserResizingMask   = 1 << 1;
     CPTableView         _tableView;
     CPView              _headerView;
     CPView              _dataView;
-    CPData              _dataViewData;
+    Object              _dataViewData;
 
     float               _width;
     float               _minWidth;
@@ -85,7 +83,7 @@ CPTableColumnUserResizingMask   = 1 << 1;
 
     if (self)
     {
-        _dataViewData = nil;
+        _dataViewData = { };
 
         _width = 100.0;
         _minWidth = 10.0;
@@ -180,11 +178,11 @@ CPTableColumnUserResizingMask   = 1 << 1;
             columns = [CPIndexSet indexSetWithIndexesInRange:CPMakeRange(index, [tableView._exposedColumns lastIndex] - index + 1)];
 
         // FIXME: Would be faster with some sort of -setNeedsDisplayInColumns: that updates a dirtyTableColumnForDisplay cache; then marked columns would relayout their data views at display time.
-        [tableView _layoutViewsForRowIndexes:rows columnIndexes:columns];
+        [tableView _layoutDataViewsInRows:rows columns:columns];
         [tableView tile];
 
         if (!_disableResizingPosting)
-            [[self tableView] _didResizeTableColumn:self oldWidth:oldWidth];
+            [self _postDidResizeNotificationWithOldWidth:oldWidth];
     }
 }
 
@@ -282,7 +280,7 @@ CPTableColumnUserResizingMask   = 1 << 1;
 */
 - (void)sizeToFit
 {
-    var width = CGRectGetWidth([_headerView frame]);
+    var width = _CGRectGetWidth([_headerView frame]);
 
     if (width < [self minWidth])
         [self setMinWidth:width];
@@ -393,13 +391,13 @@ CPTableColumnUserResizingMask   = 1 << 1;
 */
 - (void)setDataView:(CPView)aView
 {
-    if (_dataView === aView)
-        return;
+    if (_dataView)
+        _dataViewData[[_dataView UID]] = nil;
 
     [aView setThemeState:CPThemeStateTableDataView];
 
     _dataView = aView;
-    _dataViewData = [CPKeyedArchiver archivedDataWithRootObject:aView];
+    _dataViewData[[aView UID]] = [CPKeyedArchiver archivedDataWithRootObject:aView];
 }
 
 - (CPView)dataView
@@ -415,7 +413,7 @@ CPTableColumnUserResizingMask   = 1 << 1;
     to be invoked with row equal to -1 in cases where no actual row is involved but the table
     view needs to get some generic cell info.
 */
-- (id)dataViewForRow:(CPInteger)aRowIndex
+- (id)dataViewForRow:(int)aRowIndex
 {
     return [self dataView];
 }
@@ -423,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;
@@ -537,6 +547,19 @@ CPTableColumnUserResizingMask   = 1 << 1;
     return _headerToolTip;
 }
 
+/*!
+    @ignore
+*/
+- (void)_postDidResizeNotificationWithOldWidth:(float)oldWidth
+{
+    [[self tableView] _didResizeTableColumn:self];
+
+    [[CPNotificationCenter defaultCenter]
+    postNotificationName:CPTableViewColumnDidResizeNotification
+                  object:[self tableView]
+                userInfo:[CPDictionary dictionaryWithObjects:[self, oldWidth] forKeys:[@"CPTableColumn", "CPOldWidth"]]];
+}
+
 @end
 
 @implementation CPTableColumnValueBinder : CPBinder
@@ -546,22 +569,11 @@ CPTableColumnUserResizingMask   = 1 << 1;
 - (void)setValueFor:(CPString)aBinding
 {
     var tableView = [_source tableView],
-        newNumberOfRows = [tableView _numberOfRows];
+        column = [[tableView tableColumns] indexOfObjectIdenticalTo:_source],
+        rowIndexes = [CPIndexSet indexSetWithIndexesInRange:CPMakeRange(0, [tableView numberOfRows])],
+        columnIndexes = [CPIndexSet indexSetWithIndex:column];
 
-    if ([tableView numberOfRows] == newNumberOfRows)
-    {
-        var rowIndexes = [CPIndexSet indexSetWithIndexesInRange:CPMakeRange(0, newNumberOfRows)],
-            column = [[tableView tableColumns] indexOfObjectIdenticalTo:_source],
-            columnIndexes = [CPIndexSet indexSetWithIndex:column];
-
-        // Reloads objectValues only, not the views.
-        // FIXME: reload data for all rows or just rows intersecting exposed rows ?
-        [tableView _reloadDataForRowIndexes:rowIndexes columnIndexes:columnIndexes];
-    }
-    else
-    {
-        [tableView reloadData];
-    }
+    [tableView reloadDataForRowIndexes:rowIndexes columnIndexes:columnIndexes];
 }
 
 - (CPSortDescriptor)_defaultSortDescriptorPrototype
@@ -592,7 +604,7 @@ CPTableColumnUserResizingMask   = 1 << 1;
 
 @implementation CPTableColumn (Bindings)
 
-+ (Class)_binderClassForBinding:(CPString)aBinding
++ (id)_binderClassForBinding:(CPString)aBinding
 {
     if (aBinding == CPValueBinding)
         return [CPTableColumnValueBinder class];
@@ -601,7 +613,7 @@ CPTableColumnUserResizingMask   = 1 << 1;
 }
 
 /*!
-    Binds the receiver to an object. Note that unlike Cocoa, this works only *after* the receiver has been added to a \c CPTableView.
+    Binds the receiver to an object.
 
     @param CPString aBinding - The binding you wish to make. Typically CPValueBinding.
     @param id anObject - The object to bind the receiver to.
@@ -742,7 +754,7 @@ var CPTableColumnIdentifierKey   = @"CPTableColumnIdentifierKey",
 
     if (self)
     {
-        _dataViewData = nil;
+        _dataViewData = { };
 
         _width = [aCoder decodeFloatForKey:CPTableColumnWidthKey];
         _minWidth = [aCoder decodeFloatForKey:CPTableColumnMinWidthKey];
@@ -825,7 +837,7 @@ var CPTableColumnIdentifierKey   = @"CPTableColumnIdentifierKey",
 /*!
     @ignore
 */
-- (id)dataCellForRow:(CPInteger)row
+- (id)dataCellForRow:(int)row
 {
     [CPException raise:CPUnsupportedMethodException
                 reason:@"dataCellForRow: is not supported. Use -dataViewForRow:row instead."];

AppKit/CPText.j

@@ -28,26 +28,3 @@ CPFormFeedCharacter             = "\u000c";
 CPCarriageReturnCharacter       = "\u000d";
 CPBackTabCharacter              = "\u0019";
 CPDeleteCharacter               = "\u007f";
-
-CPIllegalTextMovement           = 0;
-CPOtherTextMovement             = 0;
-CPReturnTextMovement            = 16;
-CPTabTextMovement               = 17;
-CPBacktabTextMovement           = 18;
-CPLeftTextMovement              = 19;
-CPRightTextMovement             = 20;
-CPUpTextMovement                = 21;
-CPDownTextMovement              = 22;
-CPCancelTextMovement            = 23;
-
-@typedef CPWritingDirection
-CPWritingDirectionNatural       = -1;
-CPWritingDirectionLeftToRight   = 0;
-CPWritingDirectionRightToLeft   = 1;
-
-@typedef CPTextAlignment
-CPLeftTextAlignment      = 0;
-CPRightTextAlignment     = 1;
-CPCenterTextAlignment    = 2;
-CPJustifiedTextAlignment = 3;
-CPNaturalTextAlignment   = 4;