Updating version strings to 0.7.1.

Reviewed by me.

.gitignore

@@ -2,6 +2,5 @@
 Frameworks
 Build
 Demos
-./Aristo
+Aristo
 WebSite
-.push-package

.gitmodules

@@ -0,0 +1,12 @@
+[submodule "External/narwhal"]
+	path = External/narwhal
+	url = git://github.com/tlrobinson/narwhal.git
+[submodule "External/jack"]
+	path = External/jack
+	url = git://github.com/tlrobinson/jack.git
+[submodule "External/browserjs"]
+	path = External/browserjs
+	url = git://github.com/tlrobinson/browserjs.git
+[submodule "External/ojunit"]
+	path = External/ojunit
+	url = git://github.com/280north/ojunit.git

AppKit/AppKit.j

@@ -25,18 +25,12 @@
 @import "CPAnimation.j"
 @import "CPApplication.j"
 @import "CPBezierPath.j"
-@import "CPBox.j"
-@import "CPBrowser.j"
 @import "CPButton.j"
 @import "CPButtonBar.j"
 @import "CPCheckBox.j"
 @import "CPCib.j"
-@import "CPCibConnector.j"
-@import "CPCibControlConnector.j"
 @import "CPCibLoading.j"
-@import "CPCibOutletConnector.j"
 @import "CPClipView.j"
-@import "CPCollectionViewItem.j"
 @import "CPCollectionView.j"
 @import "CPColor.j"
 @import "CPColorPanel.j"
@@ -44,7 +38,6 @@
 @import "CPCompatibility.j"
 @import "CPControl.j"
 @import "CPCookie.j"
-@import "CPCursor.j"
 @import "CPDocument.j"
 @import "CPDocumentController.j"
 @import "CPEvent.j"
@@ -57,15 +50,12 @@
 @import "CPImageView.j"
 @import "CPMenu.j"
 @import "CPMenuItem.j"
-@import "CPOpenPanel.j"
-@import "CPOutlineView.j"
 @import "CPPanel.j"
 @import "CPPasteboard.j"
 @import "CPPopUpButton.j"
 @import "CPProgressIndicator.j"
 @import "CPRadio.j"
 @import "CPResponder.j"
-@import "CPSearchField.j"
 @import "CPScrollView.j"
 @import "CPScroller.j"
 @import "CPSecureTextField.j"
@@ -79,10 +69,7 @@
 @import "CPTextField.j"
 @import "CPToolbar.j"
 @import "CPToolbarItem.j"
-@import "CPTreeNode.j"
 @import "CPView.j"
-@import "CPViewAnimation.j"
-@import "CPViewController.j"
 @import "CPWebView.j"
 @import "CPWindow.j"
 @import "CPWindowController.j"

AppKit/CPAccordionView.j

@@ -1,381 +0,0 @@
-/*
- * CPAccordionView.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/CPArray.j>
-@import <Foundation/CPObject.j>
-@import <Foundation/CPKeyValueObserving.j>
-@import <Foundation/CPIndexSet.j>
-@import <Foundation/CPString.j>
-
-@import <AppKit/CPView.j>
-
-#import "CoreGraphics/CGGeometry.h"
-
-
-@implementation CPAccordionViewItem : CPObject
-{
-    CPString    _identifier @accessors(property=identifier);
-    CPView      _view @accessors(property=view);
-    CPString    _label @accessors(property=label);
-}
-
-- (id)init
-{
-    return [self initWithIdentifier:@""];
-}
-
-- (id)initWithIdentifier:(CPString)anIdentifier
-{
-    self = [super init];
-
-    if (self)
-        [self setIdentifier:anIdentifier];
-
-    return self;
-}
-
-@end
-
-@implementation CPAccordionView : CPView
-{
-    CPInteger       _dirtyItemIndex;
-    CPView          _itemHeaderPrototype;
-
-    CPMutableArray  _items;
-    CPMutableArray  _itemViews;
-    CPIndexSet      _expandedItemIndexes;
-}
-
-- (id)initWithFrame:(CGRect)aFrame
-{
-    self = [super initWithFrame:aFrame];
-
-    if (self)
-    {
-        _items = [];
-        _itemViews = [];
-        _expandedItemIndexes = [CPIndexSet indexSet];
-
-        [self setItemHeaderPrototype:[[CPButton alloc] initWithFrame:_CGRectMake(0.0, 0.0, 100.0, 24.0)]];
-    }
-
-    return self;
-}
-
-- (void)setItemHeaderPrototype:(CPView)aView
-{
-    _itemHeaderPrototype = aView;
-}
-
-- (CPView)itemHeaderPrototype
-{
-    return _itemHeaderPrototype;
-}
-
-- (CPArray)items
-{
-    return _items;
-}
-
-- (void)addItem:(CPAccordionItem)anItem
-{
-    [self insertItem:anItem atIndex:_items.length];
-}
-
-- (void)insertItem:(CPAccordionItem)anItem atIndex:(CPInteger)anIndex
-{
-    // FIXME: SHIFT ITEMS RIGHT
-    [_expandedItemIndexes addIndex:anIndex];
-
-    var itemView = [[_CPAccordionItemView alloc] initWithAccordionView:self];
-
-    [itemView setIndex:anIndex];
-    [itemView setLabel:[anItem label]];
-    [itemView setContentView:[anItem view]];
-
-    [self addSubview:itemView];
-
-    [_items insertObject:anItem atIndex:anIndex];
-    [_itemViews insertObject:itemView atIndex:anIndex];
-
-    [self _invalidateItemsStartingAtIndex:anIndex];
-
-    [self setNeedsLayout];
-}
-
-- (void)removeItem:(CPAccordionItem)anItem
-{
-    [self removeItemAtIndex:[_items indexOfObjectIdenticalTo:anItem]];
-}
-
-- (void)removeItemAtIndex:(CPInteger)anIndex
-{
-    // SHIFT ITEMS LEFT
-    [_expandedItemIndexes removeIndex:anIndex];
-
-    [_itemViews[anIndex] removeFromSuperview];
-
-    [_items removeObjectAtIndex:anIndex];
-    [_itemViews removeObjectAtIndex:anIndex];
-
-    [self _invalidateItemsStartingAtIndex:anIndex];
-
-    [self setNeedsLayout];
-}
-
-- (void)removeAllItems
-{
-    var count = _items.length;
-
-    while (count--)
-        [self removeItemAtIndex:count];
-}
-
-- (void)expandItemAtIndex:(CPInteger)anIndex
-{
-    if (![_itemViews[anIndex] isCollapsed])
-        return;
-
-    [_expandedItemIndexes addIndex:anIndex];
-    [_itemViews[anIndex] setCollapsed:NO];
-
-    [self _invalidateItemsStartingAtIndex:anIndex];
-}
-
-- (void)collapseItemAtIndex:(CPInteger)anIndex
-{
-    if ([_itemViews[anIndex] isCollapsed])
-        return;
-
-    [_expandedItemIndexes removeIndex:anIndex];
-    [_itemViews[anIndex] setCollapsed:YES];
-
-    [self _invalidateItemsStartingAtIndex:anIndex];
-}
-
-- (void)toggleItemAtIndex:(CPInteger)anIndex
-{
-    var itemView = _itemViews[anIndex];
-
-    if ([itemView isCollapsed])
-        [self expandItemAtIndex:anIndex];
-    
-    else
-        [self collapseItemAtIndex:anIndex];
-}
-
-- (CPIndexSet)expandedItemIndexes
-{
-    return _expandedItemIndexes;
-}
-
-- (CPIndexSet)collapsedItemIndexes
-{
-    var indexSet = [CPIndexSet indexSetWithIndexesInRange:CPMakeRange(0, _items.length)];
-
-    [indexSet removeIndexes:_expandedIndexes];
-
-    return indexSet;
-}
-
-- (void)setEnabled:(BOOL)isEnabled forItemAtIndex:(CPInteger)anIndex
-{
-    var itemView = _itemViews[anIndex];
-    if (!itemView)
-        return;
-    
-    if (!isEnabled)
-        [self collapseItemAtIndex:anIndex];
-    else
-        [self expandItemAtIndex:anIndex];
-    
-    [itemView setEnabled:isEnabled];
-}
-
-- (void)_invalidateItemsStartingAtIndex:(CPInteger)anIndex
-{
-    if (_dirtyItemIndex === CPNotFound)
-        _dirtyItemIndex = anIndex;
-
-    _dirtyItemIndex = MIN(_dirtyItemIndex, anIndex);
-
-    [self setNeedsLayout];
-}
-
-- (void)setFrameSize:(CGSize)aSize
-{
-    var width = _CGRectGetWidth([self frame]);
-
-    [super setFrameSize:aSize];
-
-    if (width !== _CGRectGetWidth([self frame]))
-        [self _invalidateItemsStartingAtIndex:0];
-}
-
-- (void)layoutSubviews
-{
-    if (_items.length <= 0)
-        return [self setFrameSize:_CGSizeMake(_CGRectGetWidth([self frame]), 0.0)];
-    
-    if (_dirtyItemIndex === CPNotFound)
-        return;
-
-    _dirtyItemIndex = MIN(_dirtyItemIndex, _items.length - 1);
-
-    var index = _dirtyItemIndex,
-        count = _itemViews.length,
-        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.
-    _dirtyItemIndex = CPNotFound;
-
-    for (; index < count; ++index)
-    {
-        var itemView = _itemViews[index];
-
-        [itemView setFrameY:y width:width];
-
-        y = CGRectGetMaxY([itemView frame]);
-    }
-
-    [self setFrameSize:_CGSizeMake(_CGRectGetWidth([self frame]), y)];
-}
-
-@end
-
-@implementation _CPAccordionItemView : CPView
-{
-    CPAccordionView _accordionView;
-
-    BOOL            _isCollapsed @accessors(getter=isCollapsed, setter=setCollapsed:);
-    CPInteger       _index @accessors(property=index);
-    CPView          _headerView;
-    CPView          _contentView;
-}
-
-- (id)initWithAccordionView:(CPAccordionView)anAccordionView
-{
-    self = [super initWithFrame:_CGRectMakeZero()];
-
-    if (self)
-    {
-        _accordionView = anAccordionView;
-        _isCollapsed = NO;
-
-        var bounds = [self bounds];
-
-        _headerView = [CPKeyedUnarchiver unarchiveObjectWithData:[CPKeyedArchiver archivedDataWithRootObject:[_accordionView itemHeaderPrototype]]];
-
-        if ([_headerView respondsToSelector:@selector(setTarget:)] && [_headerView respondsToSelector:@selector(setAction:)])
-        {
-            [_headerView setTarget:self];
-            [_headerView setAction:@selector(toggle:)];
-        }
-
-        [self addSubview:_headerView];
-    }
-
-    return self;
-}
-
-- (void)toggle:(id)aSender
-{
-    [_accordionView toggleItemAtIndex:[self index]];
-}
-
-- (void)setLabel:(CPString)aLabel
-{
-    if ([_headerView respondsToSelector:@selector(setTitle:)])
-        [_headerView setTitle:aLabel];
-
-    else if ([_headerView respondsToSelector:@selector(setLabel:)])
-        [_headerView setLabel:aLabel];
-
-    else if ([_headerView respondsToSelector:@selector(setStringValue:)])
-        [_headerView setStringValue:aLabel];
-}
-
-- (void)setEnabled:(BOOL)isEnabled
-{
-    if ([_headerView respondsToSelector:@selector(setEnabled:)])
-        [_headerView setEnabled:isEnabled];
-}
-
-- (void)setContentView:(CPView)aView
-{
-    if (_contentView === aView)
-        return;
-
-    [_contentView removeObserver:self forKeyPath:@"frame"];
-
-    [_contentView removeFromSuperview];
-
-    _contentView = aView;
-
-    [_contentView addObserver:self forKeyPath:@"frame" options:CPKeyValueObservingOptionOld | CPKeyValueObservingOptionNew context:NULL];
-
-    [self addSubview:_contentView];
-
-    [_accordionView _invalidateItemsStartingAtIndex:[self index]];
-}
-
-- (void)setFrameY:(float)aY width:(float)aWidth
-{
-    var headerHeight = _CGRectGetHeight([_headerView frame]);
-
-    // Size to fit or something?
-    [_headerView setFrameSize:_CGSizeMake(aWidth, headerHeight)];
-    [_contentView setFrameOrigin:_CGPointMake(0.0, headerHeight)];
-
-    if ([self isCollapsed])
-        [self setFrame:_CGRectMake(0.0, aY, aWidth, headerHeight)];
-
-    else
-    {
-        var contentHeight = _CGRectGetHeight([_contentView frame]);
-
-        [_contentView setFrameSize:_CGSizeMake(aWidth, contentHeight)];
-        [self setFrame:_CGRectMake(0.0, aY, aWidth, contentHeight + headerHeight)];
-    }    
-}
-
-- (void)resizeSubviewsWithOldSize:(CGSize)aSize
-{
-}
-
-- (void)observeValueForKeyPath:(CPString)aKeyPath
-                      ofObject:(id)anObject
-                        change:(CPDictionary)aChange
-                       context:(id)aContext
-{
-    if (aKeyPath === "frame" && !CGRectEqualToRect([aChange objectForKey:CPKeyValueChangeOldKey], [aChange objectForKey:CPKeyValueChangeNewKey]))
-        [_accordionView _invalidateItemsStartingAtIndex:[self index]];
-/*
-    else if (aKeyPath === "itemHeaderPrototype")
-    {
-        
-    }
-*/
-}
-
-@end

AppKit/CPAlert.j

@@ -62,12 +62,12 @@ var CPAlertWarningImage,
     CPAlert is an alert panel that can be displayed modally to present the
     user with a message and one or more options.
 
-    It can be used to display an information message \c CPInformationalAlertStyle,
-    a warning message \c CPWarningAlertStyle (the default), or a critical
-    alert \c CPCriticalAlertStyle. In each case the user can be presented with one
-    or more options by adding buttons using the \c -addButtonWithTitle: method.
+    It can be used to display an information message (<pre>CPInformationalAlertStyle</pre>),
+    a warning message (<pre>CPWarningAlertStyle</pre> - which is the default), or a critical
+    alert (<pre>CPCriticalAlertStyle</pre>). In each case the user can be presented with one
+    or more options by adding buttons using the <pre>addButtonWithTitle:</pre> method.
 
-    The panel is displayed modally by calling \c -runModal and once the user has
+    The panel is displayed modally by calling <pre>runModal</pre> and once the user has
     dismissed the panel, a message will be sent to the panel's delegate (if set), informing
     it which button was clicked (see delegate methods).
 
@@ -112,16 +112,25 @@ var CPAlertWarningImage,
 }
 
 /*!
-    Initializes a \c CPAlert panel with the default alert style \c CPWarningAlertStyle.
+    Initializes a <pre>CPAlert</pre> panel with the default alert style (<pre>CPWarningAlertStyle</pre>).
 */
 - (id)init
 {
-    if (self = [super init])
+    self = [super init];
+    
+    if (self)
     {
         _buttonCount = 0;
         _buttons = [CPArray array];
         _alertStyle = CPWarningAlertStyle;
-
+        
+        _messageLabel = [[CPTextField alloc] initWithFrame:CGRectMake(57.0, 10.0, 220.0, 80.0)];
+        [_messageLabel setFont:[CPFont systemFontOfSize:12.0]];
+        [_messageLabel setLineBreakMode:CPLineBreakByWordWrapping];
+        [_messageLabel setAlignment:CPJustifiedTextAlignment];
+        
+        _alertImageView = [[CPImageView alloc] initWithFrame:CGRectMake(15.0, 12.0, 32.0, 32.0)];
+        
         [self setWindowStyle:nil];
     }
     
@@ -136,37 +145,23 @@ var CPAlertWarningImage,
 {
     _windowStyle = styleMask;
     
-    _alertPanel = [[CPPanel alloc] initWithContentRect:CGRectMake(0.0, 0.0, 400.0, 110.0) styleMask:styleMask ? styleMask | CPTitledWindowMask : CPTitledWindowMask];
+    _alertPanel = [[CPPanel alloc] initWithContentRect:CGRectMake(0.0, 0.0, 300.0, 130.0) styleMask:styleMask ? styleMask | CPTitledWindowMask : CPTitledWindowMask];
     [_alertPanel setFloatingPanel:YES];
     [_alertPanel center];
-
-    [_messageLabel setTextColor:(styleMask & CPHUDBackgroundWindowMask) ? [CPColor whiteColor] : [CPColor blackColor]];
-
+    
+    [_messageLabel setTextColor:(styleMask == CPHUDBackgroundWindowMask) ? [CPColor whiteColor] : [CPColor blackColor]];
+    
     var count = [_buttons count];
     for(var i=0; i < count; i++)
     {
         var button = _buttons[i];
         
         [button setFrameSize:CGSizeMake([button frame].size.width, (styleMask == CPHUDBackgroundWindowMask) ? 20.0 : 24.0)];
+        [button setBezelStyle:(styleMask == CPHUDBackgroundWindowMask) ? CPHUDBezelStyle : CPRoundedBezelStyle];
         
-        [button setTheme:(_windowStyle === CPHUDBackgroundWindowMask) ? [CPTheme themeNamed:"Aristo-HUD"] : [CPTheme defaultTheme]];
-
         [[_alertPanel contentView] addSubview:button];
     }
     
-    if (!_messageLabel)
-    {
-        var bounds = [[_alertPanel contentView] bounds];
-
-        _messageLabel = [[CPTextField alloc] initWithFrame:CGRectMake(57.0, 10.0, CGRectGetWidth(bounds) - 73.0, 62.0)];
-        [_messageLabel setFont:[CPFont boldSystemFontOfSize:13.0]];
-        [_messageLabel setLineBreakMode:CPLineBreakByWordWrapping];
-        [_messageLabel setAlignment:CPJustifiedTextAlignment];
-        [_messageLabel setAutoresizingMask:CPViewWidthSizable|CPViewHeightSizable];
-
-        _alertImageView = [[CPImageView alloc] initWithFrame:CGRectMake(15.0, 12.0, 32.0, 32.0)];
-    }
-
     [[_alertPanel contentView] addSubview:_messageLabel];
     [[_alertPanel contentView] addSubview:_alertImageView];
 }
@@ -249,24 +244,21 @@ var CPAlertWarningImage,
 
 /*!
     Adds a button with a given title to the receiver.
-    Buttons will be added starting from the right hand side of the \c CPAlert panel.
+    Buttons will be added starting from the right hand side of the <pre>CPAlert</pre> panel.
     The first button will have the index 0, the second button 1 and so on.
 
     You really shouldn't need more than 3 buttons.
 */
 - (void)addButtonWithTitle:(CPString)title
 {
-    var bounds = [[_alertPanel contentView] bounds],
-        button = [[CPButton alloc] initWithFrame:CGRectMake(CGRectGetWidth(bounds) - ((_buttonCount + 1) * 90.0), CGRectGetHeight(bounds) - 34.0, 80.0, (_windowStyle == CPHUDBackgroundWindowMask) ? 20.0 : 24.0)];
+    var button = [[CPButton alloc] initWithFrame:CGRectMake(200.0 - (_buttonCount * 90.0), 98.0, 80.0, (_windowStyle == CPHUDBackgroundWindowMask) ? 20.0 : 24.0)];
     
     [button setTitle:title];
     [button setTarget:self];
     [button setTag:_buttonCount];
     [button setAction:@selector(_notifyDelegate:)];
     
-    [button setTheme:(_windowStyle === CPHUDBackgroundWindowMask) ? [CPTheme themeNamed:"Aristo-HUD"] : [CPTheme defaultTheme]];
-    [button setAutoresizingMask:CPViewMinXMargin | CPViewMinYMargin];
-
+    [button setBezelStyle:(_windowStyle == CPHUDBackgroundWindowMask) ? CPHUDBezelStyle : CPRoundRectBezelStyle];
     [[_alertPanel contentView] addSubview:button];
     
     if (_buttonCount == 0)
@@ -277,7 +269,7 @@ var CPAlertWarningImage,
 }
 
 /*!
-    Displays the \c CPAlert panel as a modal dialog. The user will not be
+    Displays the <pre>CPAlert</pre> panel as a modal dialog. The user will not be
     able to interact with any other controls until s/he has dismissed the alert
     by clicking on one of the buttons.
 */
@@ -306,11 +298,11 @@ var CPAlertWarningImage,
 /* @ignore */
 - (void)_notifyDelegate:(id)button
 {
-    [CPApp abortModal];
-    [_alertPanel close];
-
     if (_delegate && [_delegate respondsToSelector:@selector(alertDidEnd:returnCode:)])
         [_delegate alertDidEnd:self returnCode:[button tag]];
+
+    [CPApp abortModal];
+    [_alertPanel close];
 }
 
 @end

AppKit/CPAnimation.j

@@ -57,10 +57,10 @@ ACTUAL_FRAME_RATE = 0;
     @par Delegate Methods
     
     @delegate -(BOOL)animationShouldStart:(CPAnimation)animation;
-    Called at the beginning of \c -startAnimation.
+    Called at the beginning of <code>startAnimation</code>.
     @param animation the animation that will start
-    @return \c YES allows the animation to start.
-    \c NO stops the animation.
+    @return <code>YES</code> allows the animation to start.
+    <code>NO</code> stops the animation.
 
     @delegate -(void)animationDidEnd:(CPAnimation)animation;
     Called when an animation has completed.
@@ -72,7 +72,7 @@ ACTUAL_FRAME_RATE = 0;
 
     @delegate - (float)animation:(CPAnimation)animation valueForProgress:(float)progress;
     The value from this method will be returned when CPAnimation's
-    \c currentValue method is called.
+    <code>currentValue</code> method is called.
     @param animation the animation to obtain the curve value for
     @param progress the current animation progress
     @return the curve value
@@ -106,9 +106,8 @@ ACTUAL_FRAME_RATE = 0;
     {
         _progress = 0.0;
         _duration = MAX(0.0, aDuration);
+        _animationCurve = anAnimationCurve;
         _frameRate = 60.0;
-
-        [self setAnimationCurve:anAnimationCurve];
     }
     
     return self;
@@ -121,7 +120,7 @@ ACTUAL_FRAME_RATE = 0;
 */
 - (void)setAnimationCurve:(CPAnimationCurve)anAnimationCurve
 {
-    switch (anAnimationCurve)
+    switch (_animationCurve)
     {
         case CPAnimationEaseInOut:  timingFunctionName = kCAMediaTimingFunctionEaseInEaseOut;
                                     break;
@@ -155,7 +154,7 @@ ACTUAL_FRAME_RATE = 0;
 /*!
     Sets the animation's length.
     @param aDuration the new animation length
-    @throws CPInvalidArgumentException if \c aDuration is negative
+    @throws CPInvalidArgumentException if <code>aDuration</code> is negative
 */
 - (void)setDuration:(CPTimeInterval)aDuration
 {
@@ -176,7 +175,7 @@ ACTUAL_FRAME_RATE = 0;
 /*!
     Sets the animation frame rate. This is not a guaranteed frame rate. 0 means to go as fast as possible.
     @param frameRate the new desired frame rate
-    @throws CPInvalidArgumentException if \c frameRate is negative
+    @throws CPInvalidArgumentException if <code>frameRate</code> is negative
 */
 - (void)setFrameRate:(float)frameRate
 {
@@ -212,14 +211,14 @@ ACTUAL_FRAME_RATE = 0;
 }
 
 /*!
-    Starts the animation. The method calls \c -animationShouldStart:
+    Starts the animation. The method calls <code>animationShouldStart:</code>
     on the delegate (if it implements it) to see if the animation
     should begin.
 */
 - (void)startAnimation
 {
     // If we're already animating, or our delegate stops us, animate.
-    if (_timer || _delegate && [_delegate respondsToSelector:@selector(animationShouldStart:)] && ![_delegate animationShouldStart:self])
+    if (_timer || _delegate && [_delegate respondsToSelector:@selector(animationShouldStart)] && ![_delegate animationShouldStart:self])
         return;
     
     if (_progress === 1.0)
@@ -271,7 +270,7 @@ ACTUAL_FRAME_RATE = 0;
 }
 
 /*!
-    Returns \c YES if the animation
+    Returns <code>YES</code> if the animation
     is running.
 */
 - (BOOL)isAnimating
@@ -301,47 +300,13 @@ ACTUAL_FRAME_RATE = 0;
 */
 - (float)currentValue
 {
-    var t = [self currentProgress];
-    
     if ([_delegate respondsToSelector:@selector(animation:valueForProgress:)])
-        return [_delegate animation:self valueForProgress:t];
+        return [_delegate animation:self valueForProgress:_progress];
     
-    var c1 = [],
-        c2 = [];
-  
-    [_timingFunction getControlPointAtIndex:1 values:c1];
-    [_timingFunction getControlPointAtIndex:2 values:c2];
- 
-    return CubicBezierAtTime(t,c1[0],c1[1],c2[0],c2[1],_duration);
+    if (_animationCurve == CPAnimationLinear)
+        return _progress;
+    
+    alert("IMPLEMENT ANIMATION CURVES!!!");
 }
 
 @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 CubicBezierAtTime(t,p1x,p1y,p2x,p2y,duration)
-{
-    var ax=0,bx=0,cx=0,ay=0,by=0,cy=0;
-    // `ax t^3 + bx t^2 + cx t' expanded using Horner's rule.
-    function sampleCurveX(t) {return ((ax*t+bx)*t+cx)*t;};
-    function sampleCurveY(t) {return ((ay*t+by)*t+cy)*t;};
-    function sampleCurveDerivativeX(t) {return (3.0*ax*t+2.0*bx)*t+cx;};
-    // The epsilon value to pass given that the animation is going to run over |duration| seconds. The longer the animation, the more precision is needed in the timing function result to avoid ugly discontinuities.
-    function solveEpsilon(duration) {return 1.0/(200.0*duration);};
-    function solve(x,epsilon) {return sampleCurveY(solveCurveX(x,epsilon));};
-    // Given an x value, find a parametric value it came from.
-    function solveCurveX(x,epsilon) {var t0,t1,t2,x2,d2,i;
-        function fabs(n) {if(n>=0) {return n;}else {return 0-n;}}; 
-        // First try a few iterations of Newton's method -- normally very fast.
-        for(t2=x, i=0; i<8; i++) {x2=sampleCurveX(t2)-x; if(fabs(x2)<epsilon) {return t2;} d2=sampleCurveDerivativeX(t2); if(fabs(d2)<1e-6) {break;} t2=t2-x2/d2;}
-        // Fall back to the bisection method for reliability.
-        t0=0.0; t1=1.0; t2=x; if(t2<t0) {return t0;} if(t2>t1) {return t1;}
-        while(t0<t1) {x2=sampleCurveX(t2); if(fabs(x2-x)<epsilon) {return t2;} if(x>x2) {t0=t2;}else {t1=t2;} t2=(t1-t0)*.5+t0;}
-        return t2; // Failure.
-    };
-    // Calculate the polynomial coefficients, implicit first and last control points are (0,0) and (1,1).
-    cx=3.0*p1x; bx=3.0*(p2x-p1x)-cx; ax=1.0-cx-bx; cy=3.0*p1y; by=3.0*(p2y-p1y)-cy; ay=1.0-cy-by;
-    // Convert from input time to parametric value in curve, then from that to output time.
-    return solve(t, solveEpsilon(duration));
-};

AppKit/CPApplication.j

@@ -28,9 +28,6 @@
 @import "CPResponder.j"
 @import "CPDocumentController.j"
 @import "CPThemeBlend.j"
-@import "CPCibLoading.j"
-@import "CPPlatform.j"
-
 
 var CPMainCibFile               = @"CPMainCibFile",
     CPMainCibFileHumanFriendly  = @"Main cib file base name";
@@ -39,15 +36,6 @@ CPApp = nil;
 
 CPApplicationWillFinishLaunchingNotification    = @"CPApplicationWillFinishLaunchingNotification";
 CPApplicationDidFinishLaunchingNotification     = @"CPApplicationDidFinishLaunchingNotification";
-CPApplicationWillTerminateNotification          = @"CPApplicationWillTerminateNotification";
-CPApplicationWillBecomeActiveNotification       = @"CPApplicationWillBecomeActiveNotification";
-CPApplicationDidBecomeActiveNotification        = @"CPApplicationDidBecomeActiveNotification";
-CPApplicationWillResignActiveNotification       = @"CPApplicationWillResignActiveNotification";
-CPApplicationDidResignActiveNotification        = @"CPApplicationDidResignActiveNotification";
-
-CPTerminateNow      = YES;
-CPTerminateCancel   = NO;
-CPTerminateLater    = -1; // not currently supported
 
 CPRunStoppedResponse    = -1000;
 CPRunAbortedResponse    = -1001;
@@ -60,7 +48,7 @@ CPRunContinuesResponse  = -1002;
     CPApplication is THE way to start up the Cappucino framework for your application to use.
     Every GUI application has exactly one instance of CPApplication (or of a custom subclass of
     CPApplication). Your program's main() function can create that instance by calling the
-    \c CPApplicationMain function. A simple example looks like this:
+    <code>CPApplicationMain</code> function. A simple example looks like this:
     
     <pre>
     function main(args, namedArgs)
@@ -87,8 +75,6 @@ CPRunContinuesResponse  = -1002;
     CPArray                 _windows;
     CPWindow                _keyWindow;
     CPWindow                _mainWindow;
-    CPWindow                _previousKeyWindow;
-    CPWindow                _previousMainWindow;
     
     CPMenu                  _mainMenu;
     CPDocumentController    _documentController;
@@ -97,16 +83,10 @@ CPRunContinuesResponse  = -1002;
     
     //
     id                      _delegate;
-    BOOL                    _finishedLaunching;
-    BOOL                    _isActive;
     
     CPDictionary            _namedArgs;
     CPArray                 _args;
     CPString                _fullArgsString;
-
-    CPImage                 _applicationIconImage;
-
-    CPPanel                 _aboutPanel;
 }
 
 /*!
@@ -124,7 +104,7 @@ CPRunContinuesResponse  = -1002;
 
 /*!
     Initializes the Document based application with basic menu functions.
-    Functions are \c New, \c Open, \c Undo, \c Redo, \c Save, \c Cut, \c Copy, \c Paste.
+    Functions are <code>New, Open, Undo, Redo, Save, Cut, Copy, Paste</code>.
     @return the initialized application
 */
 - (id)init
@@ -146,14 +126,14 @@ CPRunContinuesResponse  = -1002;
         [_mainMenu setAutoenablesItems:NO];
 
         var bundle = [CPBundle bundleForClass:[CPApplication class]],
-            newMenuItem = [[CPMenuItem alloc] initWithTitle:@"New" action:@selector(newDocument:) keyEquivalent:@"n"];
+            newMenuItem = [[CPMenuItem alloc] initWithTitle:@"New" action:@selector(newDocument:) keyEquivalent:@"N"];
 
         [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"];
+        var openMenuItem = [[CPMenuItem alloc] initWithTitle:@"Open" action:@selector(openDocument:) keyEquivalent:@"O"];
         
         [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)]];
@@ -166,7 +146,7 @@ CPRunContinuesResponse  = -1002;
         [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" action:@selector(saveDocument:) keyEquivalent:@"S"]];
         [saveMenu addItem:[[CPMenuItem alloc] initWithTitle:@"Save As" action:@selector(saveDocumentAs:) keyEquivalent:nil]];
         
         [saveMenuItem setSubmenu:saveMenu];
@@ -185,9 +165,9 @@ CPRunContinuesResponse  = -1002;
         [editMenu addItem:undoMenuItem];
         [editMenu addItem:redoMenuItem];
         
-        [editMenu addItem:[[CPMenuItem alloc] initWithTitle:@"Cut" action:@selector(cut:) keyEquivalent:@"x"]],
-        [editMenu addItem:[[CPMenuItem alloc] initWithTitle:@"Copy" action:@selector(copy:) keyEquivalent:@"c"]],
-        [editMenu addItem:[[CPMenuItem alloc] initWithTitle:@"Paste" action:@selector(paste:) keyEquivalent:@"v"]];
+        [editMenu addItem:[[CPMenuItem alloc] initWithTitle:@"Cut" action:@selector(cut:) keyEquivalent:@"X"]],
+        [editMenu addItem:[[CPMenuItem alloc] initWithTitle:@"Copy" action:@selector(copy:) keyEquivalent:@"C"]],
+        [editMenu addItem:[[CPMenuItem alloc] initWithTitle:@"Paste" action:@selector(paste:) keyEquivalent:@"V"]];
     
         [editMenuItem setSubmenu:editMenu];
         [editMenuItem setHidden:YES];
@@ -226,26 +206,6 @@ CPRunContinuesResponse  = -1002;
             removeObserver:_delegate
                       name:CPApplicationDidFinishLaunchingNotification
                     object:self];
-
-        [defaultCenter
-            removeObserver:_delegate
-                      name:CPApplicationWillBecomeActiveNotification
-                    object:self];
-
-        [defaultCenter
-            removeObserver:_delegate
-                      name:CPApplicationDidBecomeActiveNotification
-                    object:self];
-
-        [defaultCenter
-            removeObserver:_delegate
-                      name:CPApplicationWillResignActiveNotification
-                    object:self];
-
-        [defaultCenter
-            removeObserver:_delegate
-                      name:CPApplicationDidResignActiveNotification
-                    object:self];
     }
     
     _delegate = aDelegate;
@@ -263,34 +223,6 @@ CPRunContinuesResponse  = -1002;
                selector:@selector(applicationDidFinishLaunching:)
                    name:CPApplicationDidFinishLaunchingNotification
                  object:self];
-
-    if ([_delegate respondsToSelector:@selector(applicationWillBecomeActive:)])
-        [defaultCenter
-            addObserver:_delegate
-               selector:@selector(applicationWillBecomeActive:)
-                   name:CPApplicationWillBecomeActiveNotification
-                 object:self];
-
-    if ([_delegate respondsToSelector:@selector(applicationDidBecomeActive:)])
-        [defaultCenter
-            addObserver:_delegate
-               selector:@selector(applicationDidBecomeActive:)
-                   name:CPApplicationDidBecomeActiveNotification
-                 object:self];
-
-    if ([_delegate respondsToSelector:@selector(applicationWillResignActive:)])
-        [defaultCenter
-            addObserver:_delegate
-               selector:@selector(applicationWillResignActive:)
-                   name:CPApplicationWillResignActiveNotification
-                 object:self];
-
-    if ([_delegate respondsToSelector:@selector(applicationDidResignActive:)])
-        [defaultCenter
-            addObserver:_delegate
-               selector:@selector(applicationDidResignActive:)
-                   name:CPApplicationDidResignActiveNotification
-                 object:self];
 }
 
 /*!
@@ -302,21 +234,13 @@ CPRunContinuesResponse  = -1002;
 }
 
 /*!
-    This method is called by \c -run before the event loop begins.
+    This method is called by <code>run</code> before the event loop begins.
     When it successfully completes, it posts the notification
     CPApplicationDidFinishLaunchingNotification. If you override
-    \c -finishLaunching, the subclass method should invoke the superclass method.
+    <code>finishLaunching</code>, the subclass method should invoke the superclass method.
 */
 - (void)finishLaunching
 {
-    // At this point we clear the window.status to eliminate Safari's "Cancelled" error message
-    // The message shouldn't be displayed, because only an XHR is cancelled, but it is a usability issue.
-    // We do it here so that applications can change it in willFinish or didFinishLaunching
-    window.status = " ";
-
-    // We also want to set the default cursor on the body, so that buttons and things don't have an iBeam
-    [[CPCursor arrowCursor] set];
-    
     var bundle = [CPBundle mainBundle],
         types = [bundle objectForInfoDictionaryKey:@"CPBundleDocumentTypes"];
         
@@ -341,169 +265,19 @@ CPRunContinuesResponse  = -1002;
     [defaultCenter
         postNotificationName:CPApplicationWillFinishLaunchingNotification
         object:self];
-
-    var needsUntitled = !!_documentController,
-        URLStrings = window.cpOpeningURLStrings && window.cpOpeningURLStrings(),
-        index = 0,
-        count = [URLStrings count];
-
-    for (; index < count; ++index)
-        needsUntitled = ![self _openURL:[CPURL URLWithString:URLStrings[index]]] || needsUntitled;
-
-    if (needsUntitled && [_delegate respondsToSelector:@selector(applicationShouldOpenUntitledFile:)])
-        needsUntitled = [_delegate applicationShouldOpenUntitledFile:self];
-
-    if (needsUntitled)
+    
+    if (_documentController)
         [_documentController newDocument:self];
-
-    [_documentController _updateRecentDocumentsMenu];
-
+    
     [defaultCenter
         postNotificationName:CPApplicationDidFinishLaunchingNotification
         object:self];
-
-    [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
-
-    _finishedLaunching = YES;
-}
-
-- (void)terminate:(id)aSender
-{
-    if (![CPPlatform isBrowser])
-    {
-        [[CPDocumentController sharedDocumentController] closeAllDocumentsWithDelegate:self
-                                                                  didCloseAllSelector:@selector(_documentController:didCloseAll:context:)
-                                                                          contextInfo:nil];
-    }
-    else
-    {
-        [[[self keyWindow] platformWindow] _propagateCurrentDOMEvent:YES];
-    }
-}
-
-- (void)setApplicationIconImage:(CPImage)anImage
-{
-    _applicationIconImage = anImage;
-}
-
-- (CPImage)applicationIconImage
-{
-    if (_applicationIconImage)
-        return _applicationIconImage;
-
-    var imagePath = [[CPBundle mainBundle] objectForInfoDictionaryKey:@"CPApplicationIcon"];
-    if (imagePath)
-        _applicationIconImage = [[CPImage alloc] initWithContentsOfFile:imagePath];
-
-    return _applicationIconImage;
-}
-
-- (void)orderFrontStandardAboutPanel:(id)sender
-{
-    [self orderFrontStandardAboutPanelWithOptions:nil];
-}
-
-- (void)orderFrontStandardAboutPanelWithOptions:(CPDictionary)options
-{
-    if (!_aboutPanel)
-    {
-        var mainInfo = [[CPBundle mainBundle] infoDictionary],
-            applicationTitle = [options objectForKey:"ApplicationName"] || [mainInfo objectForKey:@"CPBundleName"],
-            applicationIcon = [options objectForKey:@"ApplicationIcon"] || [self applicationIconImage],
-            version = [options objectForKey:@"Version"] || [mainInfo objectForKey:@"CPBundleVersion"],
-            applicationVersion = [options objectForKey:@"ApplicationVersion"] || [mainInfo objectForKey:@"CPBundleShortVersionString"],
-            copyright = [options objectForKey:@"Copyright"] || [mainInfo objectForKey:@"CPHumanReadableCopyright"];
-
-        var aboutPanelController = [[CPWindowController alloc] initWithWindowCibName:@"AboutPanel"],
-            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:14.0]];
-        [applicationLabel setAlignment:CPCenterTextAlignment];
-        [versionLabel setAlignment:CPCenterTextAlignment];
-        [copyrightLabel setAlignment:CPCenterTextAlignment];
-
-        [imageView setImage:applicationIcon || [[CPImage alloc] initWithContentsOfFile:standardPath 
-                                                                                  size:CGSizeMake(256, 256)]];
-
-        [applicationLabel setStringValue:applicationTitle || ""];
-
-        if (applicationVersion && version)
-            [versionLabel setStringValue:@"Version " + applicationVersion + " (" + version + ")"];
-        else if (applicationVersion || version)
-            [versionLabel setStringValue:@"Version " + (applicationVersion || version)];
-        else
-            [versionLabel setStringValue:@""];
-
-        [copyrightLabel setStringValue:copyright || ""];
-        [aboutPanel center];
-
-        _aboutPanel = aboutPanel;
-    }
-
-    [_aboutPanel orderFront:self];
-}
-
-
-- (void)_documentController:(NSDocumentController *)docController didCloseAll:(BOOL)didCloseAll context:(Object)info
-{
-    // callback method for terminate:
-    if (didCloseAll)
-    {
-        if ([_delegate respondsToSelector:@selector(applicationShouldTerminate:)])
-            [self replyToApplicationShouldTerminate:[_delegate applicationShouldTerminate:self]];
-        else
-            [self replyToApplicationShouldTerminate:YES];
-    }
-}
-
-- (void)replyToApplicationShouldTerminate:(BOOL)terminate
-{
-    if (terminate == CPTerminateNow)
-    {
-        [[CPNotificationCenter defaultCenter] postNotificationName:CPApplicationWillTerminateNotification object:self];
-        [CPPlatform terminateApplication];
-    }
-}
-
-- (void)activateIgnoringOtherApps:(BOOL)shouldIgnoreOtherApps
-{
-    [self _willBecomeActive];
-
-    [CPPlatform activateIgnoringOtherApps:shouldIgnoreOtherApps];
-    _isActive = YES;
-
-    [self _willResignActive];
-}
-
-- (void)deactivate
-{
-    [self _willResignActive];
-
-    [CPPlatform deactivate];
-    _isActive = NO;
-
-    [self _didResignActive];
-}
-
-- (void)isActive
-{
-    return _isActive;
-}
-
-- (void)hideOtherApplications:(id)aSender
-{
-    [CPPlatform hideOtherApplications:self];
+    [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
 }
 
 /*!
-    Calls \c -finishLaunching method which results in starting
+    Calls <code>finishLaunching</code> method which results in starting
     the main event loop.
 */
 - (void)run
@@ -513,7 +287,7 @@ CPRunContinuesResponse  = -1002;
 
 // Managing the Event Loop
 /*!
-    Starts a modal event loop for \c aWindow
+    Starts a modal event loop for <code>aWindow</code>
     @param aWindow the window to start the event loop for
 */
 - (void)runModalForWindow:(CPWindow)aWindow
@@ -522,8 +296,8 @@ CPRunContinuesResponse  = -1002;
 }
 
 /*!
-    Stops the event loop started by \c -runModalForWindow: and
-    sets the code that \c -runModalForWindow: will return.
+    Stops the event loop started by <code>runModalForWindow:</code> and
+    sets the code that <code>runModalForWindow:</code> will return.
     @param aCode the return code for the modal event
 */
 - (void)stopModalWithCode:(int)aCode
@@ -564,7 +338,7 @@ CPRunContinuesResponse  = -1002;
 }
 
 /*!
-    Aborts the event loop started by \c -runModalForWindow:
+    Aborts the event loop started by <code>runModalForWindow:</code>
 */
 - (void)abortModal
 {
@@ -572,7 +346,7 @@ CPRunContinuesResponse  = -1002;
 }
 
 /*!
-    Sets up a modal session with \c theWindow.
+    Sets up a modal session with <code>theWindow</code>.
     @param aWindow the window to set up the modal session for
 */
 - (CPModalSession)beginModalSessionForWindow:(CPWindow)aWindow
@@ -601,7 +375,7 @@ CPRunContinuesResponse  = -1002;
 
 /*!
     Returns the window for the current modal session. If there is no
-    modal session, it returns \c nil.
+    modal session, it returns <code>nil</code>.
 */
 - (CPWindow)modalWindow
 {
@@ -614,8 +388,10 @@ CPRunContinuesResponse  = -1002;
 /* @ignore */
 - (BOOL)_handleKeyEquivalent:(CPEvent)anEvent
 {
-    return  [[self keyWindow] performKeyEquivalent:anEvent] ||
-            [_mainMenu performKeyEquivalent:anEvent];
+    if ([_mainMenu performKeyEquivalent:anEvent])
+        return YES;
+    
+    return NO;
 }
 
 /*!
@@ -624,29 +400,12 @@ CPRunContinuesResponse  = -1002;
 */
 - (void)sendEvent:(CPEvent)anEvent
 {
-    _currentEvent = anEvent;
-
-    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];
-
     // Check if this is a candidate for key equivalent...
-    if ([anEvent _couldBeKeyEquivalent] && [self _handleKeyEquivalent:anEvent])
-    {
-        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];
-
+    if ([anEvent type] == CPKeyDown &&
+        [anEvent modifierFlags] & (CPCommandKeyMask | CPControlKeyMask) && 
+        [[anEvent characters] length] > 0 &&
+        [self _handleKeyEquivalent:anEvent])
         return;
-    }
-
-    // if we make it this far, then restore the original willPropagate value
-    [[[anEvent window] platformWindow] _propagateCurrentDOMEvent:willPropagate];
 
     if (_eventListeners.length)
     {
@@ -684,7 +443,7 @@ CPRunContinuesResponse  = -1002;
 }
 
 /*!
-    Returns the CPWindow object corresponding to \c aWindowNumber.
+    Returns the CPWindow object corresponding to <code>aWindowNumber</code>.
 */
 - (CPWindow)windowWithWindowNumber:(int)aWindowNumber
 {
@@ -699,19 +458,6 @@ CPRunContinuesResponse  = -1002;
     return _windows;
 }
 
-/*!
-    Returns an array of visible CPWindow objects, ordered by their front to back order on the screen.
-*/
-- (CPArray)orderedWindows
-{
-    return CPWindowObjectList();
-}
-
-- (void)hide:(id)aSender
-{
-    [CPPlatform hide:self];
-}
-
 // Accessing the Main Menu
 /*!
     Returns the application's main menu
@@ -727,18 +473,7 @@ CPRunContinuesResponse  = -1002;
 */
 - (void)setMainMenu:(CPMenu)aMenu
 {
-    if ([aMenu _menuName] === "CPMainMenu")
-    {
-        if (_mainMenu === aMenu)
-            return;
-
-        _mainMenu = aMenu;
-
-        if ([CPPlatform supportsNativeMainMenu])
-            window.cpSetMainMenu(_mainMenu);
-    }
-    else
-        [aMenu _setMenuName:@"CPMainMenu"];
+    _mainMenu = aMenu;
 }
 
 - (void)orderFrontColorPanel:(id)aSender
@@ -746,6 +481,16 @@ CPRunContinuesResponse  = -1002;
     [[CPColorPanel sharedColorPanel] orderFront:self];
 }
 
+- (void)orderFrontStandardAboutPanel:(id)aSender
+{
+    [self orderFrontStandardAboutPanelWithOptions:nil];
+}
+
+- (void)orderFrontStandardAboutPanelWithOptions:(CPDictionary)aDictionary
+{
+    // FIXME: Implement.
+}
+
 // Posting Actions
 /*!
     Tries to perform the action with an argument. Performs
@@ -754,7 +499,7 @@ CPRunContinuesResponse  = -1002;
     @param anAction the action to perform.
     @param anObject the argument for the action
     method
-    @return \c YES if the action was performed
+    @return <code>YES</code> if the action was performed
 */
 - (BOOL)tryToPerform:(SEL)anAction with:(id)anObject
 {
@@ -779,12 +524,12 @@ CPRunContinuesResponse  = -1002;
     @param anAction the action to send
     @param aTarget the target for the action
     @param aSender the action sender
-    @return \c YES
+    @return <code>YES</code>
 */
 - (BOOL)sendAction:(SEL)anAction to:(id)aTarget from:(id)aSender
 {
     var target = [self targetForAction:anAction to:aTarget from:aSender];
-
+    
     if (!target)
         return NO;
     
@@ -795,12 +540,12 @@ CPRunContinuesResponse  = -1002;
 
 /*!
     Finds a target for the specified action. If the
-    action is \c nil, returns \c nil.
-    If the target is not \c nil, \c aTarget is
-    returned. Otherwise, it calls \c -targetForAction:
+    action is <code>nil</code>, returns <code>nil</code>.
+    If the target is not <code>nil</code>, <code>aTarget</code> is
+    returned. Otherwise, it calls <code>targetForAction:</code>
     to search for a target.
     @param anAction the action to find a target for
-    @param aTarget if not \c nil, this will be returned
+    @param aTarget if not <code>nil</code>, this will be returned
     @aSender not used
     @return a target for the action
 */
@@ -828,7 +573,7 @@ CPRunContinuesResponse  = -1002;
     </ol>
     @param aWindow the window to search for a target
     @param anAction the action to find a responder to
-    @return the object that responds to the action, or \c nil
+    @return the object that responds to the action, or <code>nil</code>
     if no matching target was found
     @ignore
 */
@@ -860,11 +605,12 @@ CPRunContinuesResponse  = -1002;
     
     if ([windowController respondsToSelector:anAction])
         return windowController;
-
+    
     var theDocument = [windowController document];
-    if (theDocument !== delegate && [theDocument respondsToSelector:anAction])
+    
+    if (theDocument != delegate && [theDocument respondsToSelector:anAction])
         return theDocument;
-
+    
     return nil;
 }
 
@@ -873,13 +619,13 @@ CPRunContinuesResponse  = -1002;
     Checks for a target in the following order:
     <ol>
         <li>a responder from the key window</li>
-        <li>a responder from the main window</li>
+        <li>a responder frmo the main window</li>
         <li>the CPApplication instance</li>
         <li>the application delegate</li>
         <li>the document controller</li>
     </ol>
     @param anAction the action to handle
-    @return a target that can respond, or \c nil
+    @return a target that can respond, or <code>nil</code>
     if no match could be found
 */
 - (id)targetForAction:(SEL)anAction
@@ -912,6 +658,8 @@ CPRunContinuesResponse  = -1002;
 - (void)setCallback:(Function)aCallback forNextEventMatchingMask:(unsigned int)aMask untilDate:(CPDate)anExpiration inMode:(CPString)aMode dequeue:(BOOL)shouldDequeue
 {
     _eventListeners.push(_CPEventListenerMake(aMask, aCallback));
+    
+    if (_eventListeners.length == 3) objj_debug_print_backtrace();
 }
 
 - (CPEvent)setTarget:(id)aTarget selector:(SEL)aSelector forNextEventMatchingMask:(unsigned int)aMask untilDate:(CPDate)anExpiration inMode:(CPString)aMode dequeue:(BOOL)shouldDequeue
@@ -919,11 +667,6 @@ CPRunContinuesResponse  = -1002;
     _eventListeners.push(_CPEventListenerMake(aMask, function (anEvent) { objj_msgSend(aTarget, aSelector, anEvent); }));
 }
 
-- (CPEvent)currentEvent
-{
-    return _currentEvent;
-}
-
 // Managing Sheets
 
 /*!
@@ -936,43 +679,12 @@ CPRunContinuesResponse  = -1002;
 */
 - (void)beginSheet:(CPWindow)aSheet modalForWindow:(CPWindow)aWindow modalDelegate:(id)aModalDelegate didEndSelector:(SEL)aDidEndSelector contextInfo:(id)aContextInfo
 {    
-    var styleMask = [aSheet styleMask];
-    if (!(styleMask & CPDocModalWindowMask))
-    {
-        [CPException raise:CPInternalInconsistencyException reason:@"Currently only CPDocModalWindowMask style mask is supported for attached sheets"];
-        return;
-    }
-    
-    [aWindow orderFront:self];
     [aWindow _attachSheet:aSheet modalDelegate:aModalDelegate didEndSelector:aDidEndSelector contextInfo:aContextInfo];
 }
 
-- (void)endSheet:(CPWindow)sheet returnCode:(int)returnCode
-{
-    var count = [_windows count];
-    
-    while (--count >= 0)
-    {
-        var aWindow = [_windows objectAtIndex:count];
-        var context = aWindow._sheetContext;
-    
-        if (context != nil && context["sheet"] === sheet)
-        {
-            context["returnCode"] = returnCode; 
-            [aWindow _detachSheetWindow];
-            return;
-        }
-    }
-}
-
-- (void)endSheet:(CPWindow)sheet
-{
-   [self endSheet:sheet returnCode:0];
-}
-
 - (CPArray)arguments
 {
-    if(_fullArgsString !== window.location.hash)
+    if(_fullArgsString != window.location.hash)
         [self _reloadArguments];
     
     return _args;
@@ -1005,18 +717,12 @@ CPRunContinuesResponse  = -1002;
 - (void)_reloadArguments
 {
     _fullArgsString = window.location.hash;
+    var args = _fullArgsString.replace("#", "").split("/").slice(0);
     
-    if (_fullArgsString.length)
-    {
-        var args = _fullArgsString.substring(1).split("/");
-
-        for (var i = 0, count = args.length; i < count; i++)
-            args[i] = decodeURIComponent(args[i]);
-
-        _args = args;
-    }
-    else
-        _args = [];
+    for(var i=0, count = args.length; i<count; i++) 
+        args[i] = decodeURIComponent(args[i]);
+    
+    _args = args;
 }
 
 - (CPDictionary)namedArguments
@@ -1024,87 +730,6 @@ CPRunContinuesResponse  = -1002;
     return _namedArgs;
 }
 
-- (BOOL)_openURL:(CPURL)aURL
-{
-    if (_delegate && [_delegate respondsToSelector:@selector(application:openFile:)])
-    {
-        CPLog.warn("application:openFile: is deprecated, use application:openURL: instead.");
-        return [_delegate application:self openFile:[aURL absoluteString]];
-    }
-
-    if (_delegate && [_delegate respondsToSelector:@selector(application:openURL:)])
-        return [_delegate application:self openURL:aURL];
-
-    return !![_documentController openDocumentWithContentsOfURL:aURL display:YES error:NULL];
-}
-
-- (void)_willBecomeActive
-{
-    [[CPNotificationCenter defaultCenter] postNotificationName:CPApplicationWillBecomeActiveNotification 
-                                                        object:self 
-                                                      userInfo:nil];
-}
-
-- (void)_didBecomeActive
-{
-    if (![self keyWindow] && _previousKeyWindow && 
-        [[self windows] indexOfObjectIdenticalTo:_previousKeyWindow] !== CPNotFound)
-        [_previousKeyWindow makeKeyWindow];
-
-    if (![self mainWindow] && _previousMainWindow && 
-        [[self windows] indexOfObjectIdenticalTo:_previousMainWindow] !== CPNotFound)
-        [_previousMainWindow makeMainWindow];
-
-    if ([self keyWindow])
-        [[self keyWindow] orderFront:self];
-    else if ([self mainWindow])
-        [[self mainWindow] makeKeyAndOrderFront:self];
-    else
-        [[self mainMenu]._menuWindow makeKeyWindow]; //FIXME this may not actually work
-
-    _previousKeyWindow = nil;
-    _previousMainWindow = nil;
-
-    [[CPNotificationCenter defaultCenter] postNotificationName:CPApplicationDidBecomeActiveNotification 
-                                                        object:self 
-                                                      userInfo:nil];
-}
-
-- (void)_willResignActive
-{
-    [[CPNotificationCenter defaultCenter] postNotificationName:CPApplicationWillResignActiveNotification 
-                                                        object:self 
-                                                      userInfo:nil];
-}
-
-- (void)_didResignActive
-{
-    if (self._activeMenu)
-        [self._activeMenu cancelTracking];
-
-    if ([self keyWindow])
-    {
-        _previousKeyWindow = [self keyWindow];
-        [_previousKeyWindow resignKeyWindow];
-    }
-
-    if ([self mainWindow])
-    {
-        _previousMainWindow = [self mainWindow];
-        [_previousMainWindow resignMainWindow];
-    }
-
-    [[CPNotificationCenter defaultCenter] postNotificationName:CPApplicationDidResignActiveNotification 
-                                                        object:self 
-                                                      userInfo:nil];
-}
-
-+ (CPString)defaultThemeName
-{
-    // FIXME: don't hardcode
-    return ([[CPBundle mainBundle] objectForInfoDictionaryKey:"CPDefaultTheme"] || @"Aristo");
-}
-
 @end
 
 var _CPModalSessionMake = function(aWindow, aStopCode)
@@ -1130,7 +755,7 @@ var _CPRunModalLoop = function(anEvent)
 
 /*!
     Starts the GUI and Cappuccino frameworks. This function should be
-    called from the \c main() function of your program.
+    called from the <code>main()</code> function of your program.
     @class CPApplication
     @return void
 */
@@ -1145,8 +770,25 @@ function CPApplicationMain(args, namedArgs)
 
     [principalClass sharedApplication];
 
-    if ([args containsObject:"debug"])
-        CPLogRegister(CPLogPopup);
+    //FIXME?
+    if (!args && !namedArgs)
+    {
+        var args = [CPApp arguments],
+            searchParams = window.location.search.substring(1).split("&");
+            namedArgs = [CPDictionary dictionary];
+
+        if([args containsObject:"debug"])
+            CPLogRegister(CPLogPopup);
+
+        for(var i=0; i<searchParams.length; i++)
+        {
+            var index = searchParams[i].indexOf('=');
+            if(index == -1)
+                [namedArgs setObject: "" forKey:searchParams[i]];
+            else
+                [namedArgs setObject: searchParams[i].substring(index+1) forKey: searchParams[i].substring(0, index)];
+        }
+    }
 
     CPApp._args = args;
     CPApp._namedArgs = namedArgs;
@@ -1160,9 +802,9 @@ var _CPAppBootstrapperActions = nil;
 {
 }
 
-+ (CPArray)actions
++ (void)actions
 {
-    return [@selector(bootstrapPlatform), @selector(loadDefaultTheme), @selector(loadMainCibFile)];
+    return [@selector(loadDefaultTheme), @selector(loadMainCibFile)];
 }
 
 + (void)performActions
@@ -1181,23 +823,18 @@ var _CPAppBootstrapperActions = nil;
     [CPApp run];
 }
 
-+ (BOOL)bootstrapPlatform
-{
-    return [CPPlatform bootstrap];
-}
-
 + (BOOL)loadDefaultTheme
 {
-    var blend = [[CPThemeBlend alloc] initWithContentsOfURL:[[CPBundle bundleForClass:[CPApplication class]] pathForResource:[CPApplication defaultThemeName] + ".blend"]];
+    var blend = [[CPThemeBlend alloc] initWithContentsOfURL:[[CPBundle bundleForClass:[CPApplication class]] pathForResource:@"Aristo.blend"]];
 
     [blend loadWithDelegate:self];
 
     return YES;
 }
 
-+ (void)blendDidFinishLoading:(CPThemeBlend)aThemeBlend
++ (void)blendDidFinishLoading:(CPBundle)aBundle
 {
-    [CPTheme setDefaultTheme:[CPTheme themeNamed:[CPApplication defaultThemeName]]];
+    [CPTheme setDefaultTheme:[CPTheme themeNamed:@"Aristo"]];
 
     [self performActions];
 }
@@ -1224,14 +861,4 @@ var _CPAppBootstrapperActions = nil;
     [self performActions];
 }
 
-+ (void)cibDidFailToLoad:(CPCib)aCib
-{
-    throw new Error("Could not load main cib file (Did you forget to nib2cib it?).");
-}
-
-+ (void)reset
-{
-	_CPAppBootstrapperActions = nil;
-}
-
 @end

AppKit/CPBezierPath.j

@@ -50,76 +50,52 @@ var DefaultLineWidth = 1.0;
     float   _lineWidth;
 }
 
-/*!
-    Create a new CPBezierPath object.
-*/
 + (CPBezierPath)bezierPath
 {
-    return [[self alloc] init];
+    return [[[self class] alloc] init];
 }
 
-/*!
-    Create a new CPBezierPath object initialized with an oval path drawn within a rectangular path.
-*/
 + (CPBezierPath)bezierPathWithOvalInRect:(CGRect)rect
 {
-    var path = [self bezierPath];
+    var path = [[self class] bezierPath];
     
     [path appendBezierPathWithOvalInRect:rect];
     
     return path;
 }
 
-/*!
-    Create a new CPBezierPath object initialized with a rectangular path.
-*/
 + (CPBezierPath)bezierPathWithRect:(CGRect)rect
 {
-    var path = [self bezierPath];
+    var path = [[self class] bezierPath];
     
     [path appendBezierPathWithRect:rect];
     
     return path;
 }
 
-/*!
-    Get default line width.
-*/
 + (float)defaultLineWidth
 {
     return DefaultLineWidth;
 }
 
-/*!
-    Set default line width.
-*/
 + (void)setDefaultLineWidth:(float)width
 {
     DefaultLineWidth = width;
 }
 
-/*!
-    Fill rectangular path with current fill color.
-*/
-+ (void)fillRect:(CGRect)aRect
++ (void)fillRect:(CGRect)rect
 {
-    [[self bezierPathWithRect:aRect] fill];
+    [[[self class] bezierPathWithRect:rect] fill];
 }
 
-/*!
-    Using the current stroke color and default drawing attributes, strokes a counterclockwise path beginning at the rectangle's origin.
-*/
-+ (void)strokeRect:(CGRect)aRect
++ (void)strokeRect:(CGRect)rect
 {
-    [[self bezierPathWithRect:aRect] stroke];
+    [[[self class] bezierPathWithRect:rect] stroke];
 }
 
-/*!
-    Using the current stroke color and default drawing attributes, strokes a line between two points.
-*/
 + (void)strokeLineFromPoint:(CGPoint)point1 toPoint:(CGPoint)point2
 {
-    var path = [self bezierPath];
+    var path = [[self class] bezierPath];
 
     [path moveToPoint:point1];
     [path lineToPoint:point2];
@@ -127,9 +103,6 @@ var DefaultLineWidth = 1.0;
     [path stroke];
 }
 
-/*!
-    Create a new CPBezierPath object using the default line width.
-*/
 - (id)init
 {
     if (self = [super init])
@@ -141,41 +114,26 @@ var DefaultLineWidth = 1.0;
     return self;
 }
 
-/*!
-    Moves the current point to another location.
-*/
 - (void)moveToPoint:(CGPoint)point
 {
     CGPathMoveToPoint(_path, nil, point.x, point.y);
 }
 
-/*!
-    Append a straight line to the path.
-*/
 - (void)lineToPoint:(CGPoint)point
 {
     CGPathAddLineToPoint(_path, nil, point.x, point.y);
 }
 
-/*!
-    Add a cubic Bezier curve to the path.
-*/
 - (void)curveToPoint:(CGPoint)endPoint controlPoint1:(CGPoint)controlPoint1 controlPoint2:(CGPoint)controlPoint2
 {
     CGPathAddCurveToPoint(_path, nil, controlPoint1.x, controlPoint1.y, controlPoint2.x, controlPoint2.y, endPoint.x, endPoint.y);
 }
 
-/*!
-    Create a line segment between the first and last points in the subpath, closing it.
-*/
 - (void)closePath
 {
     CGPathCloseSubpath(_path);
 }
 
-/*!
-    Draw a line along the path with the current stroke color and default drawing attributes.
-*/
 - (void)stroke
 {
     var ctx = [[CPGraphicsContext currentContext] graphicsPort];
@@ -187,9 +145,6 @@ var DefaultLineWidth = 1.0;
     CGContextStrokePath(ctx);
 }
 
-/*!
-    Fill the path with the current fill color.
-*/
 - (void)fill
 {
     var ctx = [[CPGraphicsContext currentContext] graphicsPort];
@@ -201,88 +156,56 @@ var DefaultLineWidth = 1.0;
     CGContextFillPath(ctx);
 }
 
-/*!
-    Get the line width.
-*/
 - (float)lineWidth
 {
     return _lineWidth;
 }
 
-/*!
-    Set the line width.
-*/
 - (void)setLineWidth:(float)lineWidth
 {
     _lineWidth = lineWidth;
 }
 
-/*!
-    Get the total number of elements.
-*/
 - (unsigned)elementCount
 {
     return _path.count;
 }
 
-/*!
-    Check if receiver is empty, returns appropriate Boolean value.
-*/
 - (BOOL)isEmpty
 {
     return CGPathIsEmpty(_path);
 }
 
-/*!
-    Get the current point.
-*/
 - (CGPoint)currentPoint
 {
     return CGPathGetCurrentPoint(_path);
 }
 
-/*!
-    Append a series of line segments.
-*/
 - (void)appendBezierPathWithPoints:(CPArray)points count:(unsigned)count
 {
     CGPathAddLines(_path, nil, points, count);
 }
 
-/*!
-    Append a rectangular path.
-*/
 - (void)appendBezierPathWithRect:(CGRect)rect
 {
     CGPathAddRect(_path, nil, rect);
 }
 
-/*!
-    Append an oval path; oval is drawn within the rectangular path.
-*/
 - (void)appendBezierPathWithOvalInRect:(CGRect)rect
 {
     CGPathAddPath(_path, nil, CGPathWithEllipseInRect(rect));
 }
 
-/*!
-    Append a rounded rectangular path.
-*/
 - (void)appendBezierPathWithRoundedRect:(CGRect)rect xRadius:(float)xRadius yRadius:(float)yRadius
 {
     CGPathAddPath(_path, nil, CGPathWithRoundedRectangleInRect(rect, xRadius, yRadius, YES, YES, YES, YES));
 }
 
-/*!
-    Append the contents of a CPBezierPath object.
-*/
 - (void)appendBezierPath:(NSBezierPath *)other
 {
     CGPathAddPath(_path, nil, other._path);
 }
-/*!
-    Remove all path elements; clears path.
-*/
+
 - (void)removeAllPoints
 {
     _path = CGPathCreateMutable();

AppKit/CPBox.j

@@ -1,245 +0,0 @@
-/*
- * CPBox.j
- * AppKit
- *
- * Created by Ross Boucher.
- * 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"
-
-// CPBorderType
-CPNoBorder      = 0;
-CPLineBorder    = 1;    
-CPBezelBorder   = 2;
-CPGrooveBorder  = 3;
-
-@implementation CPBox : CPView
-{
-    CPBorderType    _borderType;
-    
-    CPColor         _borderColor;
-    CPColor         _fillColor;
-    
-    float           _cornerRadius;
-    float           _borderWidth;
-    
-    CPSize          _contentMargin;
-    CPView          _contentView;
-}
-
-+ (id)boxEnclosingView:(CPView)aView
-{
-    var box = [[self alloc] initWithFrame:CGRectMakeZero()],
-        enclosingView = [aView superview];
-
-    [box setFrameFromContentFrame:[aView frame]];
-
-    [enclosingView replaceSubview:aView with:box];
-    
-    [box setContentView:aView];
-    
-    return box;
-}
-
-- (id)initWithFrame:(CPRect)frameRect
-{
-    self = [super initWithFrame:frameRect];
-    
-    if (self)
-    {
-        _fillColor = [CPColor clearColor];
-        _borderColor = [CPColor blackColor];
-
-        _borderWidth = 1.0;
-        _contentMargin = CGSizeMake(0.0, 0.0);
-
-        _contentView = [[CPView alloc] initWithFrame:[self bounds]];
-
-        [self addSubview:_contentView];
-    }
-
-    return self;
-}
-
-// Configuring Boxes
-
-- (CPRect)borderRect
-{
-    return [self bounds];
-}
-
-- (CPBorderType)borderType
-{
-    return _borderType;
-}
-
-- (void)setBorderType:(CPBorderType)value
-{
-    _borderType = value;
-    [self setNeedsDisplay:YES];
-}
-
-- (CPColor)borderColor
-{
-    return _borderColor;
-}
-
-- (void)setBorderColor:(CPColor)color
-{
-    if ([color isEqual:_borderColor])
-        return;
-
-    _borderColor = color;
-    [self setNeedsDisplay:YES];
-}
-
-- (float)borderWidth
-{
-    return _borderWidth;
-}
-
-- (void)setBorderWidth:(float)width
-{
-    if (width === _borderWidth)
-        return;
-
-    _borderWidth = width;
-    [self setNeedsDisplay:YES];
-}
-
-- (float)cornerRadius
-{
-    return _cornerRadius;
-}
-
-- (void)setCornerRadius:(float)radius
-{
-    if (radius === _cornerRadius)
-        return;
-
-    _cornerRadius = radius;
-    [self setNeedsDisplay:YES];
-}
-
-- (CPColor)fillColor
-{
-    return _fillColor;
-}
-
-- (void)setFillColor:(CPColor)color
-{
-    if ([color isEqual:_fillColor])
-        return;
-
-    _fillColor = color;
-    [self setNeedsDisplay:YES];
-}
-
-- (CPView)contentView
-{
-    return _contentView;
-}
-
-- (void)setContentView:(CPView)aView
-{
-    if (aView === _contentView)
-        return;
-
-    [aView setFrame:CGRectInset([self bounds], _contentMargin.width + _borderWidth, _contentMargin.height + _borderWidth)];
-    [self replaceSubview:_contentView with:aView];
-    [aView setAutoresizingMask:CPViewWidthSizable|CPViewHeightSizable];
-    
-    _contentView = aView;    
-}
-
-- (CPSize)contentViewMargins
-{
-    return _contentMargin;
-}
-
-- (void)setContentViewMargins:(CPSize)size
-{
-     if(size.width < 0 || size.height < 0)
-         [CPException raise:CPGenericException reason:@"Margins must be positive"];
-         
-    _contentMargin = CGSizeMakeCopy(size);
-    [self setNeedsDisplay:YES];
-}
-
-- (void)setFrameFromContentFrame:(CPRect)aRect
-{
-    [self setFrame:CGRectInset(aRect, -(_contentMargin.width + _borderWidth), -(_contentMargin.height + _borderWidth))];
-    [self setNeedsDisplay:YES];
-}
-
-- (void)sizeToFit
-{
-    var contentFrame = [_contentView frame];
-    
-    [self setFrameSize:CGSizeMake(contentFrame.size.width + _contentMargin.width * 2, 
-                                  contentFrame.size.height + _contentMargin.height * 2)];
-    
-    [_contentView setFrameOrigin:CGPointMake(_contentMargin.width, _contentMargin.height)];
-}
-
-- (void)drawRect:(CPRect)rect
-{
-    var bounds = [self bounds],
-        aContext = [[CPGraphicsContext currentContext] graphicsPort],
-        border2 = _borderWidth/2,
-
-        strokeRect = CGRectMake(bounds.origin.x + border2, 
-                                bounds.origin.y + border2, 
-                                bounds.size.width - _borderWidth, 
-                                bounds.size.height - _borderWidth),
-                                
-        fillRect = CGRectMake(bounds.origin.x + border2, 
-                              bounds.origin.y + border2, 
-                              bounds.size.width - _borderWidth, 
-                              bounds.size.height - _borderWidth);
-
-    CGContextSetFillColor(aContext, [self fillColor]);
-    CGContextSetStrokeColor(aContext, [self borderColor]);
-    CGContextSetLineWidth(aContext, _borderWidth);
-
-    switch(_borderType)
-    {
-        case CPLineBorder:  CGContextFillRoundedRectangleInRect(aContext, fillRect, _cornerRadius, YES, YES, YES, YES);
-                            CGContextStrokeRoundedRectangleInRect(aContext, strokeRect, _cornerRadius, YES, YES, YES, YES);
-                            break;
-
-        case CPBezelBorder: CGContextFillRoundedRectangleInRect(aContext, fillRect, _cornerRadius, YES, YES, YES, YES);
-                            CGContextSetStrokeColor(aContext, [CPColor colorWithWhite:190.0/255.0 alpha:1.0]);
-                            CGContextBeginPath(aContext);
-                            CGContextMoveToPoint(aContext, strokeRect.origin.x, strokeRect.origin.y);
-                            CGContextAddLineToPoint(aContext, CGRectGetMinX(strokeRect), CGRectGetMaxY(strokeRect)),
-                            CGContextAddLineToPoint(aContext, CGRectGetMaxX(strokeRect), CGRectGetMaxY(strokeRect)),
-                            CGContextAddLineToPoint(aContext, CGRectGetMaxX(strokeRect), CGRectGetMinY(strokeRect)),
-                            CGContextStrokePath(aContext);
-                            CGContextSetStrokeColor(aContext, [CPColor colorWithWhite:142.0/255.0 alpha:1.0]);
-                            CGContextBeginPath(aContext);
-                            CGContextMoveToPoint(aContext, bounds.origin.x, strokeRect.origin.y);
-                            CGContextAddLineToPoint(aContext, CGRectGetMaxX(bounds), CGRectGetMinY(strokeRect));
-                            CGContextStrokePath(aContext);
-                            break;
-
-        default:            break;
-    }
-}
-
-@end

AppKit/CPBrowser.j

@@ -1,896 +0,0 @@
-/*
- * CPBrowser.j
- * AppKit
- *
- * Created by Ross Boucher.
- * Copyright 2010, 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 "CPImage.j"
-@import "CPTableView.j"
-@import "CPScrollView.j"
-
-/*! 
-    @ingroup appkit
-    @class CPBrowser    
-*/
-
-@implementation CPBrowser : CPControl
-{
-    id              _delegate;
-    CPString        _pathSeparator;
-
-    CPView          _contentView;
-    CPScrollView    _horizontalScrollView;
-    CPView          _prototypeView;
-
-    CPArray         _tableViews;
-    CPArray         _tableDelegates;
-
-    id              _rootItem;
-
-    BOOL            _delegateSupportsImages;
-
-    SEL             _doubleAction @accessors(property=doubleAction);
-
-    BOOL            _allowsMultipleSelection;
-    BOOL            _allowsEmptySelection;
-
-    Class           _tableViewClass @accessors(property=tableViewClass);
-
-    float           _rowHeight;
-    float           _imageWidth;
-    float           _leafWidth;
-    float           _minColumnWidth;
-    float           _defaultColumnWidth @accessors(property=defaultColumnWidth);
-
-    CPArray         _columnWidths;
-}
-
-+ (CPImage)branchImage
-{
-    return [[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:[self class]] 
-                                                    pathForResource:"browser-leaf.png"]
-                                              size:CGSizeMake(9,9)];
-}
-
-+ (CPImage)highlightedBranchImage
-{
-    return [[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:[self class]] 
-                                                    pathForResource:"browser-leaf-highlighted.png"]
-                                              size:CGSizeMake(9,9)];
-}
-
-- (id)initWithFrame:(CGRect)aFrame
-{
-    if (self = [super initWithFrame:aFrame])
-    {
-        _rowHeight = 23.0;
-        _defaultColumnWidth = 140.0;
-        _minColumnWidth = 80.0;
-        _imageWidth = 23.0;
-        _leafWidth = 13.0;
-        _columnWidths = [];
-
-        _pathSeparator = "/";
-        _tableViews = [];
-        _tableDelegates = [];
-        _allowsMultipleSelection = YES;
-        _allowsEmptySelection = YES;
-        _tableViewClass = [_CPBrowserTableView class];
-
-        _prototypeView = [[CPTextField alloc] initWithFrame:CGRectMakeZero()];
-        [_prototypeView setVerticalAlignment:CPCenterVerticalTextAlignment];
-        [_prototypeView setValue:[CPColor whiteColor] forThemeAttribute:"text-color" inState:CPThemeStateSelected];
-        [_prototypeView setLineBreakMode:CPLineBreakByTruncatingTail];
-
-        _horizontalScrollView = [[CPScrollView alloc] initWithFrame:[self bounds]];
-
-        [_horizontalScrollView setHasVerticalScroller:NO];
-        [_horizontalScrollView setAutohidesScrollers:YES];
-        [_horizontalScrollView setAutoresizingMask:CPViewWidthSizable|CPViewHeightSizable];
-        
-        _contentView = [[CPView alloc] initWithFrame:CGRectMake(0, 0, 0, CGRectGetHeight([self bounds]))];
-        [_contentView setAutoresizingMask:CPViewHeightSizable];
-        
-        [_horizontalScrollView setDocumentView:_contentView];
-
-        [self addSubview:_horizontalScrollView];
-    }
-
-    return self;
-}
-
-- (void)setPrototypeView:(CPView)aPrototypeView
-{
-    _prototypeView = [CPKeyedUnarchiver unarchiveObjectWithData:
-                        [CPKeyedArchiver archivedDataWithRootObject:aPrototypeView]];
-}
-
-- (CPView)prototypeView
-{
-    return [CPKeyedUnarchiver unarchiveObjectWithData:
-            [CPKeyedArchiver archivedDataWithRootObject:_prototypeView]];
-}
-
-- (void)setDelegate:(id)anObject
-{    
-    _delegate = anObject;
-    _delegateSupportsImages = [_delegate respondsToSelector:@selector(browser:imageValueForItem:)];
-
-    [self loadColumnZero];
-}
-
-- (id)delegate
-{
-    return _delegate;
-}
-
-- (CPTableView)tableViewInColumn:(unsigned)index
-{
-    return _tableViews[index];
-}
-
-- (unsigned)columnOfTableView:(CPTableView)aTableView
-{
-    return [_tableViews indexOfObject:aTableView];
-}
-
-- (void)loadColumnZero
-{
-    if ([_delegate respondsToSelector:@selector(rootItemForBrowser:)])
-        _rootItem = [_delegate rootItemForBrowser:self];
-    else
-        _rootItem = nil;
-
-    [self setLastColumn:-1];
-    [self addColumn];
-}
-
-- (void)setLastColumn:(int)columnIndex
-{
-    if (columnIndex >= _tableViews.length)
-        return;
-
-    var oldValue = _tableViews.length - 1;
-
-    // unloads all later columns.
-    var indexPlusOne = columnIndex + 1;
-
-    [[_tableViews.slice(indexPlusOne) valueForKey:"enclosingScrollView"] 
-      makeObjectsPerformSelector:@selector(removeFromSuperview)];
-
-    _tableViews = _tableViews.slice(0, indexPlusOne);
-    _tableDelegates = _tableDelegates.slice(0, indexPlusOne);
-
-    if ([_delegate respondsToSelector:@selector(browser:didChangeLastColumn:toColumn:)])
-        [_delegate browser:self didChangeLastColumn:oldValue toColumn:columnIndex];
-
-    [self tile];
-}
-
-- (int)lastColumn
-{
-    return _tableViews.length - 1;
-}
-
-- (void)addColumn
-{
-    var lastIndex = [self lastColumn],
-        lastColumn = _tableViews[lastIndex],
-        selectionIndexes = [lastColumn selectedRowIndexes];
-
-    if (lastIndex >= 0 && [selectionIndexes count] > 1)
-        [CPException raise:CPInvalidArgumentException 
-                    reason:"Can't add column, column "+lastIndex+" has invalid selection."];
-
-    var index = lastIndex+1,
-        item = index === 0 ? _rootItem : [_tableDelegates[lastIndex] childAtIndex:[selectionIndexes firstIndex]];
-
-    if (index > 0 && item && [self isLeafItem:item])
-        return;
-
-    var table = [[_tableViewClass alloc] initWithFrame:CGRectMakeZero() browser:self];
-
-    [table setHeaderView:nil];
-    [table setCornerView:nil];
-    [table setAllowsMultipleSelection:_allowsMultipleSelection];
-    [table setAllowsEmptySelection:_allowsEmptySelection];
-    [table registerForDraggedTypes:[self registeredDraggedTypes]];
-
-    [self setNextResponder:table];
-
-    [self _addTableColumnsToTableView:table forColumnIndex:index];
-
-    var delegate = [[_CPBrowserTableDelegate alloc] init];
-
-    [delegate _setDelegate:_delegate];
-    [delegate _setBrowser:self];
-    [delegate _setIndex:index];
-    [delegate _setItem:item];
-
-    _tableViews[index] = table;
-    _tableDelegates[index] = delegate;
-
-    [table setDelegate:delegate];
-    [table setDataSource:delegate];
-    [table setTarget:delegate];
-    [table setAction:@selector(_tableViewClicked:)];
-    [table setDoubleAction:@selector(_tableViewDoubleClicked:)];
-    [table setDraggingDestinationFeedbackStyle:CPTableViewDraggingDestinationFeedbackStyleRegular];
-    
-    var scrollView = [[_CPBrowserScrollView alloc] initWithFrame:CGRectMakeZero()];
-    [scrollView _setBrowser:self];
-    [scrollView setDocumentView:table];
-    [scrollView setHasHorizontalScroller:NO];
-    [scrollView setAutoresizingMask:CPViewHeightSizable];
-
-    [_contentView addSubview:scrollView];
-
-    [self tile];
-
-    [self scrollColumnToVisible:index];
-}
-
-- (void)_addTableColumnsToTableView:(CPTableView)aTableView forColumnIndex:(unsigned)index
-{
-    if (_delegateSupportsImages)
-    {
-        var column = [[CPTableColumn alloc] initWithIdentifier:@"Image"],
-            view = [[CPImageView alloc] initWithFrame:CGRectMakeZero()];
-
-        [view setImageScaling:CPScaleProportionally];
-
-        [column setDataView:view];
-        [column setResizingMask:CPTableColumnNoResizing];
-
-        [aTableView addTableColumn:column];
-    }
-
-    var column = [[CPTableColumn alloc] initWithIdentifier:@"Content"];
-
-    [column setDataView:_prototypeView];
-    [column setResizingMask:CPTableColumnNoResizing];
-
-    [aTableView addTableColumn:column];
-
-    var column = [[CPTableColumn alloc] initWithIdentifier:@"Leaf"],
-        view = [[_CPBrowserLeafView alloc] initWithFrame:CGRectMakeZero()];
-
-    [view setBranchImage:[[self class] branchImage]];
-    [view setHighlightedBranchImage:[[self class] highlightedBranchImage]];
-    
-    [column setDataView:view];
-    [column setResizingMask:CPTableColumnNoResizing];
-    
-    [aTableView addTableColumn:column];
-}
-
-- (void)reloadColumn:(int)column
-{
-    [[self tableViewInColumn:column] reloadData];
-}
-
-- (void)tile
-{
-    var xOrigin = 0,
-        scrollerWidth = [CPScroller scrollerWidth],
-        height = CGRectGetHeight([_contentView bounds]);
-
-    for (var i = 0, count = _tableViews.length; i < count; i++)
-    {
-        var tableView = _tableViews[i],
-            scrollView = [tableView enclosingScrollView],
-            width = [self widthOfColumn:i],
-            tableHeight = CGRectGetHeight([tableView bounds]);
-
-        [[tableView tableColumnWithIdentifier:"Image"] setWidth:_imageWidth];
-        [[tableView tableColumnWithIdentifier:"Content"] setWidth:width - (_leafWidth + _delegateSupportsImages ? _imageWidth : 0) - scrollerWidth - scrollerWidth];
-        [[tableView tableColumnWithIdentifier:"Leaf"] setWidth:_leafWidth];
-
-        [tableView setRowHeight:_rowHeight];
-        [tableView setFrameSize:CGSizeMake(width - scrollerWidth, tableHeight)];
-        [scrollView setFrameOrigin:CGPointMake(xOrigin, 0)];
-        [scrollView setFrameSize:CGSizeMake(width, height)];
-
-        xOrigin += width;
-    }
-
-    [_contentView setFrameSize:CGSizeMake(xOrigin, height)];
-}
-
-// ITEMS
-
-- (id)itemAtRow:(int)row inColumn:(int)column
-{
-    return [_tableDelegates[column] childAtIndex:row];
-}
-
-- (BOOL)isLeafItem:(id)item
-{
-    return [_delegate respondsToSelector:@selector(browser:isLeafItem:)] && [_delegate browser:self isLeafItem:item];
-}
-
-- (id)parentForItemsInColumn:(int)column
-{
-    return [_tableDelegates[column] _item];
-}
-
-- (CPSet)selectedItems
-{
-    var selectedColumn = [self selectedColumn],
-        selectedIndexes = [self selectedRowIndexesInColumn:selectedColumn],
-        set = [CPSet set],
-        index = [selectedIndexes firstIndex];
-
-    while (index !== CPNotFound)
-    {
-        [set addObject:[self itemAtRow:index inColumn:selectedColumn]];
-        index = [selectedIndexes indexGreaterThanIndex:index];
-    }
-
-    return set;
-}
-
-- (id)selectedItem
-{
-    var selectedColumn = [self selectedColumn],
-        selectedRow = [self selectedRowInColumn:selectedColumn];
-
-    return [self itemAtRow:selectedRow inColumn:selectedColumn];
-}
-
-// CLICK EVENTS
-
-- (void)_column:(unsigned)columnIndex clickedRow:(unsigned)rowIndex
-{
-    [self setLastColumn:columnIndex];
-
-    if (rowIndex >= 0)
-        [self addColumn];
-
-    [self doClick:self];
-}
-
-- (void)sendAction
-{
-    [self sendAction:_action to:_target];
-}
-
-- (void)doClick:(id)sender
-{
-    [self sendAction:_action to:_target];
-}
-
-- (void)doDoubleClick:(id)sender
-{
-    [self sendAction:_doubleAction to:_target];
-}
-
-// SIZING
-
-- (float)columnContentWidthForColumnWidth:(float)aWidth
-{
-    return aWidth - (_leafWidth + _delegateSupportsImages ? _imageWidth : 0) - [CPScroller scrollerWidth];
-}
-
-- (float)columnWidthForColumnContentWidth:(float)aWidth
-{
-    return aWidth + (_leafWidth + _delegateSupportsImages ? _imageWidth : 0) + [CPScroller scrollerWidth];
-}
-
-- (void)setImageWidth:(float)aWidth
-{
-    _imageWidth = aWidth;
-    [self tile];
-}
-
-- (float)imageWidth
-{
-    return _imageWidth;
-}
-
-- (void)setMinColumnWidth:(float)minWidth
-{
-    _minColumnWidth = minWidth;
-    [self tile];
-}
-
-- (float)minColumnWidth
-{
-    return _minColumnWidth;
-}
-
-- (void)setWidth:(float)aWidth ofColumn:(unsigned)column
-{
-    _columnWidths[column] = aWidth;
-
-    if ([_delegate respondsToSelector:@selector(browser:didResizeColumn:)])
-        [_delegate browser:self didResizeColumn:column];
-
-    [self tile];
-}
-
-- (float)widthOfColumn:(unsigned)column
-{
-    var width = _columnWidths[column];
-
-    if (width == null)
-        width = _defaultColumnWidth;
-
-    return MAX([CPScroller scrollerWidth], MAX(_minColumnWidth, width));
-}
-
-- (void)setRowHeight:(float)aHeight
-{
-    _rowHeight = aHeight;
-}
-
-- (float)rowHeight
-{
-    return _rowHeight;
-}
-
-// SCROLLERS
-
-- (void)scrollColumnToVisible:(unsigned)columnIndex
-{
-    [_contentView scrollRectToVisible:[[[self tableViewInColumn:columnIndex] enclosingScrollView] frame]];
-}
-
-– (void)scrollRowToVisible:(unsigned)rowIndex inColumn:(unsigned)columnIndex
-{
-    [self scrollColumnToVisible:columnIndex];
-    [[self tableViewInColumn:columnIndex] scrollRowToVisible:rowIndex];
-}
-
-- (BOOL)autohidesScroller
-{
-    return [_horizontalScrollView autohidesScrollers];
-}
-
-- (void)setAutohidesScroller:(BOOL)shouldHide
-{
-    [_horizontalScrollView setAutohidesScrollers:shouldHide];
-}
-
-// SELECTION
-
-- (unsigned)selectedRowInColumn:(unsigned)columnIndex
-{
-    if (columnIndex > [self lastColumn] || columnIndex < 0)
-        return -1;
-
-    return [_tableViews[columnIndex] selectedRow];
-}
-
-- (unsigned)selectedColumn
-{
-    var column = [self lastColumn],
-        row = [self selectedRowInColumn:column];
-
-    if (row >= 0)
-        return column;
-    else
-        return column - 1;
-}
-
-- (void)selectRow:(unsigned)row inColumn:(unsigned)column
-{
-    var selectedIndexes = row === -1 ? [CPIndexSet indexSet] : [CPIndexSet indexSetWithIndex:row];
-    [self selectRowIndexes:selectedIndexes inColumn:column];
-}
-
-- (BOOL)allowsMultipleSelection
-{
-    return _allowsMultipleSelection;
-}
-
-- (void)setAllowsMultipleSelection:(BOOL)shouldAllow
-{
-    if (_allowsMultipleSelection === shouldAllow)
-        return;
-
-    _allowsMultipleSelection = shouldAllow;
-    [_tableViews makeObjectsPerformSelector:@selector(setAllowsMultipleSelection:) withObject:shouldAllow];
-}
-
-- (BOOL)allowsEmptySelection
-{
-    return _allowsEmptySelection;
-}
-
-- (void)setAllowsEmptySelection:(BOOL)shouldAllow
-{
-    if (_allowsEmptySelection === shouldAllow)
-        return;
-
-    _allowsEmptySelection = shouldAllow;
-    [_tableViews makeObjectsPerformSelector:@selector(setAllowsEmptySelection:) withObject:shouldAllow];
-}
-
-- (CPIndexSet)selectedRowIndexesInColumn:(unsigned)column
-{
-    return [[self tableViewInColumn:column] selectedRowIndexes];
-}
-
-- (void)selectRowIndexes:(CPIndexSet)indexSet inColumn:(unsigned)column
-{
-    if (column < 0 || column > [self lastColumn] + 1)
-        return;
-
-    if ([_delegate respondsToSelector:@selector(browser:selectionIndexesForProposedSelection:inColumn:)])
-        indexSet = [_delegate browser:self selectionIndexesForProposedSelection:indexSet inColumn:column];
-
-    if ([_delegate respondsToSelector:@selector(browser:shouldSelectRowIndexes:inColumn:)] && 
-       ![_delegate browser:self shouldSelectRowIndexes:indexSet inColumn:column])
-        return;
-
-    if ([_delegate respondsToSelector:@selector(browserSelectionIsChanging:)])
-        [_delegate browserSelectionIsChanging:self];
-
-    if (column > [self lastColumn])
-        [self addColumn];
-
-    [self setLastColumn:column];
-
-    [[self tableViewInColumn:column] selectRowIndexes:indexSet byExtendingSelection:NO];
-
-    [self setNextResponder:[self tableViewInColumn:[self lastColumn]]];
-
-    [self scrollColumnToVisible:column];
-
-    if ([_delegate respondsToSelector:@selector(browserSelectionDidChange:)])
-        [_delegate browserSelectionDidChange:self];
-}
-
-- (void)setBackgroundColor:(CPColor)aColor
-{
-    [super setBackgroundColor:aColor];
-    [_contentView setBackgroundColor:aColor];
-}
-
-- (BOOL)acceptsFirstResponder
-{
-    return YES;
-}
-
-// DRAG AND DROP
-
-- (void)registerForDraggedTypes:(CPArray)types
-{
-    [super registerForDraggedTypes:types];
-    [_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 _CPBrowserResizeControl : CPView
-{
-    CGPoint     _mouseDownX;
-    CPBrowser   _browser;
-    unsigned    _index;
-    unsigned    _width;
-}
-
-- (void)mouseDown:(CPEvent)anEvent
-{
-    _mouseDownX = [anEvent locationInWindow].x;
-    _browser = [[self superview] _browser];
-    _index = [_browser columnOfTableView:[[self superview] documentView]];
-    _width = [_browser widthOfColumn:_index];
-}
-
-- (void)mouseDragged:(CPEvent)anEvent
-{
-    var deltaX = [anEvent locationInWindow].x - _mouseDownX;
-    [_browser setWidth:_width + deltaX ofColumn:_index];
-}
-
-@end
-
-var _CPBrowserResizeControlBackgroundImage = nil;
-
-@implementation _CPBrowserScrollView : CPScrollView
-{
-    _CPBrowserResizeControl  _resizeControl;
-    CPBrowser                _browser @accessors;
-}
-
-+ (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;
-}
-
-- (void)initWithFrame:(CGRect)aFrame
-{
-    if (self = [super initWithFrame:aFrame])
-    {
-        _resizeControl = [[_CPBrowserResizeControl alloc] initWithFrame:CGRectMakeZero()];
-        [_resizeControl setBackgroundColor:[CPColor colorWithPatternImage:[[self class] backgroundImage]]];
-        [self addSubview:_resizeControl];
-    }
-
-    return self;
-}
-
-- (void)reflectScrolledClipView:(CPClipView)aClipView
-{
-    [super reflectScrolledClipView:aClipView];
-
-    var frame = [_verticalScroller frame];
-    frame.size.height = CGRectGetHeight([self bounds]) - 14.0 - frame.origin.y;
-    [_verticalScroller setFrameSize:frame.size];
-
-    var resizeFrame = CGRectMake(CGRectGetMinX(frame), CGRectGetMaxY(frame), [CPScroller scrollerWidth], 14.0);
-    [_resizeControl setFrame:resizeFrame];
-}
-
-@end
-
-@implementation _CPBrowserTableView : CPTableView
-{
-    CPBrowser   _browser;
-}
-
-- (id)initWithFrame:(CGRect)aFrame browser:(CPBrowser)aBrowser
-{
-    if (self = [super initWithFrame:aFrame])
-        _browser = aBrowser;
-
-    return self;
-}
-
-- (BOOL)acceptsFirstResponder
-{
-    return NO;
-}
-
-- (void)mouseDown:(CPEvent)anEvent
-{
-    [super mouseDown:anEvent];
-    [[self window] makeFirstResponder:_browser];
-}
-
-- (CPView)browserView
-{
-    return _browser;
-}
-
-- (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:(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:(CPPoint)dragViewOffset
-{
-    var count = theTableColumns.length;
-    while (count--)
-    {
-        if ([theTableColumns[count] identifier] === "Leaf")
-            [theTableColumns removeObject:theTableColumns[count]];
-    }
-
-    return [_browser draggingViewForRowsWithIndexes:dragRows inColumn:[_browser columnOfTableView:self] withEvent:dragEvent offset:dragViewOffset] ||
-           [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
-
-@implementation _CPBrowserTableDelegate : CPObject
-{
-    CPBrowser   _browser @accessors;
-    unsigned    _index @accessors;
-    id          _delegate @accessors;
-    id          _item @accessors;
-}
-
-- (unsigned)numberOfRowsInTableView:(CPTableView)aTableView
-{
-    return [_delegate browser:_browser numberOfChildrenOfItem:_item];
-}
-
-- (void)tableView:(CPTableView)aTableView objectValueForTableColumn:(CPTableColumn)column row:(unsigned)row
-{
-    if ([column identifier] === "Image")
-        return [_delegate browser:_browser imageValueForItem:[self childAtIndex:row]];
-    else if ([column identifier] === "Leaf")
-        return ![_browser isLeafItem:[self childAtIndex:row]];
-    else
-        return [_delegate browser:_browser objectValueForItem:[self childAtIndex:row]];
-}
-
-- (void)_tableViewDoubleClicked:(CPTableView)aTableView
-{
-    [_browser doDoubleClick:self];
-}
-
-- (void)_tableViewClicked:(CPTableView)aTableView
-{
-    var selectedIndexes = [aTableView selectedRowIndexes];
-    [_browser _column:_index clickedRow:[selectedIndexes count] === 1 ? [selectedIndexes firstIndex] : -1];
-}
-
-- (id)childAtIndex:(unsigned)index
-{
-    return [_delegate browser:_browser child:index ofItem:_item];
-}
-
-- (BOOL)tableView:(CPTableView)aTableView acceptDrop:(id)info row:(int)row dropOperation:(CPTableViewDropOperation)operation
-{
-    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:(int)row proposedDropOperation:(CPTableViewDropOperation)operation
-{
-    if ([_delegate respondsToSelector:@selector(browser:validateDrop:proposedRow:column:dropOperation:)])
-        [_delegate browser:_browser validateDrop:info proposedRow:row column:_index dropOperation:operation];
-    else
-        return CPDragOperationNone;
-}
-
-- (BOOL)tableView:(CPTableView)aTableView writeRowsWithIndexes:(CPIndexSet)rowIndexes toPasteboard:(CPPasteboard)pboard
-{
-    if ([_delegate respondsToSelector:@selector(browser:writeRowsWithIndexes:inColumn:toPasteboard:)])
-        return [_delegate browser:_browser writeRowsWithIndexes:rowIndexes inColumn:_index toPasteboard:pboard];
-    else
-        return NO;
-}
-
-- (BOOL)respondsToSelector:(SEL)aSelector
-{
-    if (aSelector === @selector(browser:writeRowsWithIndexes:inColumn:toPasteboard:))
-        return [_delegate respondsToSelector:@selector(browser:writeRowsWithIndexes:inColumn:toPasteboard:)];
-    else
-        return [super respondsToSelector:aSelector];
-}
-
-@end
-
-@implementation _CPBrowserLeafView : CPView
-{
-    BOOL        _isLeaf @accessors(readonly, property=isLeaf);
-    CPImage     _branchImage @accessors(property=branchImage);
-    CPImage     _highlightedBranchImage @accessors(property=highlightedBranchImage);
-}
-
-- (BOOL)objectValue
-{
-    return _isLeaf;
-}
-
-- (void)setObjectValue:(id)aValue
-{
-    _isLeaf = !!aValue;
-    [self setNeedsLayout];
-}
-
-- (CGRect)rectForEphemeralSubviewNamed:(CPString)aName
-{
-    if (aName === "image-view")
-        return CGRectInset([self bounds], 1, 1);
-
-    return [super rectForEphemeralSubviewNamed:aName];
-}
-
-- (CPView)createEphemeralSubviewNamed:(CPString)aName
-{
-    if (aName === "image-view")
-        return [[CPImageView alloc] initWithFrame:CGRectMakeZero()];
-
-    return [super createEphemeralSubviewNamed:aName];
-}
-
-- (void)layoutSubviews
-{
-    var imageView = [self layoutEphemeralSubviewNamed:@"image-view"
-                                           positioned:CPWindowAbove
-                      relativeToEphemeralSubviewNamed:nil];
-
-    var isHighlighted = [self themeState] & CPThemeStateSelected;
-    [imageView setImage: _isLeaf ? (isHighlighted ? _highlightedBranchImage : _branchImage) : nil];
-    [imageView setImageScaling:CPScaleNone];
-}
-
-- (void)encodeWithCoder:(CPCoder)aCoder
-{
-    [super encodeWithCoder:aCoder];
-
-    [aCoder encodeBool:_isLeaf forKey:"_CPBrowserLeafViewIsLeafKey"];
-    [aCoder encodeObject:_branchImage forKey:"_CPBrowserLeafViewBranchImageKey"];
-    [aCoder encodeObject:_highlightedBranchImage forKey:"_CPBrowserLeafViewHighlightedBranchImageKey"];
-}
-
-- (void)initWithCoder:(CPCoder)aCoder
-{
-    if (self = [super initWithCoder:aCoder])
-    {
-        _isLeaf = [aCoder decodeBoolForKey:"_CPBrowserLeafViewIsLeafKey"];
-        _branchImage = [aCoder decodeObjectForKey:"_CPBrowserLeafViewBranchImageKey"];
-        _highlightedBranchImage = [aCoder decodeObjectForKey:"_CPBrowserLeafViewHighlightedBranchImageKey"];
-    }
-
-    return self;
-}
-
-@end

AppKit/CPButton.j

@@ -24,11 +24,32 @@
 @import "CGGeometry.j"
 
 @import "CPControl.j"
-@import "CPStringDrawing.j"
 
 #include "CoreGraphics/CGGeometry.h"
 
 
+CPScaleProportionally   = 0;
+CPScaleToFit            = 1;
+CPScaleNone             = 2;
+
+
+/* @group CPCellImagePosition */
+
+CPNoImage       = 0;
+CPImageOnly     = 1;
+CPImageLeft     = 2;
+CPImageRight    = 3;
+CPImageBelow    = 4;
+CPImageAbove    = 5;
+CPImageOverlaps = 6;
+
+
+/*  @group CPButtonState */
+
+CPOnState                       = 1;
+CPOffState                      = 0;
+CPMixedState                    = -1;
+
 /* @group CPBezelStyle */
 
 CPRoundedBezelStyle             = 1;
@@ -124,7 +145,7 @@ CPButtonStateMixed  = CPThemeState("mixed");
 
 + (id)themeAttributes
 {
-    return [CPDictionary dictionaryWithObjects:[_CGInsetMakeZero(), _CGInsetMakeZero(), [CPNull null]]
+    return [CPDictionary dictionaryWithObjects:[_CGInsetMakeZero(), _CGInsetMakeZero(), nil]
                                        forKeys:[@"bezel-inset", @"content-inset", @"bezel-color"]];
 }
 
@@ -151,7 +172,7 @@ CPButtonStateMixed  = CPThemeState("mixed");
 
 // Setting the state
 /*!
-    Returns \c YES if the button has a 'mixed' state in addition to on and off.
+    Returns <code>YES</code> if the button has a 'mixed' state in addition to on and off.
 */
 - (BOOL)allowsMixedState
 {
@@ -171,8 +192,8 @@ CPButtonStateMixed  = CPThemeState("mixed");
 
     _allowsMixedState = aFlag;
 
-    if (!_allowsMixedState && [self state] === CPMixedState)
-        [self setState:CPOnState];
+    if (!_allowsMixedState)
+        [self unsetThemeState:CPButtonStateMixed];
 }
 
 - (void)setObjectValue:(id)anObjectValue
@@ -227,9 +248,9 @@ CPButtonStateMixed  = CPThemeState("mixed");
 }
 
 /*!
-    Sets the button's state to \c aState.
+    Sets the button's state to <code>aState</code>.
     @param aState Possible states are any of the CPButton globals:
-    \c CPOffState, \c CPOnState, \c CPMixedState
+    <code>CPOffState, CPOnState, CPMixedState</code>
 */
 - (void)setState:(CPInteger)aState
 {
@@ -439,7 +460,7 @@ CPButtonStateMixed  = CPThemeState("mixed");
     return bounds;
 }
 
-- (CGRect)bezelRectForBounds:(CGRect)bounds
+- (CGRect)bezelRectForBounds:(CFRect)bounds
 {
     if (![self isBordered])
         return _CGRectMakeZero();
@@ -502,6 +523,8 @@ CPButtonStateMixed  = CPThemeState("mixed");
     }
     else
         return [[_CPImageAndTextView alloc] initWithFrame:_CGRectMakeZero()];
+
+    return [super createEphemeralSubviewNamed:aName];
 }
 
 - (void)layoutSubviews
@@ -509,8 +532,9 @@ CPButtonStateMixed  = CPThemeState("mixed");
     var bezelView = [self layoutEphemeralSubviewNamed:@"bezel-view"
                                            positioned:CPWindowBelow
                       relativeToEphemeralSubviewNamed:@"content-view"];
-
-    [bezelView setBackgroundColor:[self currentValueForThemeAttribute:@"bezel-color"]];
+      
+    if (bezelView)
+        [bezelView setBackgroundColor:[self currentValueForThemeAttribute:@"bezel-color"]];
 
     var contentView = [self layoutEphemeralSubviewNamed:@"content-view"
                                              positioned:CPWindowAbove
@@ -578,7 +602,7 @@ var CPButtonImageKey                = @"CPButtonImageKey",
 @implementation CPButton (CPCoding)
 
 /*!
-    Initializes the button by unarchiving data from \c aCoder.
+    Initializes the button by unarchiving data from <code>aCoder</code>.
     @param aCoder the coder containing the archived CPButton.
 */
 - (id)initWithCoder:(CPCoder)aCoder

AppKit/CPButtonBar.j

@@ -4,33 +4,8 @@
 #include "CoreGraphics/CGGeometry.h"
 
 
-@implementation CPButtonBar : CPView
+@implementation CPButtonBar : CPControl
 {
-    BOOL    _hasResizeControl;
-    BOOL    _resizeControlIsLeftAligned;
-    CPArray _buttons;
-}
-
-+ (id)plusButton
-{
-    var button = [[CPButton alloc] initWithFrame:CGRectMake(0, 0, 35, 25)],
-        image = [[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:self] pathForResource:@"plus_button.png"] size:CGSizeMake(11, 12)];
-
-    [button setImage:image];
-    [button setImagePosition:CPImageOnly];
-
-    return button;
-}
-
-+ (id)minusButton
-{
-    var button = [[CPButton alloc] initWithFrame:CGRectMake(0, 0, 35, 25)],
-        image = [[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:self] pathForResource:@"minus_button.png"] size:CGSizeMake(11, 4)];
-
-    [button setImage:image];
-    [button setImagePosition:CPImageOnly];
-
-    return button;
 }
 
 + (CPString)themeClass
@@ -40,210 +15,47 @@
 
 + (id)themeAttributes
 {
-    return [CPDictionary dictionaryWithObjects:[CGInsetMake(0.0, 0.0, 0.0, 0.0), CGSizeMakeZero(), [CPNull null], [CPNull null], [CPNull null]]
-                                       forKeys:[@"resize-control-inset", @"resize-control-size", @"resize-control-color", @"bezel-color", @"button-bezel-color"]];
-}
-
-- (id)initWithFrame:(CGRect)aFrame
-{
-    self = [super initWithFrame:aFrame];
-
-    if (self)
-    {
-        _buttons = [];
-        [self setNeedsLayout];
-    }
-
-    return self;
-}
-
-- (void)awakeFromCib
-{
-    var view = [self superview],
-        subview = self;
-
-    while (view)
-    {
-        if ([view isKindOfClass:[CPSplitView class]])
-        {
-            var viewIndex = [[view subviews] indexOfObject:subview];
-            [view setButtonBar:self forDividerAtIndex:viewIndex];
-
-            break;
-        }
-
-        subview = view;
-        view = [view superview];
-    }
-}
-
-- (void)setButtons:(CPArray)buttons
-{
-    _buttons = [CPArray arrayWithArray:buttons];
-
-    for (var i = 0, count = [_buttons count]; i < count; i++)
-    {
-        var button = _buttons[i];
-
-        var normalColor = [self valueForThemeAttribute:@"button-bezel-color" inState:CPThemeStateNormal],
-            highlightedColor = [self valueForThemeAttribute:@"button-bezel-color" inState:CPThemeStateHighlighted],
-            disabledColor = [self valueForThemeAttribute:@"button-bezel-color" inState:CPThemeStateDisabled];
-
-        [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];    
-
-        // FIXME shouldn't need this
-        [button setValue:normalColor forThemeAttribute:@"bezel-color" inState:CPThemeStateNormal|CPThemeStateBordered|CPPopUpButtonStatePullsDown];    
-        [button setValue:highlightedColor forThemeAttribute:@"bezel-color" inState:CPThemeStateHighlighted|CPThemeStateBordered|CPPopUpButtonStatePullsDown];    
-        [button setValue:disabledColor forThemeAttribute:@"bezel-color" inState:CPThemeStateDisabled|CPThemeStateBordered|CPPopUpButtonStatePullsDown];    
-
-        [button setBordered:YES];
-    }
-    
-    [self setNeedsLayout];
-}
-
-- (CPArray)buttons
-{
-    return [CPArray arrayWithArray:_buttons];
-}
-
-- (void)setHasResizeControl:(BOOL)shouldHaveResizeControl
-{
-    if (_hasResizeControl === shouldHaveResizeControl)
-        return;
-
-    _hasResizeControl = !!shouldHaveResizeControl;
-    [self setNeedsLayout];
-}
-
-- (BOOL)hasResizeControl
-{
-    return _hasResizeControl;
-}
-
-- (void)setResizeControlIsLeftAligned:(BOOL)shouldBeLeftAligned
-{
-    if (_resizeControlIsLeftAligned === shouldBeLeftAligned)
-        return;
-
-    _resizeControlIsLeftAligned = !!shouldBeLeftAligned;
-    [self setNeedsLayout];
-}
-
-- (BOOL)resizeControlIsLeftAligned
-{
-    return _resizeControlIsLeftAligned;
-}
-
-- (CGRect)resizeControlFrame
-{
-    var inset = [self currentValueForThemeAttribute:@"resize-control-inset"],
-        size = [self currentValueForThemeAttribute:@"resize-control-size"],
-        currentSize = [self bounds],
-        leftOrigin = _resizeControlIsLeftAligned ? 0 : currentSize.size.width - size.width - inset.right - inset.left;
-
-    return CGRectMake(leftOrigin, 0, size.width + inset.left + inset.right, size.height + inset.top + inset.bottom);
+    return [CPDictionary dictionaryWithObjects:[nil]
+                                       forKeys:[@"bezel-color"]];
 }
 
 - (CGRect)rectForEphemeralSubviewNamed:(CPString)aName
 {
-    if (aName === "resize-control-view")
-    {
-        var inset = [self currentValueForThemeAttribute:@"resize-control-inset"],
-            size = [self currentValueForThemeAttribute:@"resize-control-size"],
-            currentSize = [self bounds];
-
-        if (_resizeControlIsLeftAligned)
-            return CGRectMake(inset.left, inset.top, size.width, size.height);
-        else
-            return CGRectMake(currentSize.size.width - size.width - inset.right, inset.top, size.width, size.height);
-    }
-
+    if (aName === "bezel-view")
+        return [self bounds];
+    
     return [super rectForEphemeralSubviewNamed:aName];
 }
 
 - (CPView)createEphemeralSubviewNamed:(CPString)aName
 {
-    if (aName === "resize-control-view")
-        return [[CPView alloc] initWithFrame:CGRectMakeZero()];
+    if (aName === "bezel-view")
+    {
+        var view = [[CPView alloc] initWithFrame:_CGRectMakeZero()];
 
+        [view setHitTests:NO];
+        
+        return view;
+    }
+    
     return [super createEphemeralSubviewNamed:aName];
 }
 
 - (void)layoutSubviews
 {
-    [self setBackgroundColor:[self currentValueForThemeAttribute:@"bezel-color"]];
+    var bezelView = [self layoutEphemeralSubviewNamed:@"bezel-view"
+                                           positioned:CPWindowBelow
+                      relativeToEphemeralSubviewNamed:@""];
+      
+    if (bezelView)
+        [bezelView setBackgroundColor:[self currentValueForThemeAttribute:@"bezel-color"]];
+}
 
-    var buttonsNotHidden = [CPArray arrayWithArray:_buttons],
-        count = [buttonsNotHidden count];
+- (void)addSubview:(CPView)aSubview
+{
+    [super addSubview:aSubview];
 
-    while (count--)
-        if ([buttonsNotHidden[count] isHidden])
-            [buttonsNotHidden removeObject:buttonsNotHidden[count]];
-
-    var currentButtonOffset = _resizeControlIsLeftAligned ? CGRectGetMaxX([self bounds]) + 1 : -1,
-        height = CGRectGetHeight([self bounds]) - 1;
-
-    for (var i = 0, count = [buttonsNotHidden count]; i < count; i++)
-    {   
-        var button = buttonsNotHidden[i],
-            width = CGRectGetWidth([button frame]);
-
-        if (_resizeControlIsLeftAligned)
-        {
-            [button setFrame:CGRectMake(currentButtonOffset - width, 1, width, height)];
-            currentButtonOffset -= width - 1;
-        }
-        else
-        {
-            [button setFrame:CGRectMake(currentButtonOffset, 1, width, height)];
-            currentButtonOffset += width - 1;
-        }
-
-        [self addSubview:button];
-    }
-
-    if (_hasResizeControl)
-    {
-        var resizeControlView = [self layoutEphemeralSubviewNamed:@"resize-control-view"
-                                                       positioned:CPWindowAbove
-                                  relativeToEphemeralSubviewNamed:nil];
-
-        [resizeControlView setAutoresizingMask: _resizeControlIsLeftAligned ? CPViewMaxXMargin : CPViewMinXMargin];
-        [resizeControlView setBackgroundColor:[self currentValueForThemeAttribute:@"resize-control-color"]];
-    }
+    [aSubview setAutoresizingMask:CPViewMinXMargin];
 }
 
 @end
-
-var CPButtonBarHasResizeControlKey = @"CPButtonBarHasResizeControlKey",
-    CPButtonBarResizeControlIsLeftAlignedKey = @"CPButtonBarResizeControlIsLeftAlignedKey",
-    CPButtonBarButtonsKey = @"CPButtonBarButtonsKey";
-
-@implementation CPButtonBar (CPCoding)
-
-- (void)encodeWithCoder:(CPCoder)aCoder
-{
-    [super encodeWithCoder:aCoder];
-
-    [aCoder encodeBool:_hasResizeControl forKey:CPButtonBarHasResizeControlKey];
-    [aCoder encodeBool:_resizeControlIsLeftAligned forKey:CPButtonBarResizeControlIsLeftAlignedKey];
-    [aCoder encodeObject:_buttons forKey:CPButtonBarButtonsKey];
-}
-
-- (id)initWithCoder:(CPCoder)aCoder
-{
-    if (self = [super initWithCoder:aCoder])
-    {
-        _buttons = [aCoder decodeObjectForKey:CPButtonBarButtonsKey] || [];
-        _hasResizeControl = [aCoder decodeBoolForKey:CPButtonBarHasResizeControlKey];
-        _resizeControlIsLeftAligned = [aCoder decodeBoolForKey:CPButtonBarResizeControlIsLeftAlignedKey];
-    }
-
-    return self;
-}
-
-@end
-

AppKit/CPClipView.j

@@ -38,8 +38,8 @@
 }
 
 /*!
-    Sets the document view to be \c aView.
-    @param aView the new document view. It's frame origin will be changed to \c (0,0) after calling this method.
+    Sets the document view to be <code>aView</code>.
+    @param aView the new document view. It's frame origin will be changed to <code>(0,0)</code> after calling this method.
 */
 - (void)setDocumentView:(CPView)aView
 {
@@ -95,7 +95,7 @@
 }
 
 /*!
-    Returns a new point that may be adjusted from \c aPoint
+    Returns a new point that may be adjusted from <code>aPoint</code>
     to make sure it lies within the document view.
     @param aPoint
     @return the adjusted point
@@ -120,19 +120,15 @@
         
     [super setBoundsOrigin:aPoint];
 
-    var superview = [self superview],
-
-        // This is hack to avoid having to import CPScrollView.
-        // FIXME: Should CPScrollView be finding out about this on its own somehow?
-        scrollViewClass = objj_getClass("CPScrollView");
-
-    if([superview isKindOfClass:scrollViewClass])
+    var superview = [self superview];
+    
+    if([superview isKindOfClass:[CPScrollView class]])
         [superview reflectScrolledClipView:self];
 }
 
 /*!
     Scrolls the clip view to the specified point. The method
-    sets its bounds origin to \c aPoint.
+    sets its bounds origin to <code>aPoint</code>.
 */
 - (void)scrollToPoint:(CGPoint)aPoint
 {
@@ -177,13 +173,9 @@
         return;
 
     // ... and we're in a scroll view of course.
-    var superview = [self superview],
-
-        // This is hack to avoid having to import CPScrollView.
-        // FIXME: Should CPScrollView be finding out about this on its own somehow?
-        scrollViewClass = objj_getClass("CPScrollView");
-
-    if ([superview isKindOfClass:scrollViewClass])
+    var superview = [self superview];
+        
+    if ([superview isKindOfClass:[CPScrollView class]])
         [superview reflectScrolledClipView:self];
 }
 

AppKit/CPCollectionView.j

@@ -26,8 +26,7 @@
 @import <Foundation/CPKeyedArchiver.j>
 @import <Foundation/CPKeyedUnarchiver.j>
 
-@import "CPView.j"
-@import "CPCollectionViewItem.j"
+@import <AppKit/CPView.j>
 
 
 /*! 
@@ -62,7 +61,6 @@
     @param indices the indices to obtain drag types
     @return an array of drag types (CPString)
 */
-
 @implementation CPCollectionView : CPView
 {
     CPArray                 _content;
@@ -78,9 +76,7 @@
     
     CGSize                  _minItemSize;
     CGSize                  _maxItemSize;
-
-    CPArray                 _backgroundColors;
-
+    
     float                   _tileWidth;
     
     BOOL                    _isSelectable;
@@ -97,8 +93,6 @@
     unsigned                _numberOfColumns;
     
     id                      _delegate;
-
-    CPEvent                 _mouseDownEvent;
 }
 
 - (id)initWithFrame:(CGRect)aFrame
@@ -115,9 +109,7 @@
         _itemSize = CGSizeMakeZero();
         _minItemSize = CGSizeMakeZero();
         _maxItemSize = CGSizeMakeZero();
-
-        [self setBackgroundColors:nil];
-
+        
         _verticalMargin = 5.0;
         _tileWidth = -1.0;
         
@@ -130,16 +122,15 @@
 }
 
 /*!
-    Sets the item prototype to \c anItem
+    Sets the item prototype to <code>anItem</code>
     @param anItem the new item prototype
 */
 - (void)setItemPrototype:(CPCollectionViewItem)anItem
 {
-    _cachedItems = [];
-    _itemData = nil;
-    _itemForDragging = nil;
+    _itemData = [CPKeyedArchiver archivedDataWithRootObject:anItem];
+    _itemForDragging = anItem//[CPKeyedUnarchiver unarchiveObjectWithData:_itemData];
     _itemPrototype = anItem;
-
+    
     [self reloadContent];
 }
 
@@ -152,24 +143,17 @@
 }
 
 /*!
-    Returns a collection view item for \c anObject.
+    Returns a collection view item for <code>anObject</code>.
     @param anObject the object to be represented.
 */
 - (CPCollectionViewItem)newItemForRepresentedObject:(id)anObject
 {
     var item = nil;
-
+    
     if (_cachedItems.length)
         item = _cachedItems.pop();
-
     else
-    {
-        if (!_itemData)
-            if (_itemPrototype)
-                _itemData = [CPKeyedArchiver archivedDataWithRootObject:_itemPrototype];
-
         item = [CPKeyedUnarchiver unarchiveObjectWithData:_itemData];
-    }
 
     [item setRepresentedObject:anObject];
     [[item view] setFrameSize:_itemSize];
@@ -179,7 +163,7 @@
 
 // Working with the Responder Chain
 /*!
-    Returns \c YES by default.
+    Returns <code>YES</code> by default.
 */
 - (BOOL)acceptsFirstResponder
 {
@@ -191,13 +175,13 @@
 */
 - (BOOL)isFirstResponder
 {
-    return [[self window] firstResponder] === self;
+    return [[self window] firstResponder] == self;
 }
 
 // Setting the Content
 /*!
-    Sets the content of the collection view to the content in \c anArray. 
-    This array can be of any type, and each element will be passed to the \c -setRepresentedObject: method.  
+    Sets the content of the collection view to the content in <code>anArray</code>. 
+    This array can be of any type, and each element will be passed to the <code>setRepresentedObject:</code> method.  
     It's the responsibility of your custom collection view item to interpret the object.
     @param anArray the content array
 */
@@ -230,7 +214,7 @@
 // Setting the Selection Mode
 /*!
     Sets whether the user is allowed to select items
-    @param isSelectable \c YES allows the user to select items.
+    @param isSelectable <code>YES</code> allows the user to select items.
 */
 - (void)setSelectable:(BOOL)isSelectable
 {
@@ -249,17 +233,17 @@
 }
 
 /*!
-    Returns \c YES if the collection view is
-    selectable, and \c NO otherwise.
+    Returns <code>YES</code> if the collection view is
+    selected, and <code>NO</code> otherwise.
 */
-- (BOOL)isSelectable
+- (BOOL)isSelected
 {
-    return _isSelectable;
+    return _isSelected;
 }
 
 /*!
     Sets whether the user may have no items selected. If YES, mouse clicks not on any item will empty the current selection. The first item will also start off as selected.
-    @param shouldAllowMultipleSelection \c YES allows the user to select multiple items
+    @param shouldAllowMultipleSelection <code>YES</code> allows the user to select multiple items
 */
 - (void)setAllowsEmptySelection:(BOOL)shouldAllowEmptySelection
 {
@@ -267,7 +251,7 @@
 }
 
 /*!
-    Returns \c YES if the user can select no items, \c NO otherwise.
+    Returns <code>YES</code> if the user can select no items, <code>NO</code> otherwise.
 */
 - (BOOL)allowsEmptySelection
 {
@@ -276,7 +260,7 @@
 
 /*!
     Sets whether the user can select multiple items.
-    @param shouldAllowMultipleSelection \c YES allows the user to select multiple items
+    @param shouldAllowMultipleSelection <code>YES</code> allows the user to select multiple items
 */
 - (void)setAllowsMultipleSelection:(BOOL)shouldAllowMultipleSelection
 {
@@ -284,7 +268,7 @@
 }
 
 /*!
-    Returns \c YES if the user can select multiple items, \c NO otherwise.
+    Returns <code>YES</code> if the user can select multiple items, <code>NO</code> otherwise.
 */
 - (BOOL)allowsMultipleSelection
 {
@@ -321,7 +305,7 @@
 */
 - (CPIndexSet)selectionIndexes
 {
-    return [_selectionIndexes copy];
+    return _selectionIndexes;
 }
 
 /* @ignore */
@@ -333,31 +317,25 @@
     while (count--)
     {
         [[_items[count] view] removeFromSuperview];
-        [_items[count] setSelected:NO];
-
         _cachedItems.push(_items[count]);
     }
     
     _items = [];
 
-    if (!_itemPrototype || !_content)
+    if (!_itemData || !_content)
         return;
-
+    
     var index = 0;
-
+    
     count = _content.length;
-
+        
     for (; index < count; ++index)
     {
         _items.push([self newItemForRepresentedObject:_content[index]]);
     
         [self addSubview:[_items[index] view]];
     }
-
-    index = CPNotFound;
-    while ((index = [_selectionIndexes indexGreaterThanIndex:index]) != CPNotFound)
-        [_items[index] setSelected:YES];
-
+    
     [self tile];
 }
 
@@ -542,30 +520,6 @@
     return _maxItemSize;
 }
 
-- (void)setBackgroundColors:(CPArray)backgroundColors
-{
-    if (_backgroundColors === backgroundColors)
-        return;
-
-    _backgroundColors = backgroundColors;
-
-    if (!_backgroundColors)
-        _backgroundColors = [CPColor whiteColor];
-
-    if ([_backgroundColors count] === 1)
-        [self setBackgroundColor:_backgroundColors[0]];
-
-    else
-        [self setBackgroundColor:nil];
-
-    [self setNeedsDisplay:YES];
-}
-
-- (CPArray)backgroundColors
-{
-    return _backgroundColors;
-}
-
 - (void)mouseUp:(CPEvent)anEvent
 {
     if ([_selectionIndexes count] && [anEvent clickCount] == 2 && [_delegate respondsToSelector:@selector(collectionView:didDoubleClickOnItemAtIndex:)])
@@ -574,16 +528,13 @@
 
 - (void)mouseDown:(CPEvent)anEvent
 {
-    _mouseDownEvent = anEvent;
-
     var location = [self convertPoint:[anEvent locationInWindow] fromView:nil],
         row = FLOOR(location.y / (_itemSize.height + _verticalMargin)),
         column = FLOOR(location.x / (_itemSize.width + _horizontalMargin)),
         index = row * _numberOfColumns + column;
-
+        
     if (index >= 0 && index < _items.length)
         [self setSelectionIndexes:[CPIndexSet indexSetWithIndex:index]];
-
     else if (_allowsEmptySelection)
         [self setSelectionIndexes:[CPIndexSet indexSet]];
 }
@@ -592,36 +543,30 @@
 {
     if (![_delegate respondsToSelector:@selector(collectionView:dragTypesForItemsAtIndexes:)])
         return;
-
+        
     // If we don't have any selected items, we've clicked away, and thus the drag is meaningless.
     if (![_selectionIndexes count])
         return;
-
-    if ([_delegate respondsToSelector:@selector(collectionView:canDragItemsAtIndexes:withEvent:)] &&
-        ![_delegate collectionView:self canDragItemsAtIndexes:_selectionIndexes withEvent:_mouseDownEvent])
-        return;
-
+        
     // Set up the pasteboard
     var dragTypes = [_delegate collectionView:self dragTypesForItemsAtIndexes:_selectionIndexes];
-
+    
     [[CPPasteboard pasteboardWithName:CPDragPboard] declareTypes:dragTypes owner:self];
-
+    
     var point = [self convertPoint:[anEvent locationInWindow] fromView:nil];
 
-    if (!_itemForDragging)
-        _itemForDragging = [self newItemForRepresentedObject:_content[[_selectionIndexes firstIndex]]];
-    else
-        [_itemForDragging setRepresentedObject:_content[[_selectionIndexes firstIndex]]];
-
-    var view = [_itemForDragging view];
+    [_itemForDragging setRepresentedObject:_content[[_selectionIndexes firstIndex]]];
 
+    var view = [_itemForDragging view],
+        frame = [view frame];
+    
     [view setFrameSize:_itemSize];
     [view setAlphaValue:0.7];
-
+    
     [self dragView:view
         at:[[_items[[_selectionIndexes firstIndex]] view] frame].origin
-        offset:CGSizeMakeZero()
-        event:_mouseDownEvent
+        offset:CGPointMakeZero()
+        event:anEvent
         pasteboard:nil
         source:self
         slideBack:YES];
@@ -680,131 +625,100 @@
     return _delegate;
 }
 
-- (CPCollectionViewItem)itemAtIndex:(unsigned)anIndex
-{
-    return [_items objectAtIndex:anIndex];
-}
-
-- (CGRect)frameForItemAtIndex:(unsigned)anIndex
-{
-    return [[[self itemAtIndex:anIndex] view] frame];
-}
-
-- (CGRect)frameForItemsAtIndexes:(CPIndexSet)anIndexSet
-{
-    var indexArray = [],
-        frame = CGRectNull;
-
-    [anIndexSet getIndexes:indexArray maxCount:-1 inIndexRange:nil];
-
-    var index = 0,
-        count = [indexArray count];
-
-    for (; index < count; ++index)
-        frame = CGRectUnion(frame, [self rectForItemAtIndex:indexArray[index]]);
-
-    return frame;
-}
-
 @end
 
-@implementation CPCollectionView (KeyboardInteraction)
-
-- (void)_scrollToSelection
+/*!
+    Represents an object inside a CPCollectionView.
+*/
+@implementation CPCollectionViewItem : CPObject
 {
-    var frame = [self frameForItemsAtIndexes:[self selectionIndexes]];
-
-    if (!CGRectIsNull(frame))
-        [self scrollRectToVisible:frame];
+    id      _representedObject;
+    
+    CPView  _view;
+    
+    BOOL    _isSelected;
 }
 
-- (void)moveLeft:(id)sender
+// Setting the Represented Object
+/*!
+    Sets the object to be represented by this item.
+    @param anObject the object to be represented
+*/
+- (void)setRepresentedObject:(id)anObject
 {
-    var index = [[self selectionIndexes] firstIndex];
-    if (index === CPNotFound) 
-        index = [[self items] count];
-
-    index = MAX(index - 1, 0);
-
-    [self setSelectionIndexes:[CPIndexSet indexSetWithIndex:index]];
-    [self _scrollToSelection];
+    if (_representedObject == anObject)
+        return;
+    
+    _representedObject = anObject;
+    
+    // FIXME: This should be set up by bindings
+    [_view setRepresentedObject:anObject];
 }
 
-- (void)moveRight:(id)sender
+/*!
+    Returns the object represented by this view item
+*/
+- (id)representedObject
 {
-    var index = MIN([[self selectionIndexes] firstIndex] + 1, [[self items] count]-1);
-
-    [self setSelectionIndexes:[CPIndexSet indexSetWithIndex:index]];
-    [self _scrollToSelection];
+    return _representedObject;
 }
 
-- (void)moveDown:(id)sender
+// Modifying the View
+/*!
+    Sets the view that is used represent this object.
+    @param aView the view used to represent this object
+*/
+- (void)setView:(CPView)aView
 {
-    var index = MIN([[self selectionIndexes] firstIndex] + [self numberOfColumns], [[self items] count]-1);
-
-    [self setSelectionIndexes:[CPIndexSet indexSetWithIndex:index]];
-    [self _scrollToSelection];
+    _view = aView;
 }
 
-- (void)moveUp:(id)sender
+/*!
+    Returns the view that represents this object.
+*/
+- (CPView)view
 {
-    var index = [[self selectionIndexes] firstIndex];
-    if (index == CPNotFound) 
-        index = [[self items] count];
-
-    index = MAX(0, index - [self numberOfColumns]);
-
-    [self setSelectionIndexes:[CPIndexSet indexSetWithIndex:index]];
-    [self _scrollToSelection];
+    return _view;
 }
 
-- (void)deleteBackward:(id)sender
+// Modifying the Selection
+/*!
+    Sets whether this view item should be selected.
+    @param shouldBeSelected <code>YES</code> makes the item selected. <code>NO</code> deselects it.
+*/
+- (void)setSelected:(BOOL)shouldBeSelected
 {
-    if ([[self delegate] respondsToSelector:@selector(collectionView:shouldDeleteItemsAtIndexes:)])
-    {
-        [[self delegate] collectionView:self shouldDeleteItemsAtIndexes:[self selectionIndexes]];
-
-        var index = [[self selectionIndexes] firstIndex];
-        if (index > [[self content] count]-1)
-            [self setSelectionIndexes:[CPIndexSet indexSetWithIndex:[[self content] count]-1]];
-
-        [self _scrollToSelection];
-        [self setNeedsDisplay:YES];
-    }
+    if (_isSelected == shouldBeSelected)
+        return;
+    
+    _isSelected = shouldBeSelected;
+    
+    // FIXME: This should be set up by bindings
+    [_view setSelected:_isSelected];
 }
 
-- (void)keyDown:(CPEvent)anEvent
+/*!
+    Returns <code>YES</code> if the item is currently selected. <code>NO</code> if the item is not selected.
+*/
+- (BOOL)isSelected
 {
-    [self interpretKeyEvents:[anEvent]];
+    return _isSelected;
 }
 
-@end
-
-@implementation CPCollectionView (Deprecated)
-
-- (CGRect)rectForItemAtIndex:(int)anIndex
+// Parent Collection View
+/*!
+    Returns the collection view of which this item is a part.
+*/
+- (CPCollectionView)collectionView
 {
-    _CPReportLenientDeprecation([self class], _cmd, @selector(frameForItemAtIndex:));
-
-    // Don't re-compute anything just grab the current frame
-    // This allows subclasses to override tile without messing this up.
-    return [self frameForItemAtIndex:anIndex];
-}
-
-- (CGRect)rectForItemsAtIndexes:(CPIndexSet)anIndexSet
-{
-    _CPReportLenientDeprecation([self class], _cmd, @selector(frameForItemsAtIndexes:));
-
-    return [self frameForItemsAtIndexes:anIndexSet];
+    return [_view superview];
 }
 
 @end
 
 var CPCollectionViewMinItemSizeKey      = @"CPCollectionViewMinItemSizeKey",
     CPCollectionViewMaxItemSizeKey      = @"CPCollectionViewMaxItemSizeKey",
-    CPCollectionViewVerticalMarginKey   = @"CPCollectionViewVerticalMarginKey",
-    CPCollectionViewSelectableKey       = @"CPCollectionViewSelectableKey",
-    CPCollectionViewBackgroundColorsKey = @"CPCollectionViewBackgroundColorsKey";
+    CPCollectionViewVerticalMarginKey   = @"CPCollectionViewVerticalMarginKey";
 
 
 @implementation CPCollectionView (CPCoding)
@@ -821,21 +735,13 @@ var CPCollectionViewMinItemSizeKey      = @"CPCollectionViewMinItemSizeKey",
         _cachedItems = [];
 
         _itemSize = CGSizeMakeZero();
-        
-        _minItemSize = [aCoder decodeSizeForKey:CPCollectionViewMinItemSizeKey] || CGSizeMakeZero();
-        _maxItemSize = [aCoder decodeSizeForKey:CPCollectionViewMaxItemSizeKey] || CGSizeMakeZero();
-        
-        _verticalMargin = [aCoder decodeFloatForKey:CPCollectionViewVerticalMarginKey];
-        
-        _isSelectable = [aCoder decodeBoolForKey:CPCollectionViewSelectableKey];
+        _minItemSize = [aCoder decodeSizeForKey:CPCollectionViewMinItemSizeKey];
+        _maxItemSize = [aCoder decodeSizeForKey:CPCollectionViewMaxItemSizeKey];
 
-        [self setBackgroundColors:[aCoder decodeObjectForKey:CPCollectionViewBackgroundColorsKey]];
-          
+        _verticalMargin = [aCoder decodeSizeForKey:CPCollectionViewVerticalMarginKey];
         _tileWidth = -1.0;
 
         _selectionIndexes = [CPIndexSet indexSet];
-        
-        _allowsEmptySelection = YES;
     }
 
     return self;
@@ -845,17 +751,54 @@ var CPCollectionViewMinItemSizeKey      = @"CPCollectionViewMinItemSizeKey",
 {
     [super encodeWithCoder:aCoder];
 
-    if (!CGSizeEqualToSize(_minItemSize, CGSizeMakeZero()))
-      [aCoder encodeSize:_minItemSize forKey:CPCollectionViewMinItemSizeKey];
-    
-    if (!CGSizeEqualToSize(_maxItemSize, CGSizeMakeZero()))
-      [aCoder encodeSize:_maxItemSize forKey:CPCollectionViewMaxItemSizeKey];
-    
-    [aCoder encodeBool:_isSelectable forKey:CPCollectionViewSelectableKey];
-    
-    [aCoder encodeFloat:_verticalMargin forKey:CPCollectionViewVerticalMarginKey];
+    [aCoder encodeSize:_minItemSize forKey:CPCollectionViewMinItemSizeKey];
+    [aCoder encodeSize:_maxItemSize forKey:CPCollectionViewMaxItemSizeKey];
 
-    [aCoder encodeObject:_backgroundColors forKey:CPCollectionViewBackgroundColorsKey];
+    [aCoder encodeSize:_verticalMargin forKey:CPCollectionViewVerticalMarginKey];
 }
 
 @end
+
+var CPCollectionViewItemViewKey = @"CPCollectionViewItemViewKey";
+
+@implementation CPCollectionViewItem (CPCoding)
+
+/*
+    FIXME Not yet implemented
+*/
+- (id)copy
+{
+    
+}
+
+@end
+
+var CPCollectionViewItemViewKey = @"CPCollectionViewItemViewKey";
+
+@implementation CPCollectionViewItem (CPCoding)
+
+/*!
+    Initializes the view item by unarchiving data from a coder.
+    @param aCoder the coder from which the data will be unarchived
+    @return the initialized collection view item
+*/
+- (id)initWithCoder:(CPCoder)aCoder
+{
+    self = [super init];
+    
+    if (self)
+        _view = [aCoder decodeObjectForKey:CPCollectionViewItemViewKey];
+    
+    return self;
+}
+
+/*!
+    Archives the colletion view item to the provided coder.
+    @param aCoder the coder to which the view item should be archived
+*/
+- (void)encodeWithCoder:(CPCoder)aCoder
+{
+    [aCoder encodeObject:_view forKey:CPCollectionViewItemViewKey];
+}
+
+@end

AppKit/CPCollectionViewItem.j

@@ -1,85 +0,0 @@
-/*
- * CPCollectionViewItem.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 "CPViewController.j"
-
-/*!
-    Represents an object inside a CPCollectionView.
-*/
-@implementation CPCollectionViewItem : CPViewController
-{
-    BOOL    _isSelected;
-}
-
-// Setting the Represented Object
-/*!
-    Sets the object to be represented by this item.
-    @param anObject the object to be represented
-*/
-- (void)setRepresentedObject:(id)anObject
-{
-    [super setRepresentedObject:anObject];
-
-    var view = [self view];
-
-    if ([view respondsToSelector:@selector(setRepresentedObject:)])
-        [view setRepresentedObject:[self representedObject]];
-}
-
-// Modifying the Selection
-/*!
-    Sets whether this view item should be selected.
-    @param shouldBeSelected \c YES makes the item selected. \c NO deselects it.
-*/
-- (void)setSelected:(BOOL)shouldBeSelected
-{
-    shouldBeSelected = !!shouldBeSelected;
-
-    if (_isSelected === shouldBeSelected)
-        return;
-
-    _isSelected = shouldBeSelected;
-
-    var view = [self view];
-
-    if ([view respondsToSelector:@selector(setSelected:)])
-        [view setSelected:[self isSelected]];
-}
-
-/*!
-    Returns \c YES if the item is currently selected. \c NO if the item is not selected.
-*/
-- (BOOL)isSelected
-{
-    return _isSelected;
-}
-
-// Parent Collection View
-/*!
-    Returns the collection view of which this item is a part.
-*/
-- (CPCollectionView)collectionView
-{
-    return [_view superview];
-}
-
-@end

AppKit/CPColor.j

@@ -46,11 +46,6 @@ var cachedBlackColor,
     cachedLightGrayColor,
     cachedDarkGrayColor,
     cachedWhiteColor,
-    cachedBrownColor,
-    cachedCyanColor,
-    cachedMagentaColor,
-    cachedOrangeColor,
-    cachedPurpleColor,
     cachedShadowColor,
     cachedClearColor;
 
@@ -58,13 +53,13 @@ var cachedBlackColor,
     @ingroup appkit
     @code CPColor
 
-    \c CPColor can be used to represent color
+    <code>CPColor</code> can be used to represent color
     in an RGB or HSB model with an optional transparency value.</p>
 
     <p>It also provides some class helper methods that
     returns instances of commonly used colors.</p>
 
-    <p>The class does not have a \c -set: method
+    <p>The class does not have a <code>set:</code> method
     like NextStep based frameworks to change the color of
     the current context. To change the color of the current
     context, use CGContextSetFillColor().
@@ -117,7 +112,7 @@ var cachedBlackColor,
 
 
 /*!
-    Creates a new color object with \c white for the RGB components.
+    Creates a new color object with <code>white</code> for the RGB components.
     For the alpha component, a value of 1.0 is opaque, and 0.0 means completely transparent.
     
     @param white a float between 0.0 and 1.0
@@ -133,7 +128,7 @@ var cachedBlackColor,
 /*!
     @deprecated in favor of colorWithWhite:apha:
     
-    Creates a new color object with \c white for the RGB components.
+    Creates a new color object with <code>white</code> for the RGB components.
     For the alpha component, a value of 1.0 is opaque, and 0.0 means completely transparent.
     
     @param white a float between 0.0 and 1.0
@@ -296,61 +291,6 @@ var cachedBlackColor,
     return cachedYellowColor;
 }
 
-/*!
-    Returns a brown color object (RGBA=[0.6, 0.4, 0.2, 1.0])
-*/
-+ (CPColor)brownColor
-{
-    if (!cachedBrownColor)
-        cachedBrownColor = [[CPColor alloc] _initWithRGBA:[0.6, 0.4, 0.2, 1.0]];
-
-    return cachedBrownColor;
-}
-
-/*!
-    Returns a cyan color object (RGBA=[0.0, 1.0, 1.0, 1.0])
-*/
-+ (CPColor)cyanColor
-{
-    if (!cachedCyanColor)
-        cachedCyanColor = [[CPColor alloc] _initWithRGBA:[0.0, 1.0, 1.0, 1.0]];
-
-    return cachedCyanColor;
-}
-
-/*!
-    Returns a magenta color object (RGBA=[1.0, 0.0, 1.0, 1.0])
-*/
-+ (CPColor)magentaColor
-{
-    if (!cachedMagentaColor)
-        cachedMagentaColor = [[CPColor alloc] _initWithRGBA:[1.0, 0.0, 1.0, 1.0]];
-
-    return cachedMagentaColor;
-}
-
-/*!
-    Returns a orange color object (RGBA=[1.0, 0.5, 0.0, 1.0])
-*/
-+ (CPColor)orangeColor
-{
-    if (!cachedOrangeColor)
-        cachedOrangeColor = [[CPColor alloc] _initWithRGBA:[1.0, 0.5, 0.0, 1.0]];
-
-    return cachedOrangeColor;
-}
-
-/*!
-    Returns a purple color object (RGBA=[0.5, 0.0, 0.5, 1.0])
-*/
-+ (CPColor)purpleColor
-{
-    if (!cachedPurpleColor)
-        cachedPurpleColor = [[CPColor alloc] _initWithRGBA:[0.5, 0.0, 0.5, 1.0]];
-
-    return cachedPurpleColor;
-}
-
 /*!
     Returns a shadow looking color (RGBA=[0.0, 0.0, 0.0, 0.33])
 */
@@ -375,18 +315,8 @@ var cachedBlackColor,
     return cachedClearColor;
 }
 
-+ (CPColor)alternateSelectedControlColor
-{
-    return [[CPColor alloc] _initWithRGBA:[0.22, 0.46, 0.84, 1.0]];
-}
-
-+ (CPColor)secondarySelectedControlColor
-{
-    return [[CPColor alloc] _initWithRGBA:[0.83, 0.83, 0.83, 1.0]];
-}
-
 /*!
-    Creates a color using a tile pattern with \c anImage
+    Creates a color using a tile pattern with <code>anImage</code>
     @param the image to tile
     @return a tiled image color object
 */
@@ -437,16 +367,51 @@ var cachedBlackColor,
     if (self)
     {
         _components = components;
-
-        var hasAlpha = CPFeatureIsCompatible(CPCSSRGBAFeature) && _components[3] != 1.0;
-
-        _cssString = (hasAlpha ? "rgba(" : "rgb(") +
-            parseInt(_components[0] * 255.0) + ", " +
-            parseInt(_components[1] * 255.0) + ", " +
-            parseInt(_components[2] * 255.0) +
-            (hasAlpha ?  (", " + _components[3]) : "") + ")";
+        
+		if (!CPFeatureIsCompatible(CPCSSRGBAFeature) && _components[3] != 1.0 && window.Base64 && window.CRC32)
+		{
+			var bytes = [0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x1,0x8,0x3,0x0,0x0,0x0,0x28,0xcb,0x34,0xbb,0x0,0x0,0x3,0x0,0x50,0x4c,0x54,0x45,0xff,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x17,0x89,0x99,0x55,0x0,0x0,0x0,0x1,0x74,0x52,0x4e,0x53,0x0,0x40,0xe6,0xd8,0x66,0x0,0x0,0x0,0x10,0x49,0x44,0x41,0x54,0x78,0xda,0x62,0x60,0x0,0x0,0x0,0x0,0xff,0xff,0x3,0x0,0x0,0x2,0x0,0x1,0x24,0x7f,0x24,0xf1,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82,0xff];
+			var r_off = 41;
+			var g_off = 42;
+			var b_off = 43;
+			var a_off = 821;
+			var plte_crc_off = 809;
+			var trns_crc_off = 822;
+			var plte_type_off = 37;
+			var trns_type_off = 817;
+			
+			bytes[r_off] = Math.round(_components[0]*255);
+			bytes[g_off] = Math.round(_components[1]*255);
+			bytes[b_off] = Math.round(_components[2]*255);
+			bytes[a_off] = Math.round(_components[3]*255);
+            
+			// calculate new CRCs
+			var new_plte_crc = integerToBytes(CRC32.getCRC(bytes, plte_type_off, 4+768), 4);
+			var new_trns_crc = integerToBytes(CRC32.getCRC(bytes, trns_type_off, 4+1), 4);
+            
+			// overwrite old CRCs with new ones
+			for (var i = 0; i < 4; i++)
+			{
+				bytes[plte_crc_off+i] = new_plte_crc[i];
+				bytes[trns_crc_off+i] = new_trns_crc[i];
+			}
+            
+			// Base64 encode, strip whitespace and build data URL
+			var base64image = Base64.encode(bytes); //.replace(/[\s]/g, "");
+			
+			_cssString = "url(\"data:image/png;base64," + base64image + "\")";
+		}
+		else
+		{
+        	var hasAlpha = CPFeatureIsCompatible(CPCSSRGBAFeature) && _components[3] != 1.0;
+        		
+        	_cssString = (hasAlpha ? "rgba(" : "rgb(") + 
+        	    parseInt(_components[0] * 255.0) + ", " + 
+        	    parseInt(_components[1] * 255.0) + ", " + 
+        	    parseInt(_components[2] * 255.0) + 
+        	    (hasAlpha ?  (", " + _components[3]) : "") + ")";
+		}
     }
-
     return self;
 }
 
@@ -459,7 +424,6 @@ var cachedBlackColor,
     {
         _patternImage = anImage;
         _cssString = "url(\"" + [_patternImage filename] + "\")";
-        _components = [0.0, 0.0, 0.0, 1.0];
     }
        
     return self;
@@ -659,15 +623,6 @@ url("data:image/png;base64,BASE64ENCODEDDATA")  // if there is a pattern image
 
 @end
 
-@implementation CPColor (Debugging)
-
-+ (CPColor)randomColor
-{
-    return [CPColor colorWithRed:RAND() green:RAND() blue:RAND() alpha:1.0];
-}
-
-@end
-
 var CPColorComponentsKey    = @"CPColorComponentsKey",
     CPColorPatternImageKey  = @"CPColorPatternImageKey";
 
@@ -701,11 +656,8 @@ var CPColorComponentsKey    = @"CPColorComponentsKey",
 
 var hexCharacters = "0123456789ABCDEF";
 
-// HACK: prevent these from becoming globals. workaround for obj-j "function foo(){}" behavior
-var hexToRGB, rgbToHex, byteToHex;
-
 /*!
-    Used for the CPColor \c +colorWithHexString: implementation
+    Used for the CPColor <code>colorWithHexString:</code> implementation
     @ignore
     @class CPColor
     @return an array of rgb components
@@ -730,6 +682,18 @@ function hexToRGB(hex)
     return [red, green, blue, 1.0];
 }
 
+function integerToBytes(integer, length) {
+	if (!length)
+		length = (integer == 0) ? 1 : Math.round((Math.log(integer)/Math.log(2))/8+0.5);
+		
+	var bytes = new Array(length);
+	for (var i = length-1; i >= 0; i--) {
+		bytes[i] = integer & 255;
+		integer = integer >> 8
+	}
+	return bytes;
+}
+
 function rgbToHex(r,g,b) {
     return byteToHex(r) + byteToHex(g) + byteToHex(b);
 }

AppKit/CPColorPanel.j

@@ -58,7 +58,7 @@ CPColorPickerViewHeight = 370;
 
     CPColorPanel provides a reusable panel that can be used
     displayed on screen to prompt the user for a color selection. To
-    obtain the panel, call the \c +sharedColorPanel method.
+    obtain the panel, call the <code>sharedColorPanel</code> method.
 */
 @implementation CPColorPanel : CPPanel
 {    
@@ -111,7 +111,7 @@ CPColorPickerViewHeight = 370;
 }
 
 /*
-    To obtain the color panel, use \c +sharedColorPanel.
+    To obtain the color panel, use <code>sharedColorPanel</code>.
     @ignore
 */
 - (id)init
@@ -137,10 +137,10 @@ CPColorPickerViewHeight = 370;
 }
 
 /*!
-    Sets the color of the panel, and updates the picker. Also posts a \c CPColorPanelDidChangeNotification.
+    Sets the color of the panel, and updates the picker. Also posts a <code>CPColorPanelDidChangeNotification</code>.
 */
 - (void)setColor:(CPColor)aColor
-{
+{    
     _color = aColor;
     [_previewView setBackgroundColor: _color];
     
@@ -518,10 +518,9 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
 
 - (void)mouseUp:(CPEvent)anEvent
 {
-    var point = [self convertPoint:[anEvent locationInWindow] fromView:nil],
-        bounds = [self bounds];
+    var point = [self convertPoint:[anEvent locationInWindow] fromView:nil];
     
-    if(!CGRectContainsPoint(bounds, point) || point.x > [self bounds].size.width - 1 || point.x < 1)
+    if(point.x > [self bounds].size.width - 1 || point.x < 1)
         return NO;
 
     [_colorPanel setColor: [self colorAtIndex:FLOOR(point.x / 13)] updatePicker: YES];
@@ -564,7 +563,7 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
 - (void)pasteboard:(CPPasteboard)aPasteboard provideDataForType:(CPString)aType
 {
     if(aType == CPColorDragType)
-        [aPasteboard setData:[CPKeyedArchiver archivedDataWithRootObject:_dragColor] forType:aType];
+        [aPasteboard setData:_dragColor forType:aType];
 }
 
 - (void)performDragOperation:(id <CPDraggingInfo>)aSender
@@ -576,7 +575,7 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
     if(![pasteboard availableTypeFromArray:[CPColorDragType]] || location.x > [self bounds].size.width - 1 || location.x < 1)
         return NO;
         
-    [self setColor:[CPKeyedUnarchiver unarchiveObjectWithData:[pasteboard dataForType:CPColorDragType]] atIndex: FLOOR(location.x / 13)];
+    [self setColor:[pasteboard dataForType:CPColorDragType] atIndex: FLOOR(location.x / 13)];
 }
 
 @end
@@ -613,8 +612,8 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
     if(![pasteboard availableTypeFromArray:[CPColorDragType]])
         return NO;
         
-    var color = [CPKeyedUnarchiver unarchiveObjectWithData:[pasteboard dataForType:CPColorDragType]];
-    [_colorPanel setColor:color updatePicker:YES];
+    var color = [pasteboard dataForType:CPColorDragType];
+    [_colorPanel setColor: color updatePicker: YES];
 }
 
 - (BOOL)isOpaque
@@ -626,7 +625,7 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
 {
     var point = [self convertPoint:[anEvent locationInWindow] fromView:nil];
 
-    [[CPPasteboard pasteboardWithName:CPDragPboard] declareTypes:[CPColorDragType] owner:self];    
+    [[CPPasteboard pasteboardWithName:CPDragPboard] declareTypes:[CPArray arrayWithObject:CPColorDragType] owner:self];    
     
     var bounds = CPRectMake(0, 0, 15, 15);
     
@@ -651,7 +650,7 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
 - (void)pasteboard:(CPPasteboard)aPasteboard provideDataForType:(CPString)aType
 {
     if(aType == CPColorDragType)
-        [aPasteboard setData:[CPKeyedArchiver archivedDataWithRootObject:[self backgroundColor]] forType:aType];
+        [aPasteboard setData:[self backgroundColor] forType:aType];
 }
 
 @end

AppKit/CPColorPicker.j

@@ -23,13 +23,11 @@
 @import <Foundation/CPObject.j>
 @import "CPColorPanel.j"
 
-#include "Platform/Platform.h"
-
 /*! 
     @ingroup appkit
     @class CPColorPicker
 
-    CPColorPicker is an abstract superclass for all color picker subclasses. If you want a particular color picker, use CPColorPanel's \c +setPickerMode: method. The simplest way to implement your own color picker is to create a subclass of CPColorPicker.
+    CPColorPicker is an abstract superclass for all color picker subclasses. If you want a particular color picker, use CPColorPanel's <code>setPickerMode:</code> method. The simplest way to implement your own color picker is to create a subclass of CPColorPicker.
 */
 @implementation CPColorPicker : CPObject
 {
@@ -62,7 +60,7 @@
 
 /*
     FIXME Not implemented.
-    @return \c nil
+    @return <code>nil</code>
     @ignore
 */
 - (CPImage)provideNewButtonImage
@@ -241,10 +239,8 @@
     _blackWheelImage.style.filter = "alpha(opacity=0)"
     _blackWheelImage.style.position = "absolute";
 
-#if PLATFORM(DOM)
     _DOMElement.appendChild(_wheelImage);
     _DOMElement.appendChild(_blackWheelImage);
-#endif
 
     [self setWheelSize:aFrame.size];
 

AppKit/CPColorWell.j

@@ -35,7 +35,7 @@ var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiv
 
     CPColorWell is a CPControl for selecting and displaying a single color value. An example of a CPColorWell object (or simply color well) is found in CPColorPanel, which uses a color well to display the current color selection.</p>
 
-    <p>An application can have one or more active CPColorWells. You can activate multiple CPColorWells by invoking the \c -activate: method with \c NO as its argument. When a mouse-down event occurs on an CPColorWell's border, it becomes the only active color well. When a color well becomes active, it brings up the color panel also.
+    <p>An application can have one or more active CPColorWells. You can activate multiple CPColorWells by invoking the <code>activate:</code> method with <code>NO</code> as its argument. When a mouse-down event occurs on an CPColorWell's border, it becomes the only active color well. When a color well becomes active, it brings up the color panel also.
 */
 @implementation CPColorWell : CPControl
 {
@@ -127,7 +127,7 @@ var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiv
 }
 
 /*!
-    Changes the color of the well to that of \c aSender.
+    Changes the color of the well to that of <code>aSender</code>.
     @param aSender the object from which to retrieve the color
 */
 - (void)takeColorFrom:(id)aSender
@@ -138,7 +138,7 @@ var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiv
 // Activating and Deactivating Color Wells
 /*!
     Activates the color well, displays the color panel, and makes the panel's current color the same as its own. 
-    If exclusive is \c YES, deactivates any other CPColorWells. \c NO, keeps them active.
+    If exclusive is <code>YES</code>, deactivates any other CPColorWells. <code>NO</code>, keeps them active.
     @param shouldBeExclusive whether other color wells should be deactivated.
 */
 - (void)activate:(BOOL)shouldBeExclusive
@@ -179,7 +179,7 @@ var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiv
 }
 
 /*!
-    Returns \c YES if the color well is active.
+    Returns <code>YES</code> if the color well is active.
 */
 - (BOOL)isActive
 {
@@ -262,7 +262,7 @@ var CPColorWellColorKey     = "CPColorWellColorKey",
 @implementation CPColorWell (CPCoding)
 
 /*!
-    Initializes the color well by unarchiving data from \c aCoder.
+    Initializes the color well by unarchiving data from <code>aCoder</code>.
     @param aCoder the coder containing the archived CPColorWell.
 */
 - (id)initWithCoder:(CPCoder)aCoder

AppKit/CPCompatibility.j

@@ -21,7 +21,6 @@
  */
 
 @import "CPEvent.j"
-@import "CPPlatform.j"
 
 // Browser Engines
 CPUnknownBrowserEngine                  = 0;
@@ -31,28 +30,22 @@ CPKHTMLBrowserEngine                    = 3;
 CPOperaBrowserEngine                    = 4;
 CPWebKitBrowserEngine                   = 5;
 
-// Operating Systems
-CPMacOperatingSystem                    = 0;
-CPWindowsOperatingSystem                = 1;
-CPOtherOperatingSystem                  = 2;
-
 // Features
 CPCSSRGBAFeature                        = 1 << 5;
 
 CPHTMLCanvasFeature                     = 1 << 6;
 CPHTMLContentEditableFeature            = 1 << 7;
-CPHTMLDragAndDropFeature                = 1 << 8;
 
-CPJavascriptInnerTextFeature            = 1 << 9;
-CPJavascriptTextContentFeature          = 1 << 10;
-CPJavascriptClipboardEventsFeature      = 1 << 11;
-CPJavascriptClipboardAccessFeature      = 1 << 12;
-CPJavaScriptCanvasDrawFeature           = 1 << 13;
-CPJavaScriptCanvasTransformFeature      = 1 << 14;
+CPJavascriptInnerTextFeature            = 1 << 8;
+CPJavascriptTextContentFeature          = 1 << 9;
+CPJavascriptClipboardEventsFeature      = 1 << 10;
+CPJavascriptClipboardAccessFeature      = 1 << 11;
+CPJavaScriptCanvasDrawFeature           = 1 << 12;
+CPJavaScriptCanvasTransformFeature      = 1 << 13;
 
-CPVMLFeature                            = 1 << 15;
+CPVMLFeature                            = 1 << 14;
 
-CPJavascriptRemedialKeySupport          = 1 << 16;
+CPJavascriptRemedialKeySupport          = 1 << 15;
 CPJavaScriptShadowFeature               = 1 << 20;
 
 CPJavaScriptNegativeMouseWheelValues    = 1 << 22;
@@ -61,9 +54,7 @@ CPJavaScriptMouseWheelValues_8_15       = 1 << 23
 CPOpacityRequiresFilterFeature          = 1 << 24;
 
 //Internet explorer does not allow dynamically changing the type of an input element
-CPInputTypeCanBeChangedFeature          = 1 << 25;
-CPHTML5DragAndDropSourceYOffBy1         = 1 << 26;
-
+CPInputTypeCanBeChangedFeature          = 1 << 25;  
 
 
 
@@ -109,31 +100,16 @@ else if (USER_AGENT.indexOf("AppleWebKit/") != -1)
     // Features we can only be sure of with WebKit (no known independent tests)
     PLATFORM_FEATURES |= CPCSSRGBAFeature;
     PLATFORM_FEATURES |= CPHTMLContentEditableFeature;
-
-    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),
-        versionString = USER_AGENT.substring(versionStart, versionEnd),
-        versionDivision = versionString.indexOf('.'),
-        majorVersion = parseInt(versionString.substring(0, versionDivision)),
-        minorVersion = parseInt(versionString.substr(versionDivision + 1));
+        version = parseFloat(USER_AGENT.substring(versionStart, versionEnd), 10);
 
-    if((USER_AGENT.indexOf("Safari") !== CPNotFound && (majorVersion > 525 || (majorVersion === 525 && minorVersion > 14))) || USER_AGENT.indexOf("Chrome") !== CPNotFound)
+    if(USER_AGENT.indexOf("Plainview") == -1 && version >= 525.14 || USER_AGENT.indexOf("Chrome") != -1)
         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;
-
-    if (majorVersion < 532 || (majorVersion === 532 && minorVersion < 6))
-        PLATFORM_FEATURES |= CPHTML5DragAndDropSourceYOffBy1;
 }
 
 // KHTML
@@ -191,38 +167,26 @@ function CPFeatureIsCompatible(aFeature)
 
 function CPBrowserIsEngine(anEngine)
 {
-    return PLATFORM_ENGINE === anEngine;
+    return PLATFORM_ENGINE == anEngine;
 }
 
-function CPBrowserIsOperatingSystem(anOperatingSystem)
+if (USER_AGENT.indexOf("Mac") != -1)
 {
-    return OPERATING_SYSTEM === anOperatingSystem;
-}
-
-OPERATING_SYSTEM = CPOtherOperatingSystem;
-
-if (USER_AGENT.indexOf("Mac") !== -1)
-{
-    OPERATING_SYSTEM = CPMacOperatingSystem;
-
     CPPlatformActionKeyMask = CPCommandKeyMask;
-
-    CPUndoKeyEquivalent = @"z";
+    
+    CPUndoKeyEquivalent = @"Z";
     CPRedoKeyEquivalent = @"Z";
 
     CPUndoKeyEquivalentModifierMask = CPCommandKeyMask;
-    CPRedoKeyEquivalentModifierMask = CPCommandKeyMask;
+    CPRedoKeyEquivalentModifierMask = CPCommandKeyMask | CPShiftKeyMask;
 }
 else
 {
-    if (USER_AGENT.indexOf("Windows") !== -1)
-        OPERATING_SYSTEM = CPWindowsOperatingSystem;
-
     CPPlatformActionKeyMask = CPControlKeyMask;
-
-    CPUndoKeyEquivalent = @"z";
-    CPRedoKeyEquivalent = @"y";
-
+    
+    CPUndoKeyEquivalent = @"Z";
+    CPRedoKeyEquivalent = @"Y";
+    
     CPUndoKeyEquivalentModifierMask = CPControlKeyMask;
     CPRedoKeyEquivalentModifierMask = CPControlKeyMask;
 }

AppKit/CPControl.j

@@ -27,42 +27,47 @@
 #include "CoreGraphics/CGGeometry.h"
 #include "Platform/Platform.h"
 
-CPLeftTextAlignment             = 0;
-CPRightTextAlignment            = 1;
-CPCenterTextAlignment           = 2;
-CPJustifiedTextAlignment        = 3;
-CPNaturalTextAlignment          = 4;
+/*
+    @global
+    @group CPTextAlignment
+*/
+CPLeftTextAlignment         = 0;
+/*
+    @global
+    @group CPTextAlignment
+*/
+CPRightTextAlignment        = 1;
+/*
+    @global
+    @group CPTextAlignment
+*/
+CPCenterTextAlignment       = 2;
+/*
+    @global
+    @group CPTextAlignment
+*/
+CPJustifiedTextAlignment    = 3;
+/*
+    @global
+    @group CPTextAlignment
+*/
+CPNaturalTextAlignment      = 4;
 
-CPRegularControlSize            = 0;
-CPSmallControlSize              = 1;
-CPMiniControlSize               = 2;
-
-CPLineBreakByWordWrapping       = 0;
-CPLineBreakByCharWrapping       = 1;
-CPLineBreakByClipping           = 2;
-CPLineBreakByTruncatingHead     = 3;
-CPLineBreakByTruncatingTail     = 4;
-CPLineBreakByTruncatingMiddle   = 5;
-
-CPTopVerticalTextAlignment      = 1,
-CPCenterVerticalTextAlignment   = 2,
-CPBottomVerticalTextAlignment   = 3;
-
-CPScaleProportionally   = 0;
-CPScaleToFit            = 1;
-CPScaleNone             = 2;
-
-CPNoImage       = 0;
-CPImageOnly     = 1;
-CPImageLeft     = 2;
-CPImageRight    = 3;
-CPImageBelow    = 4;
-CPImageAbove    = 5;
-CPImageOverlaps = 6;
-
-CPOnState                       = 1;
-CPOffState                      = 0;
-CPMixedState                    = -1;
+/*
+    @global
+    @group CPControlSize
+*/
+CPRegularControlSize        = 0;
+/*
+    @global
+    @group CPControlSize
+*/
+CPSmallControlSize          = 1;
+/*
+    @global
+    @group CPControlSize
+*/
+CPMiniControlSize           = 2;
 
 CPControlNormalBackgroundColor      = "CPControlNormalBackgroundColor";
 CPControlSelectedBackgroundColor    = "CPControlSelectedBackgroundColor";
@@ -89,13 +94,15 @@ var CPControlBlackColor     = [CPColor blackColor];
     id                  _target;
     SEL                 _action;
     int                 _sendActionOn;
-    BOOL                _sendsActionOnEndEditing @accessors(property=sendsActionOnEndEditing);
-
+    
     // Mouse Tracking Support
     BOOL                _continuousTracking;
     BOOL                _trackingWasWithinFrame;
     unsigned            _trackingMouseDownFlags;
     CGPoint             _previousTrackingLocation;
+    
+    JSObject            _ephemeralSubviewsForNames;
+    CPSet               _ephereralSubviews;
 
     CPString            _toolTip;
 }
@@ -107,7 +114,7 @@ var CPControlBlackColor     = [CPColor blackColor];
                                                 CPLineBreakByClipping,
                                                 [CPColor blackColor],
                                                 [CPFont systemFontOfSize:12.0],
-                                                [CPNull null],
+                                                nil,
                                                 _CGSizeMakeZero(),
                                                 CPImageLeft,
                                                 CPScaleToFit,
@@ -174,7 +181,7 @@ var CPControlBlackColor     = [CPColor blackColor];
 }
 
 /*!
-    Causes \c anAction to be sent to \c anObject.
+    Causes <code>anAction</code> to be sent to <code>anObject</code>.
     @param anAction the action to send
     @param anObject the object to which the action will be sent
 */
@@ -289,26 +296,11 @@ var CPControlBlackColor     = [CPColor blackColor];
     _previousTrackingLocation = currentLocation;
 }
 
-- (void)setState:(int)state
-{
-}
-
-- (int)nextState
-{
-    return 0;
-}
-
 - (void)performClick:(id)sender 
 {
     [self highlight:YES];
     [self setState:[self nextState]];
     [self sendAction:[self action] to:[self target]];
-    
-    [CPTimer scheduledTimerWithTimeInterval:0.1 target:self selector:@selector(unhighlightButtonTimerDidFinish:) userInfo:nil repeats:NO];
-}
-
-- (void)unhighlightButtonTimerDidFinish:(id)sender
-{
     [self highlight:NO];
 }
 
@@ -565,6 +557,54 @@ BRIDGE(ImageScaling, imageScaling, "image-scaling")
     return [self hasThemeState:CPThemeStateHighlighted];
 }
 
+- (CPView)createEphemeralSubviewNamed:(CPString)aViewName
+{
+    return nil;
+}
+
+- (CGRect)rectForEphemeralSubviewNamed:(CPString)aViewName
+{
+    return _CGRectMakeZero();
+}
+
+- (CPView)layoutEphemeralSubviewNamed:(CPString)aViewName 
+                           positioned:(CPWindowOrderingMode)anOrderingMode
+      relativeToEphemeralSubviewNamed:(CPString)relativeToViewName
+{
+    if (!_ephemeralSubviewsForNames)
+    {
+        _ephemeralSubviewsForNames = {};
+        _ephemeralSubviews = [CPSet set];
+    }
+    
+    var frame = [self rectForEphemeralSubviewNamed:aViewName];
+
+    if (frame && !_CGRectIsEmpty(frame))
+    {
+        if (!_ephemeralSubviewsForNames[aViewName])
+        {
+            _ephemeralSubviewsForNames[aViewName] = [self createEphemeralSubviewNamed:aViewName];
+        
+            [_ephemeralSubviews addObject:_ephemeralSubviewsForNames[aViewName]];
+        
+            if (_ephemeralSubviewsForNames[aViewName])
+                [self addSubview:_ephemeralSubviewsForNames[aViewName] positioned:anOrderingMode relativeTo:_ephemeralSubviewsForNames[relativeToViewName]];
+        }
+        
+        if (_ephemeralSubviewsForNames[aViewName])
+            [_ephemeralSubviewsForNames[aViewName] setFrame:frame];
+    }
+    else if (_ephemeralSubviewsForNames[aViewName])
+    {
+        [_ephemeralSubviewsForNames[aViewName] removeFromSuperview];
+        
+        [_ephemeralSubviews removeObject:_ephemeralSubviewsForNames[aViewName]];
+        delete _ephemeralSubviewsForNames[aViewName];
+    }
+    
+    return _ephemeralSubviewsForNames[aViewName];
+}
+
 @end
 
 var CPControlValueKey           = "CPControlValueKey",
@@ -573,9 +613,7 @@ var CPControlValueKey           = "CPControlValueKey",
     
     CPControlTargetKey          = "CPControlTargetKey",
     CPControlActionKey          = "CPControlActionKey",
-    CPControlSendActionOnKey    = "CPControlSendActionOnKey",
-
-    CPControlSendsActionOnEndEditingKey = "CPControlSendsActionOnEndEditingKey";
+    CPControlSendActionOnKey    = "CPControlSendActionOnKey";
 
 var __Deprecated__CPImageViewImageKey   = @"CPImageViewImageKey";
 
@@ -598,7 +636,6 @@ var __Deprecated__CPImageViewImageKey   = @"CPImageViewImageKey";
         [self setAction:[aCoder decodeObjectForKey:CPControlActionKey]];
 
         [self sendActionOn:[aCoder decodeIntForKey:CPControlSendActionOnKey]];
-        [self setSendsActionOnEndEditing:[aCoder decodeBoolForKey:CPControlSendsActionOnEndEditingKey]];
     }
     
     return self;
@@ -610,10 +647,23 @@ var __Deprecated__CPImageViewImageKey   = @"CPImageViewImageKey";
 */
 - (void)encodeWithCoder:(CPCoder)aCoder
 {
+    var count = [_subviews count],
+        ephemeral
+        subviews = nil;
+
+    if (count > 0 && [_ephemeralSubviews count] > 0)
+    {
+        subviews = [_subviews.slice(0) copy];
+        
+        while (count--)
+            if ([_ephemeralSubviews containsObject:_subviews[count]])
+                _subviews.splice(count, 1);
+    }
+
     [super encodeWithCoder:aCoder];
 
-    if (_sendsActionOnEndEditing)
-        [aCoder encodeBool:_sendsActionOnEndEditing forKey:CPControlSendsActionOnEndEditingKey];
+    if (subviews)
+        _subviews = subviews;
 
     if (_value !== nil)
         [aCoder encodeObject:_value forKey:CPControlValueKey];

AppKit/CPCookie.j

@@ -38,7 +38,7 @@
 }
 
 /*!
-    Initializes a cookie with a given name \c aName.
+    Initializes a cookie with a given name <code>aName</code>.
     @param the name for the cookie
 */
 - (id)initWithName:(CPString)aName

AppKit/CPCursor.j

@@ -1,272 +0,0 @@
-/*
-Testing browsers:
-    WebKit r50235 (Safari 4.0.3+)
-    FireFox 3.5
-    Opera 10.0.0
-
-Implemented class methods:
-    Webkit : All
-    IE     : All
-    FireFox Win : All
-    FireFox Mac : All except closedHandCursor disappearingItemCursor // Firefox mac does not support url cursors
-    Opera       : All except resizeLeftRightCursor resizeUpDownCursor operationNotAllowedCursor dragCopyCursor dragLinkCursor contextualMenuCursor openHandCursor closedHandCursor disappearingItemCursor // Opera does not support url cursors so these won't work with images
-*/
-
-#include "Platform/Platform.h"
-
-var currentCursor = nil,
-    cursorStack = [],
-    cursors = {},
-    cursorURLFormat = nil;
-
-@implementation CPCursor : CPObject
-{
-    CPString _cssString;
-    BOOL     _isSetOnMouseEntered @accessors(readwrite, getter=isSetOnMouseEntered, setter=setOnMouseEntered:);
-    BOOL     _isSetOnMouseExited @accessors(readwrite, getter=isSetOnMouseExited, setter=setOnMouseExited:);
-}
-
-+ (CPCursor)currentCursor
-{
-    return currentCursor;
-}
-
-- (id)initWithCSSString:(CPString)aString
-{
-    if (self = [super init])
-        _cssString = aString;
-
-    return self;
-}
-
-+ (CPCursor)cursorWithCSSString:(CPString)cssString
-{
-    var cursor = cursors[cssString];
-
-    if (typeof cursor == 'undefined')
-    {
-        cursor = [[CPCursor alloc] initWithCSSString:cssString];
-        cursors[cssString] = cursor;
-    }
-
-    return cursor;
-}
-
-+ (CPCursor)cursorWithImageNamed:(CPString)imageName
-{
-    if (!cursorURLFormat)
-    {
-        cursorURLFormat = @"url(" + [[CPBundle bundleForClass:self] resourcePath] + @"/CPCursor/%@.cur)";
-
-        if (CPBrowserIsEngine(CPGeckoBrowserEngine))
-            cursorURLFormat += ", default";
-    }
-    
-    var url = [CPString stringWithFormat:cursorURLFormat, imageName];
-    
-    return [[CPCursor alloc] initWithCSSString:url];
-}
-
-- (CPString)_cssString
-{
-    return _cssString;
-}
-
-+ (CPCursor)arrowCursor
-{
-    return [CPCursor cursorWithCSSString:@"default"]; // WebKit | FF | opera | IE
-}
-
-+ (CPCursor)crosshairCursor
-{
-    return [CPCursor cursorWithCSSString:@"crosshair"]; // WebKit | FF | opera | IE
-}
-
-+ (CPCursor)IBeamCursor
-{
-    return [CPCursor cursorWithCSSString:@"text"]; // WebKit | FF | opera | IE
-}
-
-+ (CPCursor)pointingHandCursor
-{
-    return [CPCursor cursorWithCSSString:@"pointer"]; // WebKit | FF | opera | IE
-}
-
-+ (CPCursor)resizeDownCursor
-{
-    if (CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
-        return [CPCursor cursorWithImageNamed:CPStringFromSelector(_cmd)];
-        
-    return [CPCursor cursorWithCSSString:"s-resize"]; // WebKit | FF | opera
-}
-
-+ (CPCursor)resizeUpCursor
-{
-    if (CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
-        return [CPCursor cursorWithImageNamed:CPStringFromSelector(_cmd)];
-
-    return [CPCursor cursorWithCSSString:@"n-resize"]; // WebKit | FF | opera
-}
-
-+ (CPCursor)resizeLeftCursor
-{
-    if (CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
-        return [CPCursor cursorWithImageNamed:CPStringFromSelector(_cmd)];
-
-    return [CPCursor cursorWithCSSString:@"w-resize"]; // WebKit | FF | opera
-}
-
-+ (CPCursor)resizeRightCursor
-{
-    if (CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
-        return [CPCursor cursorWithImageNamed:CPStringFromSelector(_cmd)];
-
-    return [CPCursor cursorWithCSSString:@"e-resize"]; // WebKit | FF | opera
-}
-
-+ (CPCursor)resizeLeftRightCursor
-{
-    return [CPCursor cursorWithCSSString:@"col-resize"]; // WebKit | FF | IE
-}
-
-+ (CPCursor)resizeUpDownCursor
-{
-    return [CPCursor cursorWithCSSString:@"row-resize"]; // WebKit | FF | IE
-}
-
-+ (CPCursor)operationNotAllowedCursor
-{
-    return [CPCursor cursorWithCSSString:@"not-allowed"]; // WebKit | FF | IE
-}
-
-+ (CPCursor)dragCopyCursor
-{
-    if (CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
-        return [CPCursor cursorWithImageNamed:CPStringFromSelector(_cmd)];
-
-    return [CPCursor cursorWithCSSString:@"copy"]; // WebKit | FF
-}
-
-+ (CPCursor)dragLinkCursor
-{
-    if (CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
-        return [CPCursor cursorWithImageNamed:CPStringFromSelector(_cmd)];
-
-    return [CPCursor cursorWithCSSString:@"alias"]; // WebKit | FF
-}
-
-+ (CPCursor)contextualMenuCursor
-{
-    if (CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
-        return [CPCursor cursorWithImageNamed:CPStringFromSelector(_cmd)];
-
-    return [CPCursor cursorWithCSSString:@"context-menu"]; // WebKit | FF Mac . Not impl FF Win.
-}
-
-+ (CPCursor)openHandCursor
-{
-    if (CPBrowserIsEngine(CPWebKitBrowserEngine))
-        return [CPCursor cursorWithCSSString:@"-webkit-grab"];
-    else if (CPBrowserIsEngine(CPGeckoBrowserEngine) || CPBrowserIsEngine(CPOperaBrowserEngine))
-        return [CPCursor cursorWithCSSString:@"move"];
-
-    return [CPCursor cursorWithImageNamed:CPStringFromSelector(_cmd)]; // WebKit only. move in FFMac|Opera 
-}
-
-+ (CPCursor)closedHandCursor
-{
-    if (CPBrowserIsEngine(CPWebKitBrowserEngine))
-        return [CPCursor cursorWithCSSString:@"-webkit-grabbing"];
-
-    return [CPCursor cursorWithImageNamed:CPStringFromSelector(_cmd)]; // WebKit only 
-}
-
-+ (CPCursor)disappearingItemCursor
-{
-    return [CPCursor cursorWithImageNamed:CPStringFromSelector(_cmd)]; // None
-}
-
-+ (void)hide
-{
-    [self _setCursorCSS:"none"]; // Not supported in IE
-}
-
-+ (void)unhide
-{
-    [self _setCursorCSS:[currentCursor _cssString]]
-}
-
-+ (void)setHiddenUntilMouseMoves:(BOOL)flag
-{
-    if (flag)
-        [CPCursor hide];
-    else
-        [CPCursor unhide];
-}
-
-- (id)initWithImage:(CPImage)image hotSpot:(CPPoint)hotSpot
-{
-    return [self initWithCSSString:"url(" + [image filename] + ")"];
-}
-
-- (void)mouseEntered:(CPEvent)event
-{
-}
-
-- (void)mouseExited:(CPEvent)event
-{
-}
-
-- (void)set
-{
-    currentCursor = self; 
-
-#if PLATFORM(DOM)
-    [[self class] _setCursorCSS:_cssString];
-#endif
-
-}
-
-+ (void)_setCursorCSS:(CPString)aString
-{
-#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
-}
-
-- (void)push
-{
-    currentCursor = cursorStack.push(self);
-}
-
-- (void)pop
-{
-    [CPCursor pop];
-}
-
-+ (void)pop
-{
-    if (cursorStack.length > 1)
-    {
-        cursorStack.pop();
-        currentCursor = cursorStack[cursorStack.length - 1];
-    }
-}
-
-- (id)initWithCoder:(CPCoder)coder
-{
-    if (self = [super init])
-        _cssString = [coder decodeObjectForKey:@"CPCursorNameKey"];
-
-    return self;
-}
-
-- (void)encodeWithCoder:(CPCoder)coder
-{
-    [coder encodeObject:_cssString forKey:@"CPCursorNameKey"];
-}
-
-@end
-

AppKit/CPDocument.j

@@ -24,8 +24,6 @@
 @import <Foundation/CPArray.j>
 
 @import "CPResponder.j"
-@import "CPSavePanel.j"
-@import "CPViewController.j"
 @import "CPWindowController.j"
 
 
@@ -92,25 +90,19 @@ var CPDocumentUntitledCount = 0;
     CPDocuments should be used to represent this.
 */
 @implementation CPDocument : CPResponder
-{
-    CPWindow            _window; // For outlet purposes.
-    CPView              _view; // For outlet purposes
-    CPDictionary        _viewControllersForWindowControllers;
+{    
+    CPURL           _fileURL;
+    CPString        _fileType;
+    CPArray         _windowControllers;
+    unsigned        _untitledDocumentIndex;
 
-    CPURL               _fileURL;
-    CPString            _fileType;
-    CPArray             _windowControllers;
-    unsigned            _untitledDocumentIndex;
-
-    BOOL                _hasUndoManager;
-    CPUndoManager       _undoManager;
-
-    int                 _changeCount;
-
-    CPURLConnection     _readConnection;
-    CPURLRequest        _writeRequest;
-
-    CPAlert             _canCloseAlert;
+    BOOL            _hasUndoManager;
+    CPUndoManager   _undoManager;
+    
+    int             _changeCount;
+    
+    CPURLConnection _readConnection;
+    CPURLRequest    _writeRequest;
 }
 
 /*!
@@ -124,11 +116,10 @@ var CPDocumentUntitledCount = 0;
     if (self)
     {
         _windowControllers = [];
-        _viewControllersForWindowControllers = [CPDictionary dictionary];
-
+        
         _hasUndoManager = YES;
         _changeCount = 0;
-
+        
         [self setNextResponder:CPApp];
     }
     
@@ -168,10 +159,10 @@ var CPDocumentUntitledCount = 0;
     
     if (self)
     {
+        [self readFromURL:anAbsoluteURL ofType:aType delegate:aDelegate didReadSelector:aDidReadSelector contextInfo:aContextInfo];
+        
         [self setFileURL:anAbsoluteURL];
         [self setFileType:aType];
-
-        [self readFromURL:anAbsoluteURL ofType:aType delegate:aDelegate didReadSelector:aDidReadSelector contextInfo:aContextInfo];
     }
     
     return self;
@@ -183,8 +174,8 @@ var CPDocumentUntitledCount = 0;
     @param absoluteContentsURL the location of the document's contents
     @param aType the type of the contents
     @param aDelegate this object will receive a callback after the document's contents are loaded
-    @param aDidReadSelector the message selector that will be sent to \c aDelegate
-    @param aContextInfo passed as the argument to the message sent to the \c aDelegate
+    @param aDidReadSelector the message selector that will be sent to <code>aDelegate</code>
+    @param aContextInfo passed as the argument to the message sent to the <code>aDelegate</code>
     @return the initialized document
 */
 - (id)initForURL:(CPURL)anAbsoluteURL withContentsOfURL:(CPURL)absoluteContentsURL ofType:(CPString)aType delegate:(id)aDelegate didReadSelector:(SEL)aDidReadSelector contextInfo:(id)aContextInfo
@@ -193,10 +184,10 @@ var CPDocumentUntitledCount = 0;
     
     if (self)
     {
+        [self readFromURL:absoluteContentsURL ofType:aType delegate:aDelegate didReadSelector:aDidReadSelector contextInfo:aContextInfo];
+        
         [self setFileURL:anAbsoluteURL];
         [self setFileType:aType];
-
-        [self readFromURL:absoluteContentsURL ofType:aType delegate:aDelegate didReadSelector:aDidReadSelector contextInfo:aContextInfo];
     }
     
     return self;
@@ -231,73 +222,15 @@ var CPDocumentUntitledCount = 0;
                 reason:"readFromData:ofType: must be overridden by the document subclass."];
 }
 
-- (void)viewControllerWillLoadCib:(CPViewController)aViewController
-{
-}
-
-- (void)viewControllerDidLoadCib:(CPViewController)aViewController
-{
-}
-
-- (CPWindowController)firstEligibleExistingWindowController
-{
-    return nil;
-}
-
 // Creating and managing window controllers
 /*!
     Creates the window controller for this document.
 */
 - (void)makeWindowControllers
 {
-    [self makeViewAndWindowControllers];
-}
-
-- (void)makeViewAndWindowControllers
-{
-    var viewCibName = [self viewCibName],
-        viewController = nil,
-        windowController = nil;
-
-    // Create our view controller if we have a cib for it.
-    if ([viewCibName length])
-        viewController = [[CPViewController alloc] initWithCibName:viewCibName bundle:nil owner:self];
-
-    // If we have a view controller, check if we have a free window for it.
-    if (viewController)
-        windowController = [self firstEligibleExistingWindowController];
-
-    // If not, create one.
-    if (!windowController)
-    {
-        var windowCibName = [self windowCibName];
-
-        // From a cib if we have one.
-        if ([windowCibName length])
-            windowController = [[CPWindowController alloc] initWithWindowCibName:windowCibName owner:self];
-
-        // If not you get a standard window capable of displaying multiple documents and view
-        else if (viewController)
-        {
-            var view = [viewController view],
-                viewFrame = [view frame];
-            
-            viewFrame.origin = CGPointMake(50, 50);
-
-            var theWindow = [[CPWindow alloc] initWithContentRect:viewFrame styleMask:CPTitledWindowMask | CPClosableWindowMask | CPMiniaturizableWindowMask | CPResizableWindowMask];
-
-            windowController = [[CPWindowController alloc] initWithWindow:theWindow];
-        }
-    }
-
-    if (windowController && viewController)
-        [windowController setSupportsMultipleDocuments:YES];
-
-    if (windowController)
-        [self addWindowController:windowController];
-
-    if (viewController)
-        [self addViewController:viewController forWindowController:windowController];
+    var controller = [[CPWindowController alloc] initWithWindowCibName:nil];
+    
+    [self addWindowController:controller];
 }
 
 /*!
@@ -316,52 +249,12 @@ var CPDocumentUntitledCount = 0;
 - (void)addWindowController:(CPWindowController)aWindowController
 {
     [_windowControllers addObject:aWindowController];
-
-    if ([aWindowController document] !== self)
+    
+    if ([aWindowController document] != self)
+    {
+        [aWindowController setNextResponder:self];
         [aWindowController setDocument:self];
-}
-
-/*!
-    Remove a controller to the document's list of controllers. This should
-    be called after closing the controller's window.
-    @param aWindowController the controller to remove
-*/
-- (void)removeWindowController:(CPWindowController)aWindowController
-{
-    if (aWindowController)
-        [_windowControllers removeObject:aWindowController];
-
-    if ([aWindowController document] === self)
-        [aWindowController setDocument:nil];
-}
-
-- (CPView)view
-{
-    return _view;
-}
-
-- (CPArray)viewControllers
-{
-    return [_viewControllersForWindowControllers allValues];
-}
-
-- (void)addViewController:(CPViewController)aViewController forWindowController:(CPWindowController)aWindowController
-{
-    // FIXME: exception if we don't own the window controller?
-    [_viewControllersForWindowControllers setObject:aViewController forKey:[aWindowController UID]];
-
-    if ([aWindowController document] === self)
-        [aWindowController setViewController:aViewController];
-}
-
-- (void)removeViewController:(CPViewController)aViewController
-{
-    [_viewControllersForWindowControllers removeObject:aViewController];
-}
-
-- (CPViewController)viewControllerForWindowController:(CPWindowController)aWindowController
-{
-    return [_viewControllersForWindowControllers objectForKey:[aWindowController UID]];
+    }
 }
 
 // Managing Document Windows
@@ -370,7 +263,6 @@ var CPDocumentUntitledCount = 0;
 */
 - (void)showWindows
 {
-    [_windowControllers makeObjectsPerformSelector:@selector(setDocument:) withObject:self];
     [_windowControllers makeObjectsPerformSelector:@selector(showWindow:) withObject:self];
 }
 
@@ -391,11 +283,6 @@ var CPDocumentUntitledCount = 0;
 	return @"Untitled " + _untitledDocumentIndex;
 }
 
-- (CPString)viewCibName
-{
-    return nil;
-}
-
 /*!
     Returns the document's Cib name
 */
@@ -405,18 +292,18 @@ var CPDocumentUntitledCount = 0;
 }
 
 /*!
-    Called after \c aWindowController loads the document's Nib file.
+    Called after <code>aWindowController<code> loads the document's Nib file.
     @param aWindowController the controller that loaded the Nib file
 */
-- (void)windowControllerDidLoadCib:(CPWindowController)aWindowController
+- (void)windowControllerDidLoadNib:(CPWindowController)aWindowController
 {
 }
 
 /*!
-    Called before \c aWindowController will load the document's Nib file.
+    Called before <code>aWindowController</code> will load the document's Nib file.
     @param aWindowController the controller that will load the Nib file
 */
-- (void)windowControllerWillLoadCib:(CPWindowController)aWindowController
+- (void)windowControllerWillLoadNib:(CPWindowController)aWindowController
 {
 }
 
@@ -435,7 +322,7 @@ var CPDocumentUntitledCount = 0;
 
     // FIXME: Oh man is this every looking for trouble, we need to handle login at the Cappuccino level, with HTTP Errors.
     _readConnection = [CPURLConnection connectionWithRequest:[CPURLRequest requestWithURL:anAbsoluteURL] delegate:self];
-
+    
     _readConnection.session = _CPReadSessionMake(aType, aDelegate, aDidReadSelector, aContextInfo);
 }
 
@@ -453,7 +340,7 @@ var CPDocumentUntitledCount = 0;
 */
 - (void)setFileURL:(CPURL)aFileURL
 {
-    if (_fileURL === aFileURL)
+    if (_fileURL == aFileURL)
         return;
 
     _fileURL = aFileURL;
@@ -478,22 +365,17 @@ var CPDocumentUntitledCount = 0;
 
     _writeRequest = [CPURLRequest requestWithURL:anAbsoluteURL];
 
-    // FIXME: THIS IS WRONG! We need a way to decide
-    if ([CPPlatform isBrowser])
-        [_writeRequest setHTTPMethod:@"POST"];
-    else
-        [_writeRequest setHTTPMethod:@"PUT"];
-
-    [_writeRequest setHTTPBody:[data rawString]];
-
+    [_writeRequest setHTTPMethod:@"POST"];
+    [_writeRequest setHTTPBody:[data string]];
+    
     [_writeRequest setValue:@"close" forHTTPHeaderField:@"Connection"];
 
     if (aSaveOperation == CPSaveOperation)
         [_writeRequest setValue:@"true" forHTTPHeaderField:@"x-cappuccino-overwrite"];
-
+    
     if (aSaveOperation != CPSaveToOperation)
         [self updateChangeCount:CPChangeCleared];
-
+    
     // FIXME: Oh man is this every looking for trouble, we need to handle login at the Cappuccino level, with HTTP Errors.
     var connection = [CPURLConnection connectionWithRequest:_writeRequest delegate:self];
 
@@ -550,7 +432,6 @@ var CPDocumentUntitledCount = 0;
                 _writeRequest = nil;
     
                 objj_msgSend(session.delegate, session.didSaveSelector, self, NO, session.contextInfo);
-                [self _sendDocumentSavedNotification:NO];
             }
         }
     }
@@ -567,7 +448,7 @@ var CPDocumentUntitledCount = 0;
     // READ
     if (aConnection == _readConnection)
     {
-        [self readFromData:[CPData dataWithRawString:aData] ofType:session.fileType error:nil];
+        [self readFromData:[CPData dataWithString:aData] ofType:session.fileType error:nil];
 
         objj_msgSend(session.delegate, session.didReadSelector, self, YES, session.contextInfo);
     }
@@ -579,7 +460,6 @@ var CPDocumentUntitledCount = 0;
         _writeRequest = nil;
         
         objj_msgSend(session.delegate, session.didSaveSelector, self, YES, session.contextInfo);
-        [self _sendDocumentSavedNotification:YES];
     }
 }
 
@@ -607,7 +487,6 @@ var CPDocumentUntitledCount = 0;
         alert("There was an error saving the document.");
 
         objj_msgSend(session.delegate, session.didSaveSelector, self, NO, session.contextInfo);
-        [self _sendDocumentSavedNotification:NO];
     }
 }
 
@@ -623,7 +502,7 @@ var CPDocumentUntitledCount = 0;
 
 // Managing Document Status
 /*!
-    Returns \c YES if there are any unsaved changes.
+    Returns <code>YES</code> if there are any unsaved changes.
 */
 - (BOOL)isDocumentEdited
 {
@@ -669,7 +548,7 @@ var CPDocumentUntitledCount = 0;
 
 // Working with Undo Manager
 /*!
-    Returns \c YES if the document has a
+    Returns <code>YES</code> if the document has a
     CPUndoManager.
 */
 - (BOOL)hasUndoManager
@@ -679,7 +558,7 @@ var CPDocumentUntitledCount = 0;
 
 /*!
     Sets whether the document should have a CPUndoManager.
-    @param aFlag \c YES makes the document have an undo manager
+    @param aFlag <code>YES</code> makes the document have an undo manager
 */
 - (void)setHasUndoManager:(BOOL)aFlag
 {
@@ -763,7 +642,7 @@ var CPDocumentUntitledCount = 0;
 
 /*!
     Returns the document's undo manager. If the document
-    should have one, but the manager is \c nil, it
+    should have one, but the manager is <code>nil</code>, it
     will be created and then returned.
     @return the document's undo manager
 */
@@ -787,16 +666,11 @@ var CPDocumentUntitledCount = 0;
 // Handling User Actions
 /*!
     Saves the document. If the document does not
-    have a file path to save to (\c fileURL)
-    then \c -saveDocumentAs: will be called.
+    have a file path to save to (<code>fileURL</code>)
+    then <code>saveDocumentAs:</code> will be called.
     @param aSender the object requesting the save
 */
 - (void)saveDocument:(id)aSender
-{
-    [self saveDocumentWithDelegate:nil didSaveSelector:nil contextInfo:nil];
-}
-
-- (void)saveDocumentWithDelegate:(id)delegate didSaveSelector:(SEL)didSaveSelector contextInfo:(Object)contextInfo
 {
     if (_fileURL)
     {
@@ -804,10 +678,10 @@ var CPDocumentUntitledCount = 0;
             postNotificationName:CPDocumentWillSaveNotification
                           object:self];
         
-        [self saveToURL:_fileURL ofType:[self fileType] forSaveOperation:CPSaveOperation delegate:delegate didSaveSelector:didSaveSelector contextInfo:contextInfo];
+        [self saveToURL:_fileURL ofType:[self fileType] forSaveOperation:CPSaveOperation delegate:self didSaveSelector:@selector(document:didSave:contextInfo:) contextInfo:NULL];
     }
     else
-        [self _saveDocumentAsWithDelegate:delegate didSaveSelector:didSaveSelector contextInfo:contextInfo];
+        [self saveDocumentAs:self];
 }
 
 /*!
@@ -816,30 +690,22 @@ var CPDocumentUntitledCount = 0;
 */
 - (void)saveDocumentAs:(id)aSender
 {
-    [self _saveDocumentAsWithDelegate:nil didSaveSelector:nil contextInfo:nil];
-}
+    _documentName = window.prompt("Document Name:");
 
-- (void)_saveDocumentAsWithDelegate:(id)delegate didSaveSelector:(SEL)didSaveSelector contextInfo:(Object)contextInfo
-{
-    var savePanel = [CPSavePanel savePanel],
-        response = [savePanel runModal];
-
-    if (!response)
+    if (!_documentName)
         return;
-
-    var saveURL = [savePanel URL];
-
+        
     [[CPNotificationCenter defaultCenter]
         postNotificationName:CPDocumentWillSaveNotification
                       object:self];
-
-    [self saveToURL:saveURL ofType:[self fileType] forSaveOperation:CPSaveAsOperation delegate:delegate didSaveSelector:didSaveSelector contextInfo:contextInfo];
+    
+    [self saveToURL:[self proposedFileURL] ofType:[self fileType] forSaveOperation:CPSaveAsOperation delegate:self didSaveSelector:@selector(document:didSave:contextInfo:) contextInfo:NULL];
 }
 
 /*
     @ignore
 */
-- (void)_sendDocumentSavedNotification:(BOOL)didSave
+- (void)document:(id)aDocument didSave:(BOOL)didSave contextInfo:(id)aContextInfo
 {
     if (didSave)
         [[CPNotificationCenter defaultCenter]
@@ -853,71 +719,6 @@ var CPDocumentUntitledCount = 0;
 
 @end
 
-@implementation CPDocument (ClosingDocuments)
-
-- (void)close
-{
-    [_windowControllers makeObjectsPerformSelector:@selector(removeDocumentAndCloseIfNecessary:) withObject:self];
-    [[CPDocumentController sharedDocumentController] removeDocument:self];
-}
-
-- (void)shouldCloseWindowController:(CPWindowController)controller delegate:(id)delegate shouldCloseSelector:(SEL)selector contextInfo:(Object)info 
-{
-    if ([controller shouldCloseDocument] || ([_windowControllers count] < 2 && [_windowControllers indexOfObject:controller] !== CPNotFound))
-        [self canCloseDocumentWithDelegate:self shouldCloseSelector:@selector(_document:shouldClose:context:) contextInfo:{delegate:delegate, selector:selector, context:info}];
-
-    else if ([delegate respondsToSelector:selector])
-        objj_msgSend(delegate, selector, self, YES, info);
-}
-
-- (void)_document:(CPDocument)aDocument shouldClose:(BOOL)shouldClose context:(Object)context
-{
-    if (aDocument === self && shouldClose)
-        [self close];
-
-    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] && objj_msgSend(aDelegate, aSelector, self, YES, context);
-
-    _canCloseAlert = [[CPAlert alloc] init];
-
-    [_canCloseAlert setDelegate:self];
-    [_canCloseAlert setAlertStyle:CPWarningAlertStyle];
-    [_canCloseAlert setTitle:@"Unsaved Document"];
-    [_canCloseAlert setMessageText:@"Do you want to save the changes you've made to the document \"" + ([self displayName] || [self fileName]) + "\"?"];
-
-    [_canCloseAlert addButtonWithTitle:@"Save"];
-    [_canCloseAlert addButtonWithTitle:@"Cancel"];
-    [_canCloseAlert addButtonWithTitle:@"Don't Save"];
-
-    _canCloseAlert._context = {delegate:aDelegate, selector:aSelector, context:context};
-
-    [_canCloseAlert runModal];
-}
-
-- (void)alertDidEnd:(CPAlert)alert returnCode:(int)returnCode
-{
-    if (alert !== _canCloseAlert)
-        return;
-
-    var delegate = alert._context.delegate,
-        selector = alert._context.selector,
-        context = alert._context.context;
-
-    if (returnCode === 0)
-        [self saveDocumentWithDelegate:delegate didSaveSelector:selector contextInfo:context];
-    else
-        objj_msgSend(delegate, selector, self, returnCode === 2, context);
-
-    _canCloseAlert = nil;
-}
-
-@end
-
 var _CPReadSessionMake = function(aType, aDelegate, aDidReadSelector, aContextInfo)
 {
     return { fileType:aType, delegate:aDelegate, didReadSelector:aDidReadSelector, contextInfo:aContextInfo };

AppKit/CPDocumentController.j

@@ -24,7 +24,6 @@
 @import <Foundation/CPBundle.j>
 
 @import "CPDocument.j"
-@import "CPOpenPanel.j";
 
 
 var CPSharedDocumentController = nil;
@@ -79,7 +78,7 @@ var CPSharedDocumentController = nil;
     method searches documents already open. It does not
     open the document at the URL if it is not already open.
     @param aURL the url of the document
-    @return the document, or \c nil if such a document is not open
+    @return the document, or <code>nil</code> if such a document is not open
 */
 - (CPDocument)documentForURL:(CPURL)aURL
 {
@@ -114,7 +113,7 @@ var CPSharedDocumentController = nil;
         [theDocument makeWindowControllers];
         [theDocument showWindows];
     }
-
+        
     return theDocument;
 }
 
@@ -139,21 +138,16 @@ var CPSharedDocumentController = nil;
 - (CPDocument)openDocumentWithContentsOfURL:(CPURL)anAbsoluteURL display:(BOOL)shouldDisplay error:(CPError)anError
 {
     var result = [self documentForURL:anAbsoluteURL];
-
+    
     if (!result)
     {
         var type = [self typeForContentsOfURL:anAbsoluteURL error:anError];
-
+        
         result = [self makeDocumentWithContentsOfURL:anAbsoluteURL ofType:type delegate:self didReadSelector:@selector(document:didRead:contextInfo:) contextInfo:[CPDictionary dictionaryWithObject:shouldDisplay forKey:@"shouldDisplay"]];
-
-        [self addDocument:result];
-
-        if (result)
-            [self noteNewRecentDocument:result];
     }
     else if (shouldDisplay)
         [result showWindows];
-
+    
     return result;
 }
 
@@ -163,7 +157,7 @@ var CPSharedDocumentController = nil;
     @param anAbsoluteURL the document URL
     @param absoluteContentsURL the location of the document's contents
     @param anError not used
-    @return the loaded document or \c nil if there was an error
+    @return the loaded document or <code>nil</code> if there was an error
 */
 - (CPDocument)reopenDocumentForURL:(CPURL)anAbsoluteURL withContentsOfURL:(CPURL)absoluteContentsURL error:(CPError)anError
 {
@@ -193,7 +187,7 @@ var CPSharedDocumentController = nil;
     @param aDelegate receives a callback after the load has completed
     @param aSelector the selector to invoke for the callback
     @param aContextInfo an object passed as an argument for the callback
-    @return a new document or \c nil if there was an error
+    @return a new document or <code>nil</code> if there was an error
 */
 - (CPDocument)makeDocumentForURL:(CPURL)anAbsoluteURL withContentsOfURL:(CPURL)absoluteContentsURL ofType:(CPString)aType delegate:(id)aDelegate didReadSelector:(SEL)aSelector contextInfo:(id)aContextInfo
 {
@@ -209,6 +203,7 @@ var CPSharedDocumentController = nil;
     if (!didRead)
         return;
 
+    [self addDocument:aDocument];
     [aDocument makeWindowControllers];
     
     if ([aContextInfo objectForKey:@"shouldDisplay"])
@@ -224,20 +219,6 @@ var CPSharedDocumentController = nil;
     [self openUntitledDocumentOfType:[[_documentTypes objectAtIndex:0] objectForKey:@"CPBundleTypeName"] display:YES];
 }
 
--(void)openDocument:(id)aSender
-{
-    var openPanel = [CPOpenPanel openPanel];
-
-    [openPanel runModal];
-
-    var URLs = [openPanel URLs],
-        index = 0,
-        count = [URLs count];
-
-    for (; index < count; ++index)
-        [self openDocumentWithContentsOfURL:[CPURL URLWithString:URLs[index]] display:YES error:nil];
-}
-
 // Managing Documents
 
 /*!
@@ -250,7 +231,7 @@ var CPSharedDocumentController = nil;
 }
 
 /*!
-    Adds \c aDocument under the control of the receiver.
+    Adds <code>aDocument</code> under the control of the receiver.
     @param aDocument the document to add
 */
 - (void)addDocument:(CPDocument)aDocument
@@ -259,7 +240,7 @@ var CPSharedDocumentController = nil;
 }
 
 /*!
-    Removes \c aDocument from the control of the receiver.
+    Removes <code>aDocument</code> from the control of the receiver.
     @param aDocument the document to remove
 */
 - (void)removeDocument:(CPDocument)aDocument
@@ -277,8 +258,7 @@ var CPSharedDocumentController = nil;
     var index = 0,
         count = _documentTypes.length,
         
-        extension = [[anAbsoluteURL pathExtension] lowercaseString],
-        starType = nil;
+        extension = [[anAbsoluteURL pathExtension] lowercaseString];
     
     for (; index < count; ++index)
     {
@@ -288,17 +268,12 @@ var CPSharedDocumentController = nil;
             extensionCount = extensions.length;
         
         for (; extensionIndex < extensionCount; ++extensionIndex)
-        {
-            var thisExtension = [extensions[extensionIndex] lowercaseString];
-            if (thisExtension === extension)
+            if ([extensions[extensionIndex] lowercaseString] == extension)
                 return [documentType objectForKey:@"CPBundleTypeName"];
-
-            if (thisExtension === "****")
-                starType = [documentType objectForKey:@"CPBundleTypeName"];
-        }
     }
 
-    return starType || [self defaultType];
+    // FIXME?
+    return [self defaultType];//nil;
 }
 
 // Managing Document Types
@@ -321,9 +296,9 @@ var CPSharedDocumentController = nil;
 }
 
 /*!
-    Returns the CPDocument subclass associated with \c aType.
+    Returns the CPDocument subclass associated with <code>aType</code>.
     @param aType the type of document
-    @return a Cappuccino Class object, or \c nil if no match was found
+    @return a Cappuccino Class object, or <code>nil</code> if no match was found
 */
 - (Class)documentClassForType:(CPString)aType
 {
@@ -333,125 +308,3 @@ var CPSharedDocumentController = nil;
 }
 
 @end
-
-@implementation CPDocumentController (Closing)
-
-- (void)closeAllDocumentsWithDelegate:(id)aDelegate didCloseAllSelector:(SEL)didCloseSelector contextInfo:(Object)info 
-{
-    var context = {
-        delegate: aDelegate,
-        selector: didCloseSelector,
-        context: info
-    };
-
-    [self _closeDocumentsStartingWith:nil shouldClose:YES context:context];
-}
-
-// Recursive callback method. Start it by passing in a document of nil.
-- (void)_closeDocumentsStartingWith:(CPDocument)aDocument shouldClose:(BOOL)shouldClose context:(Object)context
-{
-    if (shouldClose)
-    {
-        [aDocument close];
-
-        if ([[self documents] count] > 0)
-        {
-            [[[self documents] lastObject] canCloseDocumentWithDelegate:self
-                                                    shouldCloseSelector:@selector(_closeDocumentsStartingWith:shouldClose:context:)
-                                                            contextInfo:context];
-            return;
-        }
-    }
-
-    if ([context.delegate respondsToSelector:context.selector])
-        objj_msgSend(context.delegate, context.selector, self, [[self documents] count] === 0, context.context);
-}
-
-@end
-
-@implementation CPDocumentController (Recents)
-
-- (CPArray)recentDocumentURLs
-{
-    // FIXME move this to CP land
-    if (typeof window["cpRecentDocumentURLs"] === 'function')
-        return window.cpRecentDocumentURLs();
-
-    return [];
-}
-
-- (void)clearRecentDocuments:(id)sender
-{
-    if (typeof window["cpClearRecentDocuments"] === 'function')
-        window.cpClearRecentDocuments();
-
-   [self _updateRecentDocumentsMenu];
-}
-
-- (void)noteNewRecentDocument:(CPDocument)aDocument
-{
-    [self noteNewRecentDocumentURL:[[aDocument fileURL] absoluteString]];
-}
-
-- (void)noteNewRecentDocumentURL:(CPString)aURL
-{
-    if (typeof window["cpNoteNewRecentDocumentPath"] === 'function')
-        window.cpNoteNewRecentDocumentPath(aURL);
-
-   [self _updateRecentDocumentsMenu];
-}
-
-- (void)_removeAllRecentDocumentsFromMenu:(CPMenu)aMenu
-{
-    var items = [aMenu itemArray],
-        count = [items count];
-
-    while (count--)
-    {
-        var item = items[count];
-
-        if ([item action] === @selector(_openRecentDocument:))
-            [aMenu removeItemAtIndex:count];
-    }
-}
-
-- (void)_updateRecentDocumentsMenu
-{
-    var menu = [[CPApp mainMenu] _menuWithName:@"_CPRecentDocumentsMenu"],
-        recentDocuments = [self recentDocumentURLs],
-        menuItems = [menu itemArray],
-        documentCount = [recentDocuments count],
-        menuItemCount = [menuItems count];
-
-    [self _removeAllRecentDocumentsFromMenu:menu];
-
-    if (menuItemCount)
-    {
-        if (!documentCount)
-        {
-            if ([menuItems[0] isSeparatorItem])
-                [menu removeItemAtIndex:0];
-        }
-        else
-        {
-            if (![menuItems[0] isSeparatorItem])
-                [menu insertItem:[CPMenuItem separatorItem] atIndex:0];
-        }
-    }
-
-    while (documentCount--)
-    {
-        var path = recentDocuments[documentCount],
-            item = [[CPMenuItem alloc] initWithTitle:[path lastPathComponent] action:@selector(_openRecentDocument:) keyEquivalent:nil];
-
-        [item setTag:path];
-        [menu insertItem:item atIndex:0];
-    }
-}
-
-- (void)_openRecentDocument:(id)sender
-{
-    [self openDocumentWithContentsOfURL:[sender tag] display:YES error:nil];
-}
-
-@end

AppKit/CPDragServer.j

@@ -26,28 +26,73 @@
 @import <AppKit/CPImageView.j>
 
 #import "CoreGraphics/CGGeometry.h"
-#import "Platform/Platform.h"
 
 
-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])
 
-var    CPDragServerPreviousEvent      = nil,
-CPDragServerAutoscrollInterval = nil;
-/*
+var CPSharedDragServer     = nil;
+    
+var CPDragServerView               = nil,
+    CPDragServerSource             = nil,
+    CPDragServerWindow             = nil,
+    CPDragServerOffset             = nil,
+    CPDragServerLocation           = nil,
+    CPDragServerPasteboard         = nil,
+    CPDragServerDestination        = nil,
+    CPDragServerDraggingInfo       = nil,
+    CPDragServerPreviousEvent      = nil,
+    CPDragServerAutoscrollInterval = nil;
+
+var CPDragServerIsDraggingImage                           = NO,
+
+    CPDragServerShouldSendDraggedViewMovedTo              = NO,
+    CPDragServerShouldSendDraggedImageMovedTo             = NO,
+    
+    CPDragServerShouldSendDraggedViewEndedAtOperation     = NO,
+    CPDragServerShouldSendDraggedImageEndedAtOperation    = NO;
+
 var CPDragServerAutoscroll = function()
 {
     [CPDragServerSource autoscroll:CPDragServerPreviousEvent];
 }
 
+var CPDragServerStartDragging = function(anEvent)
+{
+    CPDragServerUpdateDragging(anEvent);
+}
+
+var CPDragServerUpdateDragging = function(anEvent)
+{
+    // If this is a mouse up, then complete the drag.
+    if([anEvent type] == CPLeftMouseUp)
+    {
+        if (CPDragServerAutoscrollInterval !== nil)
+            clearInterval(CPDragServerAutoscrollInterval);
+
+        CPDragServerAutoscrollInterval = nil;
+
+        CPDragServerLocation = [DRAGGING_WINDOW(CPDragServerDestination) convertBridgeToBase:[[anEvent window] convertBaseToBridge:[anEvent locationInWindow]]];
+        
+        [CPDragServerView removeFromSuperview];
+        [CPSharedDragServer._dragWindow orderOut:nil];
+
+        if (CPDragServerDestination && 
+            (![CPDragServerDestination respondsToSelector:@selector(prepareForDragOperation:)] || [CPDragServerDestination prepareForDragOperation:CPDragServerDraggingInfo]) && 
+            (![CPDragServerDestination respondsToSelector:@selector(performDragOperation:)] || [CPDragServerDestination performDragOperation:CPDragServerDraggingInfo]) &&
+            [CPDragServerDestination respondsToSelector:@selector(concludeDragOperation:)])
+            [CPDragServerDestination concludeDragOperation:CPDragServerDraggingInfo];
+ 
+        if (CPDragServerShouldSendDraggedImageEndedAtOperation)
+            [CPDragServerSource draggedImage:[CPDragServerView image] endedAt:CPDragServerLocation operation:NO];
+        else if (CPDragServerShouldSendDraggedViewEndedAtOperation)
+            [CPDragServerSource draggedView:CPDragServerView endedAt:CPDragServerLocation operation:NO];
+        
+        CPDragServerIsDraggingImage = NO;
+        CPDragServerDestination = nil;
+
+        return;
+    }
+
     if (CPDragServerAutoscrollInterval === nil)
     {
         if ([CPDragServerSource respondsToSelector:@selector(autoscroll:)])
@@ -56,16 +101,43 @@ var CPDragServerAutoscroll = function()
 
     CPDragServerPreviousEvent = anEvent;
 
-        if (CPDragServerAutoscrollInterval !== nil)
-            clearInterval(CPDragServerAutoscrollInterval);
+    // If we're not a mouse up, then we're going to want to grab the next event.
+    [CPApp setCallback:CPDragServerUpdateDragging 
+        forNextEventMatchingMask:CPMouseMovedMask | CPLeftMouseDraggedMask | CPLeftMouseUpMask
+        untilDate:nil inMode:0 dequeue:NO];
 
-        CPDragServerAutoscrollInterval = nil;
-*/
+    var location = [anEvent locationInWindow],
+        operation = 
+        bridgeLocation = [[anEvent window] convertBaseToBridge:location];
 
-var CPSharedDragServer     = nil;
-
-var CPDragServerSource             = nil;
-var CPDragServerDraggingInfo       = nil;
+    // We have to convert base to bridge since the drag event comes from the source window, not the drag window.
+    var draggingDestination = [[CPDOMWindowBridge sharedDOMWindowBridge] _dragHitTest:bridgeLocation pasteboard:CPDragServerPasteboard];
+    
+    CPDragServerLocation = [DRAGGING_WINDOW(draggingDestination) convertBridgeToBase:bridgeLocation];
+    
+    if(draggingDestination != CPDragServerDestination) 
+    {
+        if (CPDragServerDestination && [CPDragServerDestination respondsToSelector:@selector(draggingExited:)])
+            [CPDragServerDestination draggingExited:CPDragServerDraggingInfo];
+        
+        CPDragServerDestination = draggingDestination;
+        
+        if (CPDragServerDestination && [CPDragServerDestination respondsToSelector:@selector(draggingEntered:)])
+            [CPDragServerDestination draggingEntered:CPDragServerDraggingInfo];
+    }
+    else if (CPDragServerDestination && [CPDragServerDestination respondsToSelector:@selector(draggingUpdated:)])
+        [CPDragServerDestination draggingUpdated:CPDragServerDraggingInfo];
+    
+    location.x -= CPDragServerOffset.x;
+    location.y -= CPDragServerOffset.y;
+    
+    [CPDragServerView setFrameOrigin:location];
+    
+    if (CPDragServerShouldSendDraggedImageMovedTo)
+        [CPDragServerSource draggedImage:[CPDragServerView image] movedTo:location];
+    else if (CPDragServerShouldSendDraggedViewMovedTo)
+        [CPDragServerSource draggedView:CPDragServerView movedTo:location];
+}
 
 /*
     CPDraggingInfo is a container of information about a specific dragging session.
@@ -75,36 +147,24 @@ var CPDragServerDraggingInfo       = nil;
 {
 }
 
-- (CPPasteboard)draggingPasteboard
-{
-    if ([CPPlatform supportsDragAndDrop])
-        return [_CPDOMDataTransferPasteboard DOMDataTransferPasteboard];
-
-    return [[CPDragServer sharedDragServer] draggingPasteboard];
-}
-
 - (id)draggingSource
 {
-    return [[CPDragServer sharedDragServer] draggingSource];
+    return CPDragServerSource;
 }
 
-/*
-- (unsigned)draggingSourceOperationMask
-*/
-
 - (CPPoint)draggingLocation
 {
-    return [[CPDragServer sharedDragServer] draggingLocation];
+    return CPDragServerLocation;
 }
 
-- (CPWindow)draggingDestinationWindow
+- (CPPasteboard)draggingPasteboard
 {
-    return DRAGGING_WINDOW([[CPDragServer sharedDragServer] draggingDestination]);
+    return CPDragServerPasteboard;
 }
 
 - (CPImage)draggedImage
 {
-    return [[self draggedView] image];
+    return [CPDragServerView image];
 }
 
 - (CGPoint)draggedImageLocation
@@ -112,48 +172,22 @@ var CPDragServerDraggingInfo       = nil;
     return [self draggedViewLocation];
 }
 
-- (CPView)draggedView
-{
-    return [[CPDragServer sharedDragServer] draggedView];
-}
-
 - (CGPoint)draggedViewLocation
 {
-    var dragServer = [CPDragServer sharedDragServer];
+    return [DRAGGING_WINDOW(CPDragServerDestination) convertBridgeToBase:[CPDragServerView frame].origin];
+}
 
-    return [DRAGGING_WINDOW([dragServer draggingDestination]) convertPlatformWindowToBase:[[dragServer draggedView] frame].origin];
+- (CPView)draggedView
+{
+    return CPDragServerView;
 }
 
 @end
 
-var CPDraggingSource_draggedImage_movedTo_          = 1 << 0,
-    CPDraggingSource_draggedImage_endAt_operation_  = 1 << 1,
-    CPDraggingSource_draggedView_movedTo_           = 1 << 2,
-    CPDraggingSource_draggedView_endedAt_operation_ = 1 << 3;
-
 @implementation CPDragServer : CPObject
 {
-    BOOL            _isDragging @accessors(readonly, getter=isDragging);
-
-    CPWindow        _draggedWindow @accessors(readonly, getter=draggedWindow);
-    CPView          _draggedView @accessors(readonly, getter=draggedView);
-    CPImageView     _imageView;
-
-    BOOL            _isDraggingImage;
-
-    CGSize          _draggingOffset @accessors(readonly, getter=draggingOffset);
-
-    CPPasteboard    _draggingPasteboard @accessors(readonly, getter=draggingPasteboard);
-
-    id              _draggingSource @accessors(readonly, getter=draggingSource);
-    unsigned        _implementedDraggingSourceMethods;
-
-    CGPoint         _draggingLocation;
-    id              _draggingDestination;
-
-    CGPoint         _startDragLocation;
-    BOOL            _shouldSlideBack;
-    unsigned        _dragOperation;
+    CPWindow    _dragWindow;
+    CPImageView _imageView;
 }
 
 /*
@@ -162,9 +196,9 @@ var CPDraggingSource_draggedImage_movedTo_          = 1 << 0,
 */
 + (void)initialize
 {
-    if (self !== [CPDragServer class])
+    if (self != [CPDragServer class])
         return;
-
+    
     CPDragServerDraggingInfo = [[CPDraggingInfo alloc] init];
 }
 
@@ -172,7 +206,7 @@ var CPDraggingSource_draggedImage_movedTo_          = 1 << 0,
 {
     if (!CPSharedDragServer)
         CPSharedDragServer = [[CPDragServer alloc] init];
-
+        
     return CPSharedDragServer;
 }
 
@@ -182,108 +216,16 @@ var CPDraggingSource_draggedImage_movedTo_          = 1 << 0,
 - (id)init
 {
     self = [super init];
-
+    
     if (self)
     {
-        _draggedWindow = [[CPWindow alloc] initWithContentRect:_CGRectMakeZero() styleMask:CPBorderlessWindowMask];
-
-        [_draggedWindow setLevel:CPDraggingWindowLevel];
+        _dragWindow = [[CPWindow alloc] initWithContentRect:CPRectMakeZero() styleMask:CPBorderlessWindowMask];
+        [_dragWindow setLevel:CPDraggingWindowLevel];
     }
-
+    
     return self;
 }
 
-- (id)draggingDestination
-{
-    return _draggingDestination;
-}
-
-- (CGPoint)draggingLocation
-{
-    return _draggingLocation
-}
-
-- (void)draggingStartedInPlatformWindow:(CPPlatformWindow)aPlatformWindow globalLocation:(CGPoint)aLocation
-{
-    if (_isDraggingImage)
-    {
-        if ([_draggingSource respondsToSelector:@selector(draggedImage:beganAt:)])
-            [_draggingSource draggedImage:[_draggedView image] beganAt:aLocation];
-    }
-    else
-    {
-        if ([_draggingSource respondsToSelector:@selector(draggedView:beganAt:)])
-            [_draggingSource draggedView:_draggedView beganAt:aLocation];
-    }
-
-    if (![CPPlatform supportsDragAndDrop])
-        [_draggedWindow orderFront:self];
-}
-
-- (void)draggingSourceUpdatedWithGlobalLocation:(CGPoint)aGlobalLocation
-{
-    if (![CPPlatform supportsDragAndDrop])
-        [_draggedWindow setFrameOrigin:_CGPointMake(aGlobalLocation.x - _draggingOffset.width, aGlobalLocation.y - _draggingOffset.height)];
-
-    if (_implementedDraggingSourceMethods & CPDraggingSource_draggedImage_movedTo_)
-        [_draggingSource draggedImage:[_draggedView image] movedTo:aGlobalLocation];
-
-    else if (_implementedDraggingSourceMethods & CPDraggingSource_draggedView_movedTo_)
-        [_draggingSource draggedView:_draggedView movedTo:aGlobalLocation];
-}
-
-- (CPDragOperation)draggingUpdatedInPlatformWindow:(CPPlatformWindow)aPlatformWindow location:(CGPoint)aLocation
-{
-    var dragOperation = CPDragOperationCopy;
-    // We have to convert base to bridge since the drag event comes from the source window, not the drag window.
-    var draggingDestination = [aPlatformWindow _dragHitTest:aLocation pasteboard:[CPDragServerDraggingInfo draggingPasteboard]];
-
-    if (draggingDestination)
-        _draggingLocation = [DRAGGING_WINDOW(draggingDestination) convertPlatformWindowToBase:aLocation];
-
-    if(draggingDestination !== _draggingDestination)
-    {
-        if (_draggingDestination && [_draggingDestination respondsToSelector:@selector(draggingExited:)])
-            [_draggingDestination draggingExited:CPDragServerDraggingInfo];
-
-        _draggingDestination = draggingDestination;
-
-        if (_draggingDestination && [_draggingDestination respondsToSelector:@selector(draggingEntered:)])
-            dragOperation = [_draggingDestination draggingEntered:CPDragServerDraggingInfo];
-    }
-    else if (_draggingDestination && [_draggingDestination respondsToSelector:@selector(draggingUpdated:)])
-        dragOperation = [_draggingDestination draggingUpdated:CPDragServerDraggingInfo];
-
-    if (!_draggingDestination)
-        dragOperation = CPDragOperationNone;
-
-    return dragOperation;
-}
-
-- (void)draggingEndedInPlatformWindow:(CPPlatformWindow)aPlatformWindow globalLocation:(CGPoint)aLocation operation:(CPDragOperation)anOperation
-{
-    [_draggedView removeFromSuperview];
-
-    if (![CPPlatform supportsDragAndDrop])
-        [_draggedWindow orderOut:self];
-
-    if (_implementedDraggingSourceMethods & CPDraggingSource_draggedImage_endAt_operation_)
-        [_draggingSource draggedImage:[_draggedView image] endedAt:aLocation operation:anOperation];
-    else if (_implementedDraggingSourceMethods & CPDraggingSource_draggedView_endedAt_operation_)
-        [_draggingSource draggedView:_draggedView endedAt:aLocation operation:anOperation];
-
-    _isDragging = NO;
-}
-
-- (void)performDragOperationInPlatformWindow:(CPPlatformWindow)aPlatformWindow
-{
-    if (_draggingDestination && 
-        (![_draggingDestination respondsToSelector:@selector(prepareForDragOperation:)] || [_draggingDestination prepareForDragOperation:CPDragServerDraggingInfo]) && 
-        (![_draggingDestination respondsToSelector:@selector(performDragOperation:)] || [_draggingDestination performDragOperation:CPDragServerDraggingInfo]) &&
-        [_draggingDestination respondsToSelector:@selector(concludeDragOperation:)])
-        [_draggingDestination concludeDragOperation:CPDragServerDraggingInfo];
-}
-
 /*!
     Initiates a drag session.
     @param aView the view being dragged
@@ -293,72 +235,50 @@ var CPDraggingSource_draggedImage_movedTo_          = 1 << 0,
     @param anEvent
     @param aPasteboard the pasteboard that contains the drag data
     @param aSourceObject the object where the drag started
-    @param slideBack if \c YES, \c aView slides back to
+    @param slideBack if <code>YES</code>, <code>aView</code> slides back to
     its origin on a failed drop
 */
-- (void)dragView:(CPView)aView fromWindow:(CPWindow)aWindow at:(CGPoint)viewLocation offset:(CGSize)mouseOffset event:(CPEvent)mouseDownEvent pasteboard:(CPPasteboard)aPasteboard source:(id)aSourceObject slideBack:(BOOL)slideBack
+- (void)dragView:(CPView)aView fromWindow:(CPWindow)aWindow at:(CGPoint)viewLocation offset:(CGSize)mouseOffset event:(CPEvent)anEvent pasteboard:(CPPasteboard)aPasteboard source:(id)aSourceObject slideBack:(BOOL)slideBack
 {
-    _isDragging = YES;
+    var eventLocation = [anEvent locationInWindow];
+    
+    CPDragServerView = aView;
+    CPDragServerSource = aSourceObject;
+    CPDragServerWindow = aWindow;
+    CPDragServerOffset = CPPointMake(eventLocation.x - viewLocation.x, eventLocation.y - viewLocation.y);
+    CPDragServerPasteboard = [CPPasteboard pasteboardWithName:CPDragPboard];//aPasteboard;
 
-    _draggedView = aView;
-    _draggingPasteboard = aPasteboard || [CPPasteboard pasteboardWithName:CPDragPboard];
-    _draggingSource = aSourceObject;
-    _draggingDestination = nil;
-    _shouldSlideBack = slideBack;
+    [_dragWindow setFrameSize:CGSizeMakeCopy([[CPDOMWindowBridge sharedDOMWindowBridge] frame].size)];
+    [_dragWindow orderFront:self];
 
-    // The offset is based on the distance from where we want the view to be initially from where the mouse is initially
-    // Hence the use of mouseDownEvent's location and view's location in global coordinates.
-    var mouseDownWindow = [mouseDownEvent window],
-        mouseDownEventLocation = [mouseDownEvent locationInWindow];
+    [aView setFrameOrigin:viewLocation];
+    [[_dragWindow contentView] addSubview:aView];
 
-    if (mouseDownEventLocation)
+    if (CPDragServerIsDraggingImage)
     {
-        if (mouseDownWindow)
-            mouseDownEventLocation = [mouseDownWindow convertBaseToGlobal:mouseDownEventLocation];
-
-        _draggingOffset = _CGSizeMake(mouseDownEventLocation.x - viewLocation.x, mouseDownEventLocation.y - viewLocation.y);
-    }
-    else
-        _draggingOffset = _CGSizeMakeZero();
-
-    if ([CPPlatform isBrowser])
-        [_draggedWindow setPlatformWindow:[aWindow platformWindow]];
-
-    [aView setFrameOrigin:_CGPointMakeZero()];
-
-    var mouseLocation = [CPEvent mouseLocation];
-
-    // Place it where the mouse pointer is.
-    _startDragLocation = _CGPointMake(mouseLocation.x - _draggingOffset.width, mouseLocation.y - _draggingOffset.height);
-    [_draggedWindow setFrameOrigin:_startDragLocation];
-    [_draggedWindow setFrameSize:[aView frame].size];
-
-    [[_draggedWindow contentView] addSubview:aView];
-
-    _implementedDraggingSourceMethods = 0;
-
-    if (_draggedView === _imageView)
-    {
-        if ([_draggingSource respondsToSelector:@selector(draggedImage:movedTo:)])
-            _implementedDraggingSourceMethods |= CPDraggingSource_draggedImage_movedTo_;
-
-        if ([_draggingSource respondsToSelector:@selector(draggedImage:endAt:operation:)])
-            _implementedDraggingSourceMethods |= CPDraggingSource_draggedImage_endAt_operation_;
+        if ([CPDragServerSource respondsToSelector:@selector(draggedImage:beganAt:)])
+            [CPDragServerSource draggedImage:[aView image] beganAt:viewLocation];
+        
+        CPDragServerShouldSendDraggedImageMovedTo = [CPDragServerSource respondsToSelector:@selector(draggedImage:movedTo:)];
+        CPDragServerShouldSendDraggedImageEndedAtOperation = [CPDragServerSource respondsToSelector:@selector(draggedImage:endAt:operation:)];
+        
+        CPDragServerShouldSendDraggedViewMovedTo = NO;
+        CPDragServerShouldSendDraggedViewEndedAtOperation = NO;
     }
     else
     {
-        if ([_draggingSource respondsToSelector:@selector(draggedView:movedTo:)])
-            _implementedDraggingSourceMethods |= CPDraggingSource_draggedView_movedTo_;
+        if ([CPDragServerSource respondsToSelector:@selector(draggedView:beganAt:)])
+            [CPDragServerSource draggedView:aView beganAt:viewLocation];
+     
+        CPDragServerShouldSendDraggedViewMovedTo = [CPDragServerSource respondsToSelector:@selector(draggedView:movedTo:)];
+        CPDragServerShouldSendDraggedViewEndedAtOperation = [CPDragServerSource respondsToSelector:@selector(draggedView:endedAt:operation:)];
+        
 
-        if ([_draggingSource respondsToSelector:@selector(draggedView:endedAt:operation:)])
-            _implementedDraggingSourceMethods |= CPDraggingSource_draggedView_endedAt_operation_;
+        CPDragServerShouldSendDraggedImageMovedTo = NO;
+        CPDragServerShouldSendDraggedImageEndedAtOperation = NO;
     }
 
-    if (![CPPlatform supportsDragAndDrop])
-    {
-        [self draggingStartedInPlatformWindow:[aWindow platformWindow] globalLocation:mouseLocation];
-        [self trackDragging:mouseDownEvent];
-    }
+    CPDragServerStartDragging(anEvent);
 }
 
 /*!
@@ -370,50 +290,22 @@ var CPDraggingSource_draggedImage_movedTo_          = 1 << 0,
     @param anEvent
     @param aPasteboard the pasteboard where the drag data is located
     @param aSourceObject the object where the drag started
-    @param slideBack if \c YES, \c aView slides back to
+    @param slideBack if <code>YES</code>, <code>aView</code> slides back to
     its origin on a failed drop
 */
 - (void)dragImage:(CPImage)anImage fromWindow:(CPWindow)aWindow at:(CGPoint)imageLocation offset:(CGSize)mouseOffset event:(CPEvent)anEvent pasteboard:(CPPasteboard)aPasteboard source:(id)aSourceObject slideBack:(BOOL)slideBack
 {
-    _isDraggingImage = YES;
-
-    var imageSize = [anImage size];
-
+    CPDragServerIsDraggingImage = YES;
+    
     if (!_imageView)
-        _imageView = [[CPImageView alloc] initWithFrame:_CGRectMake(0.0, 0.0, imageSize.width, imageSize.height)];
-
+        _imageView = [[CPImageView alloc] initWithFrame:CPRectMakeZero()];
+    
     [_imageView setImage:anImage];
-
+    [_imageView setFrameSize:CGSizeMakeCopy([anImage size])];
+    
     [self dragView:_imageView fromWindow:aWindow at:imageLocation offset:mouseOffset event:anEvent pasteboard:aPasteboard source:aSourceObject slideBack:slideBack];
 }
 
-- (void)trackDragging:(CPEvent)anEvent
-{
-    var type = [anEvent type],
-        platformWindow = [_draggedWindow platformWindow],
-        platformWindowLocation = [[anEvent window] convertBaseToPlatformWindow:[anEvent locationInWindow]];
-
-    if (type === CPLeftMouseUp)
-    {
-        // Make sure we do not finalize (cancel) the drag if the last drag update was disallowed
-        if (_dragOperation !== CPDragOperationNone)
-            [self performDragOperationInPlatformWindow:platformWindow];
-
-        [self draggingEndedInPlatformWindow:platformWindow globalLocation:platformWindowLocation operation:_dragOperation];
-
-        // Stop tracking events.
-        return;
-    }
-
-    [self draggingSourceUpdatedWithGlobalLocation:platformWindowLocation];
-    _dragOperation = [self draggingUpdatedInPlatformWindow:platformWindow location:platformWindowLocation];
-
-    // 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
-        untilDate:nil inMode:0 dequeue:NO];
-}
-
 @end
 
 @implementation CPWindow (CPDraggingAdditions)
@@ -426,23 +318,23 @@ var CPDraggingSource_draggedImage_movedTo_          = 1 << 0,
         return nil;
 
 // We don't need to do this because the only place this gets called
-// -_dragHitTest: in CPPlatformWindow does this already. Perhaps to
+// -_dragHitTest: in CPDOMWindowBridge does this already. Perhaps to
 // be safe?
 //    if (![self containsPoint:aPoint])
 //        return nil;
 
-    var adjustedPoint = [self convertPlatformWindowToBase:aPoint],
+    var adjustedPoint = _CGPointMake(aPoint.x - _CGRectGetMinX(_frame), aPoint.y - _CGRectGetMinY(_frame)),
         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;
 }
 

AppKit/CPEvent.j

@@ -25,26 +25,110 @@
 #include "CoreGraphics/CGGeometry.h"
 
 
+/*
+    @global
+    @group CPEventType
+*/
 CPLeftMouseDown                         = 1;
+/*
+    @global
+    @group CPEventType
+*/
 CPLeftMouseUp                           = 2;
+/*
+    @global
+    @group CPEventType
+*/
 CPRightMouseDown                        = 3;
+/*
+    @global
+    @group CPEventType
+*/
 CPRightMouseUp                          = 4;
+/*
+    @global
+    @group CPEventType
+*/
 CPMouseMoved                            = 5;
+/*
+    @global
+    @group CPEventType
+*/
 CPLeftMouseDragged                      = 6;
+/*
+    @global
+    @group CPEventType
+*/
 CPRightMouseDragged                     = 7;
+/*
+    @global
+    @group CPEventType
+*/
 CPMouseEntered                          = 8;
+/*
+    @global
+    @group CPEventType
+*/
 CPMouseExited                           = 9;
+/*
+    @global
+    @group CPEventType
+*/
 CPKeyDown                               = 10;
+/*
+    @global
+    @group CPEventType
+*/
 CPKeyUp                                 = 11;
+/*
+    @global
+    @group CPEventType
+*/
 CPFlagsChanged                          = 12;
+/*
+    @global
+    @group CPEventType
+*/
 CPAppKitDefined                         = 13;
+/*
+    @global
+    @group CPEventType
+*/
 CPSystemDefined                         = 14;
+/*
+    @global
+    @group CPEventType
+*/
 CPApplicationDefined                    = 15;
+/*
+    @global
+    @group CPEventType
+*/
 CPPeriodic                              = 16;
+/*
+    @global
+    @group CPEventType
+*/
 CPCursorUpdate                          = 17; 
+/*
+    @global
+    @group CPEventType
+*/
 CPScrollWheel                           = 22;
+/*
+    @global
+    @group CPEventType
+*/
 CPOtherMouseDown                        = 25;
+/*
+    @global
+    @group CPEventType
+*/
 CPOtherMouseUp                          = 26;
+/*
+    @global
+    @group CPEventType
+*/
 CPOtherMouseDragged                     = 27;
 
 // iPhone Event Types
@@ -137,16 +221,16 @@ var _CPEventPeriodicEventPeriod         = 0,
 /*!
     Creates a new keyboard event.
     @param anEventType the event type. Must be one of CPKeyDown, CPKeyUp or CPFlagsChanged
-    @param aPoint the location of the cursor in the window specified by \c aWindowNumber
+    @param aPoint the location of the cursor in the window specified by <code>aWindowNumber</code>
     @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 characters the characters associated with the event
     @param unmodCharacters the string of keys pressed without the presence of any modifiers other than Shift
-    @param repeatKey \c YES if this is caused by the system repeat as opposed to the user pressing the key again
+    @param repeatKey <code>YES</code> if this is caused by the system repeat as opposed to the user pressing the key again
     @param code a number associated with the keyboard key of this event
-    @throws CPInternalInconsistencyException if \c anEventType is not a CPKeyDown,
+    @throws CPInternalInconsistencyException if <code>anEventType</code> is not a CPKeyDown,
     CPKeyUp or CPFlagsChanged
     @return the keyboard event
 */
@@ -162,7 +246,7 @@ var _CPEventPeriodicEventPeriod         = 0,
 /*!
     Creates a new mouse event
     @param anEventType the event type
-    @param aPoint the location of the cursor in the window specified by \c aWindowNumber
+    @param aPoint the location of the cursor in the window specified by <code>aWindowNumber</code>
     @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
@@ -184,7 +268,7 @@ var _CPEventPeriodicEventPeriod         = 0,
 /*!
     Creates a new custom event
     @param anEventType the event type. Must be one of CPAppKitDefined, CPSystemDefined, CPApplicationDefined or CPPeriodic
-    @param aLocation the location of the cursor in the window specified by \c aWindowNumber
+    @param aLocation the location of the cursor in the window specified by <code>aWindowNumber</code>
     @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
@@ -274,26 +358,15 @@ var _CPEventPeriodicEventPeriod         = 0,
 
 /*!
     Returns the location of the mouse (for mouse events).
-    If this is not a mouse event, it returns \c nil.
-    If \c window returns \c nil, then
+    If this is not a mouse event, it returns <code>nil</code>.
+    If <code>window</code> returns <code>nil</code>, then
     the mouse coordinates will be based on the screen coordinates.
     Otherwise, the coordinates are relative to the window's coordinates.
-    @return the location of the mouse, or \c nil for non-mouse events.
+    @return the location of the mouse, or <code>nil</code> for non-mouse events.
 */
 - (CGPoint)locationInWindow
 {
-    return _CGPointMakeCopy(_location);
-}
-
-- (CGPoint)globalLocation
-{
-    var theWindow = [self window],
-        location = [self locationInWindow];
-
-    if (theWindow)
-        return [theWindow convertBaseToGlobal:location];
-
-    return location;
+    return _location;
 }
 
 /*!
@@ -375,7 +448,7 @@ var _CPEventPeriodicEventPeriod         = 0,
 }
 
 /*!
-    Returns \c YES if the keyboard event was caused by the key being held down.
+    Returns <code>YES</code> if the keyboard event was caused by the key being held down.
     @throws CPInternalInconsistencyException if this method is called on a non-key event
 */
 - (BOOL)isARepeat
@@ -392,18 +465,6 @@ var _CPEventPeriodicEventPeriod         = 0,
     return _keyCode;
 }
 
-+ (CGPoint)mouseLocation
-{
-    // FIXME: this is incorrect, we shouldn't depend on the current event.
-    var event = [CPApp currentEvent],
-        eventWindow = [event window];
-
-    if (eventWindow)
-        return [eventWindow convertBaseToGlobal:[event locationInWindow]];
-
-    return [event locationInWindow];
-}
-
 - (float)pressure
 {
     return _pressure;
@@ -442,16 +503,8 @@ var _CPEventPeriodicEventPeriod         = 0,
     return _deltaZ;
 }
 
-- (BOOL)_couldBeKeyEquivalent
-{
-    // FIXME: More cases? Space?
-    return  _type === CPKeyDown &&
-            _modifierFlags & (CPCommandKeyMask | CPControlKeyMask) &&
-            [_characters length] > 0;
-}
-
 /*!
-    Generates periodic events every \c aPeriod seconds.
+    Generates periodic events every <code>aPeriod</code> seconds.
     @param aDelay the number of seconds before the first event
     @param aPeriod the length of time in seconds between successive events
 */

AppKit/CPFlashMovie.j

@@ -30,17 +30,17 @@
 */
 @implementation CPFlashMovie : CPObject
 {
-    CPString        _filename;
+    CPString _fileName;
 }
 
 /*!
-    Creates a new Flash movie with the swf at \c aFileName.
+    Creates a new Flash movie with the swf at <code>aFileName</code>.
     @param aFilename the swf to load
     @return the initialized CPFlashMovie
 */
-+ (id)flashMovieWithFile:(CPString)aFilename
++ (id)flashMovieWithFile:(CPString)aFileName
 {
-    return [[self alloc] initWithFile:aFilename];
+    return [[self alloc] initWithFile:aFileName];
 }
 
 /*!
@@ -48,37 +48,14 @@
     @param aFilename the swf to load
     @return the initialized CPFlashMovie
 */
-- (id)initWithFile:(CPString)aFilename
+- (id)initWithFile:(CPString)aFileName
 {
     self = [super init];
     
     if (self)
-        _filename = aFilename;
+        _fileName = aFileName;
     
     return self;
 }
 
-- (CPString)filename
-{
-    return _filename;
-}
-
-@end
-
-var CPFlashMovieFilenameKey = "CPFlashMovieFilenameKey";
-
-@implementation CPFlashMovie (CPCoding)
-
-- (id)initWithCoder:(CPCoder)aCoder
-{
-    _filename = [aCoder decodeObjectForKey:CPFlashMovieFilenameKey];
-
-    return self;
-}
-
-- (void)encodeWithCoder:(CPCoder)aCoder
-{
-    [aCoder encodeObject:_filename forKey:CPFlashMovieFilenameKey];
-}
-
 @end

AppKit/CPFlashView.j

@@ -20,13 +20,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+@import "CPDOMWindowBridge.j"
 @import "CPFlashMovie.j"
 @import "CPView.j"
 
-#include "Platform/Platform.h"
-
-var IEFlashCLSID = "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000";
-
 /*!
     @ingroup appkit
 */
@@ -34,13 +31,9 @@ var IEFlashCLSID = "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000";
 {
     CPFlashMovie    _flashMovie;
     
-    CPDictionary    _params;
-    CPDictionary    _paramElements;
-#if PLATFORM(DOM)    
-    DOMElement      _DOMParamElement;
+    DOMElement      _DOMEmbedElement;
+    DOMElement      _DOMMParamElement;
     DOMElement      _DOMObjectElement;
-    DOMElement      _DOMInnerObjectElement;
-#endif
 }
 
 - (id)initWithFrame:(CGRect)aFrame
@@ -49,32 +42,35 @@ var IEFlashCLSID = "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000";
     
     if (self)
     {
-#if PLATFORM(DOM)
-        if (!CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
-        {
-            _DOMObjectElement = document.createElement(@"object");
-            _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);
-        }
-        else
-            [self _rebuildIEObjects];
-#endif
+        _DOMObjectElement = document.createElement("object");
+        _DOMObjectElement.width = "100%";
+        _DOMObjectElement.height = "100%";
+        _DOMObjectElement.style.top = "0px";
+        _DOMObjectElement.style.left = "0px";
+        
+        _DOMParamElement = document.createElement("param");
+        _DOMParamElement.name = "movie";
+        
+        _DOMObjectElement.appendChild(_DOMParamElement);
+        
+        var param = document.createElement("param");
+        
+        param.name = "wmode";
+        param.value = "transparent";
+        
+        _DOMObjectElement.appendChild(param);
+        
+        _DOMEmbedElement = document.createElement("embed");
+
+        _DOMEmbedElement.type = "application/x-shockwave-flash";
+        _DOMEmbedElement.setAttribute("wmode", "transparent");
+        _DOMEmbedElement.width = "100%";
+        _DOMEmbedElement.height = "100%";
+
+        // IE requires this thing to be in the _DOMElement and not the _DOMObjectElement.
+        _DOMElement.appendChild(_DOMEmbedElement);
+                
+        _DOMElement.appendChild(_DOMObjectElement);
     }
     
     return self;
@@ -86,15 +82,11 @@ var IEFlashCLSID = "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000";
         return;
         
     _flashMovie = aFlashMovie;
-#if PLATFORM(DOM)
-    if (!CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
-    {
-        _DOMParamElement.value = [aFlashMovie filename];
-        _DOMInnerObjectElement.data = [aFlashMovie filename];
-    }
-    else
-        [self _rebuildIEObjects];
-#endif
+    
+    _DOMParamElement.value = aFlashMovie._fileName;
+    
+    if (_DOMEmbedElement)
+       _DOMEmbedElement.src = aFlashMovie._fileName;
 }
 
 - (CPFlashMovie)flashMovie
@@ -102,103 +94,19 @@ var IEFlashCLSID = "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000";
     return _flashMovie;
 }
 
-- (void)setFlashVars:(CPDictionary)aDictionary
-{
-    var varString = @"",
-        enumerator = [aDictionary keyEnumerator];
-    
-    var key;
-    while (key = [enumerator nextObject])
-        varString = [varString stringByAppendingFormat:@"&%@=%@", key, [aDictionary objectForKey:key]];
-    
-    if (!_params)
-        _params = [CPDictionary dictionary];
-    
-    [_params setObject:varString forKey:@"flashvars"];
-    [self setParameters:_params];
-}
-
-- (CPDictionary)flashVars
-{
-    return [_params objectForKey:@"flashvars"];
-}
-
-- (void)setParameters:(CPDictionary)aDictionary
-{
-#if PLATFORM(DOM)
-    if (_paramElements && !CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
-    {
-        var elements = [_paramElements allValues],
-            count = [elements count];
-        
-        for (var i = 0; i < count; i++)
-            _DOMObjectElement.removeChild([elements objectAtIndex:i]);
-    }
-#endif
-    _params = aDictionary;
-#if PLATFORM(DOM)
-    if (!CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
-    {
-        _paramElements = [CPDictionary dictionary];
-        
-        var enumerator = [_params keyEnumerator],
-            key;
-        
-        while (key = [enumerator nextObject] && _DOMObjectElement)
-        {
-            var param = document.createElement(@"param");
-            param.name = key;
-            param.value = [_params objectForKey:key];
-            
-            _DOMObjectElement.appendChild(param);
-            
-            [_paramElements setObject:param forKey:key];
-        }
-    }
-    else
-        [self _rebuildIEObjects];
-#endif
-}
-
-- (CPDictionary)parameters
-{
-    return _params;
-}
-
-#if PLATFORM(DOM)
-- (void)_rebuildIEObjects
-{
-    _DOMElement.innerHTML = @"";
-    if (![_flashMovie filename])
-        return;
-    
-    var paramString = [CPString stringWithFormat:@"<param name='movie' value='%@' />", [_flashMovie filename]],
-        paramEnumerator = [_params keyEnumerator],
-        key;
-    
-    while (key = [paramEnumerator nextObject])
-        paramString = [paramString stringByAppendingFormat:@"<param name='%@' value='%@' />", key, [_params objectForKey:key]];
-    
-    _DOMObjectElement = document.createElement(@"object");
-    _DOMElement.appendChild(_DOMObjectElement);
-    
-    _DOMObjectElement.outerHTML = [CPString stringWithFormat:@"<object classid=%@ width=%@ height=%@>%@</object>", IEFlashCLSID, CGRectGetWidth([self bounds]), CGRectGetHeight([self bounds]), paramString];
-}
-#endif
-
 - (void)mouseDragged:(CPEvent)anEvent
 {
-    [[[self window] platformWindow] _propagateCurrentDOMEvent:YES];
+    [[CPDOMWindowBridge sharedDOMWindowBridge] _propagateCurrentDOMEvent:YES];
 }
 
 - (void)mouseDown:(CPEvent)anEvent
 {
-    [[[self window] platformWindow] _propagateCurrentDOMEvent:YES];
+    [[CPDOMWindowBridge sharedDOMWindowBridge] _propagateCurrentDOMEvent:YES];
 }
 
 - (void)mouseUp:(CPEvent)anEvent
 {
-    [[[self window] platformWindow] _propagateCurrentDOMEvent:YES];
+    [[CPDOMWindowBridge sharedDOMWindowBridge] _propagateCurrentDOMEvent:YES];
 }
 
 @end

AppKit/CPFont.j

@@ -20,13 +20,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-var _CPFonts                = {},
-    _CPFontSystemFontFace   = @"Arial, sans-serif",
-    _CPWrapRegExp           = new RegExp("\\s*,\\s*", "g");
+var _CPFonts                = {};
+    _CPFontSystemFontFace   = @"Arial";
 
-
-#define _CPCreateCSSString(aName, aSize, isBold) (isBold ? @"bold " : @"") + ROUND(aSize) + @"px " + ((aName === _CPFontSystemFontFace) ? aName : (@"\"" + aName.replace(_CPWrapRegExp, '", "') + @"\", " + _CPFontSystemFontFace))
-#define _CPCachedFont(aName, aSize, isBold) _CPFonts[_CPCreateCSSString(aName, aSize, isBold)]
+#define _CPCachedFont(aName, aSize, isBold) _CPFonts[(isBold ? @"bold " : @"") + ROUND(aSize) + @"px '" + aName + @"'"]
 
 /*! 
     @ingroup appkit
@@ -98,7 +95,7 @@ var _CPFonts                = {},
         _size = aSize;
         _isBold = isBold;
         
-        _cssString = _CPCreateCSSString(_name, _size, _isBold);
+        _cssString = (_isBold ? @"bold " : @"") + ROUND(aSize) + @"px '" + aName + @"'";
         
         _CPFonts[_cssString] = self;
     }
@@ -130,16 +127,6 @@ var _CPFonts                = {},
     return _name;
 }
 
-- (BOOL)isEqual:(id)anObject
-{
-    return [anObject isKindOfClass:[CPFont class]] && [anObject cssString] === [self cssString];
-}
-
-- (CPString)description
-{
-    return [CPString stringWithFormat:@"%@ %@ %f pt.", [super description], [self familyName], [self size]];
-}
-
 @end
 
 var CPFontNameKey   = @"CPFontNameKey",

AppKit/CPFontManager.j

@@ -51,7 +51,7 @@ var CPSharedFontManager     = nil,
 
 // Changing the Default Font Conversion Classes
 /*!
-    Sets the class that will be used to create the application's
+    Sets the class that will be used to create the applcation's
     font manager.
 */
 + (void)setFontManagerFactory:(Class)aClass

AppKit/CPGeometry.j

@@ -62,11 +62,11 @@ function CPPointMake(x, y)
 }
 
 /*!
-    Makes a CGRect with an origin and size equal to \c aRect less the \c dX/dY insets specified.
+    Makes a CGRect with an origin and size equal to <code>aRect</code> less the <code>dX/dY</code> insets specified.
     @param dX the size of the inset in the x-axis
     @param dY the size of the inset in the y-axis
     @group CGRect
-    @return CGRect a rectangle like \c aRect with an inset
+    @return CGRect a rectangle like <code>aRect</code> with an inset
 */
 function CPRectInset(aRect, dX, dY)
 {
@@ -132,7 +132,7 @@ function CPRectMake(x, y, width, height)
 }
 
 /*!
-    Creates a new rectangle with its origin offset by \c dX and \c dY.
+    Creates a new rectangle with its origin offset by <code>dX</code> and <code>dY</code>.
     @group CGRect
     @param aRect the rectangle to copy the origin and size from
     @param dX the amount added to the x-size of the new rectangle
@@ -171,7 +171,7 @@ function CPRectStandardize(aRect)
 }
 
 /*!
-    Returns the smallest rectangle that can contain the two argument \c CGRects.
+    Returns the smallest rectangle that can contain the two argument <code>CGRect</code>s.
     @group CGRect
     @param lhsRect the first CGRect to use for the union calculation
     @param rhsRect the second CGRect to use for the union calculation
@@ -211,12 +211,12 @@ function CPSizeMake(width, height)
 }
 
 /*!
-    Returns \c YES if the CGRect, \c aRect, contains
-    the CGPoint, \c aPoint.
+    Returns <code>YES</code> if the CGRect, <code>aRect</code>, contains
+    the CGPoint, <code>aPoint</code>.
     @param aRect the rectangle to test with
     @param aPoint the point to test with
     @group CGRect
-    @return BOOL \c YES if the rectangle contains the point, \c NO otherwise.
+    @return BOOL <code>YES</code> if the rectangle contains the point, <code>NO</code> otherwise.
 */
 function CPRectContainsPoint(aRect, aPoint)
 {
@@ -227,25 +227,25 @@ function CPRectContainsPoint(aRect, aPoint)
 }
 
 /*!
-    Returns a \c BOOL indicating whether CGRect \c possibleOuter
-    contains CGRect \c possibleInner.
+    Returns a <code>BOOL</code> indicating whether CGRect <code>possibleOuter</code>
+    contains CGRect <code>possibleInner</code>.
     @group CGRect
-    @param possibleOuter the CGRect to test if \c possibleInner is inside of
-    @param possibleInner the CGRect to test if it fits inside \c possibleOuter.
-    @return BOOL \c YES if \c possibleInner fits inside \c possibleOuter.
+    @param possibleOuter the CGRect to test if <code>possibleInner</code> is inside of
+    @param possibleInner the CGRect to test if it fits inside <code>possibleOuter</code>.
+    @return BOOL <code>YES</code> if <code>possibleInner</code> fits inside <code>possibleOuter</code>.
 */
-function CPRectContainsRect(possibleOuter, possibleInner)
+function CPRectContainsRect(lhsRect, rhsRect)
 {
-    return CGRectContainsRect(possibleOuter, possibleInner);
+    return CPRectEqualToRect(CPUnionRect(lhsRect, rhsRect), rhsRect);
 }
 
 /*!
     Tests whether the two CGPoints are equal to each other by comparing their
-    \c x and \c y members.
+    <code>x</code> and <code>y</code> members.
     @group @CGPoint
     @param lhsPoint the first CGPoint to check
     @param rhsPoint the second CGPoint to check
-    @return BOOL \c YES if the two points have the same x's, and the same y's.
+    @return BOOL <code>YES</code> if the two points have the same x's, and the same y's.
 */
 function CPPointEqualToPoint(lhsPoint, rhsPoint)
 {
@@ -257,7 +257,7 @@ function CPPointEqualToPoint(lhsPoint, rhsPoint)
     @group CGRect
     @param lhsRect the first CGRect to compare
     @param rhsRect the second CGRect to compare
-    @return BOOL \c YES if the two rectangles have the same origin and size. \c NO, otherwise.
+    @return BOOL <code>YES</code> if the two rectangles have the same origin and size. <code>NO</code>, otherwise.
 */
 function CPRectEqualToRect(lhsRect, rhsRect)
 {
@@ -346,11 +346,11 @@ function CPRectGetWidth(aRect)
 }
 
 /*!
-    Returns \c YES if the two rectangles intersect
+    Returns <code>YES</code> if the two rectangles intersect
     @group CGRect
     @param lhsRect the first CGRect
     @param rhsRect the second CGRect
-    @return BOOL \c YES if the two rectangles have any common spaces, and \c NO, otherwise.
+    @return BOOL <code>YES</code> if the two rectangles have any common spaces, and <code>NO</code>, otherwise.
 */
 function CPRectIntersectsRect(lhsRect, rhsRect)
 {
@@ -358,11 +358,11 @@ function CPRectIntersectsRect(lhsRect, rhsRect)
 }
 
 /*!
-    Returns \c YES if the CGRect has no area.
+    Returns <code>YES</code> if the CGRect has no area.
     The test is performed by checking if the width and height are both zero.
     @group CGRect
     @param aRect the CGRect to test
-    @return BOOL \c YES if the CGRect has no area, and \c NO, otherwise.
+    @return BOOL <code>YES</code> if the CGRect has no area, and <code>NO</code>, otherwise.
 */
 function CPRectIsEmpty(aRect)
 {
@@ -370,10 +370,10 @@ function CPRectIsEmpty(aRect)
 }
 
 /*!
-    Returns \c YES if the CGRect has no area.
+    Returns <code>YES</code> if the CGRect has no area.
     The test is performed by checking if the width and height are both zero.
     @group CGRect
-    @return BOOL \c YES if the CGRect has no area, and \c NO, otherwise.
+    @return BOOL <code>YES</code> if the CGRect has no area, and <code>NO</code>, otherwise.
 */
 function CPRectIsNull(aRect)
 {
@@ -381,11 +381,11 @@ function CPRectIsNull(aRect)
 }
 
 /*!
-    Returns \c YES if the two CGSizes are identical.
+    Returns <code>YES</code> if the two CGSizes are identical.
     @group CGSize
     @param lhsSize the first CGSize to compare
     @param rhsSize the second CGSize to compare
-    @return BOOL \c YES if the two sizes are identical. \c NO, otherwise.
+    @return BOOL <code>YES</code> if the two sizes are identical. <code>NO</code>, otherwise.
 */
 function CPSizeEqualToSize(lhsSize, rhsSize)
 {
@@ -454,7 +454,7 @@ function CPSizeFromString(aString)
 /*!
     Returns a CGRect created from a string.
     @group CGRect
-    @param aString a string in the form generated by \c CPStringFromRect
+    @param aString a string in the form generated by <code>CPStringFromRect</code>
     @return CGRect the rectangle created from the string
 */
 function CPRectFromString(aString)
@@ -477,7 +477,7 @@ function CPPointFromEvent(anEvent)
 /*!
     Returns a zero sized CGSize.
     @group CGSize
-    @return CGSize a size object with zeros for \c width and \c height
+    @return CGSize a size object with zeros for <code>width</code> and <code>height</code>
 */
 function CPSizeMakeZero()
 {
@@ -485,7 +485,7 @@ function CPSizeMakeZero()
 }
 
 /*!
-    Returns a rectangle at origin \c (0,0) and size of \c (0,0).
+    Returns a rectangle at origin <code>(0,0)</code> and size of <code>(0,0)</code>.
     @group CGRect
     @return CGRect a zeroed out CGRect
 */
@@ -495,9 +495,9 @@ function CPRectMakeZero()
 }
 
 /*!
-    Returns a point located at \c (0, 0).
+    Returns a point located at <code>(0, 0)</code>.
     @group CGPoint
-    @return CGPoint a point located at \c (0, 0)
+    @return CGPoint a point located at <code>(0, 0)</code>
 */
 function CPPointMakeZero()
 {

AppKit/CPImage.j

@@ -19,7 +19,7 @@
  * 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/CPBundle.j>
 @import <Foundation/CPNotificationCenter.j>
 @import <Foundation/CPObject.j>
@@ -28,9 +28,6 @@
 
 @import "CPGeometry.j"
 
-#include "Platform/Platform.h"
-
-
 CPImageLoadStatusInitialized    = 0;
 CPImageLoadStatusLoading        = 1;
 CPImageLoadStatusCompleted      = 2;
@@ -41,32 +38,26 @@ CPImageLoadStatusReadError      = 6;
 
 CPImageDidLoadNotification      = @"CPImageDidLoadNotification";
 
-// Image Names
-CPImageNameColorPanel               = @"CPImageNameColorPanel";
-CPImageNameColorPanelHighlighted    = @"CPImageNameColorPanelHighlighted";
-
-var imagesForNames = { },
-    AppKitImageForNames = { };
-
-AppKitImageForNames[CPImageNameColorPanel]              = CGSizeMake(26.0, 29.0);
-AppKitImageForNames[CPImageNameColorPanelHighlighted]   = CGSizeMake(26.0, 29.0);
-
 function CPImageInBundle(aFilename, aSize, aBundle)
 {
     if (!aBundle)
         aBundle = [CPBundle mainBundle];
-
+    
     if (aSize)
         return [[CPImage alloc] initWithContentsOfFile:[aBundle pathForResource:aFilename] size:aSize];
-
+    
     return [[CPImage alloc] initWithContentsOfFile:[aBundle pathForResource:aFilename]];
 }
 
-function CPAppKitImage(aFilename, aSize)
+@implementation CPBundle (CPImageAdditions)
+
+- (CPString)pathForResource:(CPString)aFilename
 {
-    return CPImageInBundle(aFilename, aSize, [CPBundle bundleForClass:[CPView class]]);
+    return [self resourcePath] + '/' + aFilename;
 }
 
+@end
+
 /*! 
     @ingroup appkit
     @class CPImage
@@ -92,38 +83,32 @@ function CPAppKitImage(aFilename, aSize)
 {
     CGSize      _size;
     CPString    _filename;
-    CPString    _name;
-
+    
     id          _delegate;
     unsigned    _loadStatus;
-
+    
     Image       _image;
 }
 
-- (id)init
-{
-    return [self initByReferencingFile:@"" size:CGSizeMake(-1, -1)];
-}
-
 /*!
     Initializes the image, by associating it with a filename. The image
-    denoted in \c aFilename is not actually loaded. It will
+    denoted in <code>aFilename</code> 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
+- (CPImage)initByReferencingFile:(CPString)aFilename size:(CGSize)aSize
 {
     self = [super init];
-
+    
     if (self)
     {
         _size = CPSizeCreateCopy(aSize);
         _filename = aFilename;
         _loadStatus = CPImageLoadStatusInitialized;
     }
-
+    
     return self;
 }
 
@@ -133,13 +118,13 @@ function CPAppKitImage(aFilename, aSize)
     @param aSize the size of the image
     @return the initialized image.
 */
-- (id)initWithContentsOfFile:(CPString)aFilename size:(CGSize)aSize
+- (CPImage)initWithContentsOfFile:(CPString)aFilename size:(CGSize)aSize
 {
     self = [self initByReferencingFile:aFilename size:aSize];
-
+    
     if (self)
         [self load];
-
+    
     return self;
 }
 
@@ -149,13 +134,13 @@ function CPAppKitImage(aFilename, aSize)
     @param aFilename the file name of the image
     @return the initialized image
 */
-- (id)initWithContentsOfFile:(CPString)aFilename
+- (CPImage)initWithContentsOfFile:(CPString)aFilename
 {
-    self = [self initByReferencingFile:aFilename size:CGSizeMake(-1, -1)];
-
+    self = [self initByReferencingFile:aFilename size: CGSizeMake(-1, -1)];
+    
     if (self)
         [self load];
-
+    
     return self;
 }
 
@@ -184,45 +169,6 @@ function CPAppKitImage(aFilename, aSize)
     return _size;
 }
 
-+ (id)imageNamed:(CPString)aName
-{
-    var image = imagesForNames[aName];
-
-    if (image)
-        return image;
-
-    var imageOrSize = AppKitImageForNames[aName];
-
-    if (!imageOrSize.isa)
-    {
-        imageOrSize = CPAppKitImage("CPImage/" + aName + ".png", imageOrSize);
-
-        [imageOrSize setName:aName];
-
-        AppKitImageForNames[aName] = imageOrSize;
-    }
-
-    return imageOrSize;
-}
-
-- (void)setName:(CPString)aName
-{
-    if (_name === aName)
-        return;
-
-    if (imagesForNames[aName] === self)
-        imagesForNames[aName] = nil;
-
-    _name = aName;
-
-    imagesForNames[aName] = self;
-}
-
-- (CPString)name
-{
-    return _name;
-}
-
 /*!
     Sets the receiver's delegate.
     @param the delegate
@@ -241,9 +187,9 @@ function CPAppKitImage(aFilename, aSize)
 }
 
 /*!
-    Returns the load status, which will be CPImageLoadStatusCompleted if the image data has already been loaded.
+    Returns <code>YES</code> if the image data has already been loaded.
 */
-- (unsigned)loadStatus
+- (BOOL)loadStatus
 {
     return _loadStatus;
 }
@@ -258,10 +204,9 @@ function CPAppKitImage(aFilename, aSize)
 {
     if (_loadStatus == CPImageLoadStatusLoading || _loadStatus == CPImageLoadStatusCompleted)
         return;
-
+        
     _loadStatus = CPImageLoadStatusLoading;
 
-#if PLATFORM(DOM)
     _image = new Image();
 
     var isSynchronous = YES;
@@ -278,7 +223,7 @@ function CPAppKitImage(aFilename, aSize)
             }
             [self _derefFromImage];
         }
-
+    
     _image.onerror = function ()
         {
             if (isSynchronous)
@@ -290,7 +235,7 @@ function CPAppKitImage(aFilename, aSize)
             }
             [self _derefFromImage];
         }
-
+    
     _image.onabort = function ()
         {
             if (isSynchronous)
@@ -302,13 +247,10 @@ function CPAppKitImage(aFilename, aSize)
             }
             [self _derefFromImage];
         }
-
+        
     _image.src = _filename;
-
-    // onload and friends may fire after this point but BEFORE the end of the run loop,
-    // crazy, I know. So don't set isSynchronous here, rather wait a bit longer.
-    window.setTimeout(function() { isSynchronous = NO; }, 0);
-#endif
+    
+    isSynchronous = NO;
 }
 
 - (BOOL)isThreePartImage
@@ -341,7 +283,7 @@ function CPAppKitImage(aFilename, aSize)
     [[CPNotificationCenter defaultCenter]
         postNotificationName:CPImageDidLoadNotification
         object:self];
-
+        
     if ([_delegate respondsToSelector:@selector(imageDidLoad:)])
         [_delegate imageDidLoad:self];
 }
@@ -350,7 +292,7 @@ function CPAppKitImage(aFilename, aSize)
 - (void)_imageDidError
 {
     _loadStatus = CPImageLoadStatusReadError;
-
+    
     if ([_delegate respondsToSelector:@selector(imageDidError:)])
         [_delegate imageDidError:self];
 }
@@ -359,7 +301,7 @@ function CPAppKitImage(aFilename, aSize)
 - (void)_imageDidAbort
 {
     _loadStatus = CPImageLoadStatusCancelled;
-
+    
     if ([_delegate respondsToSelector:@selector(imageDidAbort:)])
         [_delegate imageDidAbort:self];
 }
@@ -399,7 +341,7 @@ function CPAppKitImage(aFilename, aSize)
 - (id)initWithImageSlices:(CPArray)imageSlices isVertical:(BOOL)isVertical
 {
     self = [super init];
-
+    
     if (self)
     {
         _imageSlices = imageSlices;
@@ -444,13 +386,13 @@ var CPThreePartImageImageSlicesKey  = @"CPThreePartImageImageSlicesKey",
 - (id)initWithCoder:(CPCoder)aCoder
 {
     self = [super init];
-
+    
     if (self)
     {
         _imageSlices = [aCoder decodeObjectForKey:CPThreePartImageImageSlicesKey];
         _isVertical = [aCoder decodeBoolForKey:CPThreePartImageIsVerticalKey];
     }
-
+    
     return self;
 }
 
@@ -471,10 +413,10 @@ var CPThreePartImageImageSlicesKey  = @"CPThreePartImageImageSlicesKey",
 - (id)initWithImageSlices:(CPArray)imageSlices
 {
     self = [super init];
-
+    
     if (self)
         _imageSlices = imageSlices;
-
+    
     return self;
 }
 
@@ -507,10 +449,10 @@ var CPNinePartImageImageSlicesKey   = @"CPNinePartImageImageSlicesKey";
 - (id)initWithCoder:(CPCoder)aCoder
 {
     self = [super init];
-
+    
     if (self)
         _imageSlices = [aCoder decodeObjectForKey:CPNinePartImageImageSlicesKey];
-
+    
     return self;
 }
 

AppKit/CPImageView.j

@@ -31,10 +31,24 @@
 
 #include "CoreGraphics/CGGeometry.h"
 
+
+/*
+    @global
+    @group CPImageScaling
+*/
 CPScaleProportionally   = 0;
+/*
+    @global
+    @group CPImageScaling
+*/
 CPScaleToFit            = 1;
+/*
+    @global
+    @group CPImageScaling
+*/
 CPScaleNone             = 2;
 
+
 var CPImageViewShadowBackgroundColor = nil;
     
 var LEFT_SHADOW_INSET       = 3.0,
@@ -73,13 +87,7 @@ var LEFT_SHADOW_INSET       = 3.0,
         _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";
@@ -153,8 +161,8 @@ var LEFT_SHADOW_INSET       = 3.0,
 }
 
 /*!
-    Returns \c YES if the image view draws with
-    a drop shadow. The default is \c NO.
+    Returns <code>YES</code> if the image view draws with
+    a drop shadow. The default is <code>NO</code>.
 */
 - (BOOL)hasShadow
 {
@@ -211,11 +219,6 @@ var LEFT_SHADOW_INSET       = 3.0,
     [self setNeedsDisplay:YES];
 }
 
-- (unsigned)imageScaling
-{
-    return [self currentValueForThemeAttribute:@"image-scaling"];
-}
-
 /*!
     Toggles the display of the image view.
 */
@@ -370,10 +373,7 @@ var LEFT_SHADOW_INSET       = 3.0,
     var images = [CPKeyedUnarchiver unarchiveObjectWithData:[[aSender draggingPasteboard] dataForType:CPImagesPboardType]];
 
     if ([images count])
-    {
         [self setImage:images[0]];
-        [self sendAction:[self action] to:[self target]];
-    }
 }
 
 @end
@@ -398,11 +398,6 @@ var CPImageViewImageKey         = @"CPImageViewImageKey",
     _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";
-    }
 #endif
 
     self = [super initWithCoder:aCoder];

AppKit/CPMenu/_CPMenuBarWindow.j

@@ -1,556 +0,0 @@
-
-#include "../CoreGraphics/CGGeometry.h"
-#include "../Platform/Platform.h"
-
-@import "_CPMenuWindow.j"
-
-
-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;
-    
-    CPMenuItem  _trackingMenuItem;
-    
-    CPImageView _iconImageView;
-    CPTextField _titleField;
-    
-    CPColor     _textColor;
-    CPColor     _titleColor;
-    
-    CPColor     _textShadowColor;
-    CPColor     _titleShadowColor;
-    
-    CPColor     _highlightColor;
-    CPColor     _highlightTextColor;
-    CPColor     _highlightTextShadowColor;
-}
-
-+ (void)initialize
-{
-    if (self != [_CPMenuBarWindow class])
-        return;
-        
-    var bundle = [CPBundle bundleForClass:self];
-    
-    _CPMenuBarWindowFont = [CPFont boldSystemFontOfSize:12.0];
-}
-
-+ (CPFont)font
-{
-    return _CPMenuBarWindowFont;
-}
-
-- (id)init
-{
-    // This only shows up in browser land, so don't bother calculating metrics in desktop.
-    var contentRect = [[CPPlatformWindow primaryPlatformWindow] contentBounds];
-
-    contentRect.size.height = MENUBAR_HEIGHT;
-
-    self = [super initWithContentRect:contentRect styleMask:CPBorderlessWindowMask];
-
-    if (self)
-    {
-        [self setLevel:CPMainMenuWindowLevel];
-        [self setAutoresizingMask:CPWindowWidthSizable];
-     
-        var contentView = [self contentView];
-        
-        [contentView setAutoresizesSubviews:NO];
-        
-        [self setBecomesKeyOnlyIfNeeded:YES];
-        
-        //
-        _iconImageView = [[CPImageView alloc] initWithFrame:CGRectMake(0.0, 0.0, 16.0, 16.0)];
-        
-        [contentView addSubview:_iconImageView];
-        
-        _titleField = [[CPTextField alloc] initWithFrame:CGRectMakeZero()];
-
-        [_titleField setFont:[CPFont boldSystemFontOfSize:13.0]];
-        [_titleField setAlignment:CPCenterTextAlignment];
-        [_titleField setTextShadowOffset:CGSizeMake(0, 1)];
-        
-        [contentView addSubview:_titleField];
-    }
-    
-    return self;
-}
-
-- (void)setTitle:(CPString)aTitle
-{
-#if PLATFORM(DOM)
-    var bundleName = [[CPBundle mainBundle] objectForInfoDictionaryKey:@"CPBundleName"];
-
-    if (![bundleName length])
-        document.title = aTitle;
-    else if ([aTitle length])
-        document.title = aTitle + @" - " + bundleName;
-    else
-        document.title = bundleName;
-#endif
-
-    [_titleField setStringValue:aTitle];
-    [_titleField sizeToFit];
-    
-    [self tile];
-}
-
-- (void)setIconImage:(CPImage)anImage
-{
-    [_iconImageView setImage:anImage];
-    [_iconImageView setHidden:anImage == nil];
-
-    [self tile];
-}
-
-- (void)setIconImageAlphaValue:(float)anAlphaValue
-{
-    [_iconImageView setAlphaValue:anAlphaValue];
-}
-
-- (void)setColor:(CPColor)aColor
-{
-    if (!aColor)
-    {
-        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];
-}
-
-- (void)setTextColor:(CPColor)aColor
-{
-    if (_textColor == aColor)
-        return;
-    
-    _textColor = aColor;
-    
-    [_menuItemViews makeObjectsPerformSelector:@selector(setTextColor:) withObject:_textColor];
-}
-
-- (void)setTitleColor:(CPColor)aColor
-{
-    if (_titleColor == aColor)
-        return;
-    
-    _titleColor = aColor;
-    
-    [_titleField setTextColor:aColor ? aColor : [CPColor blackColor]];
-}
-
-- (void)setTextShadowColor:(CPColor)aColor
-{
-    if (_textShadowColor == aColor)
-        return;
-    
-    _textShadowColor = aColor;
-    
-    [_menuItemViews makeObjectsPerformSelector:@selector(setTextShadowColor:) withObject:_textShadowColor];
-}
-
-- (void)setTitleShadowColor:(CPColor)aColor
-{
-    if (_titleShadowColor == aColor)
-        return;
-    
-    _titleShadowColor = aColor;
-    
-    [_titleField setTextShadowColor:aColor ? aColor : [CPColor whiteColor]];
-}
-
-- (void)setHighlightColor:(CPColor)aColor
-{
-    if (_highlightColor == aColor)
-        return;
-    
-    _highlightColor = aColor;
-}
-
-- (void)setHighlightTextColor:(CPColor)aColor
-{
-    if (_highlightTextColor == aColor)
-        return;
-    
-    _highlightTextColor = aColor;
-
-//    [_menuItemViews makeObjectsPerformSelector:@selector(setActivateColor:) withObject:_highlightTextColor];
-}
-
-- (void)setHighlightTextShadowColor:(CPColor)aColor
-{
-    if (_highlightTextShadowColor == aColor)
-        return;
-    
-    _highlightTextShadowColor = aColor;
-    
-//    [_menuItemViews makeObjectsPerformSelector:@selector(setActivateShadowColor:) withObject:_highlightTextShadowColor];
-}
-
-- (void)setMenu:(CPMenu)aMenu
-{
-    if (_menu == aMenu)
-        return;
-    
-    var defaultCenter = [CPNotificationCenter defaultCenter];
-    
-    if (_menu)
-    {
-        [defaultCenter
-            removeObserver:self
-                      name:CPMenuDidAddItemNotification
-                    object:_menu];
-
-        [defaultCenter
-            removeObserver:self
-                      name:CPMenuDidChangeItemNotification
-                    object:_menu];
-
-        [defaultCenter
-            removeObserver:self
-                      name:CPMenuDidRemoveItemNotification
-                    object:_menu];
-                    
-        var items = [_menu itemArray],
-            count = items.length;
-        
-        while (count--)
-            [[items[count] _menuItemView] removeFromSuperview];
-    }
-
-    _menu = aMenu;
-    
-    if (_menu)
-    {
-        [defaultCenter
-            addObserver:self
-              selector:@selector(menuDidAddItem:)
-                  name:CPMenuDidAddItemNotification
-                object:_menu];
-    
-        [defaultCenter
-            addObserver:self
-              selector:@selector(menuDidChangeItem:)
-                  name:CPMenuDidChangeItemNotification
-                object:_menu];
-                
-        [defaultCenter
-            addObserver:self
-              selector:@selector(menuDidRemoveItem:)
-                  name:CPMenuDidRemoveItemNotification
-                object:_menu];
-    }
-    
-    _menuItemViews = [];
-    
-    var contentView = [self contentView],
-        items = [_menu itemArray],
-        count = items.length;
-    
-    for (index = 0; index < count; ++index)
-    {
-        var item = items[index],
-            menuItemView = [item _menuItemView];
-            
-        _menuItemViews.push(menuItemView);
-
-        [menuItemView setTextColor:_textColor];
-        [menuItemView setHidden:[item isHidden]];
-        
-        [menuItemView synchronizeWithMenuItem];
-        
-        [contentView addSubview:menuItemView];
-    }
-        
-    [self tile];
-}
-
-- (void)menuDidChangeItem:(CPNotification)aNotification
-{
-    var menuItem = [_menu itemAtIndex:[[aNotification userInfo] objectForKey:@"CPMenuItemIndex"]],
-        menuItemView = [menuItem _menuItemView];
-
-    [menuItemView setHidden:[menuItem isHidden]];
-    [menuItemView synchronizeWithMenuItem];
-    
-    [self tile];
-}
-
-- (void)menuDidAddItem:(CPNotification)aNotification
-{
-    var index = [[aNotification userInfo] objectForKey:@"CPMenuItemIndex"],
-        menuItem = [_menu itemAtIndex:index],
-        menuItemView = [menuItem _menuItemView];
-
-    [_menuItemViews insertObject:menuItemView atIndex:index];
-
-    [menuItemView setTextColor:_textColor];
-    [menuItemView setHidden:[menuItem isHidden]];
-
-    [menuItemView synchronizeWithMenuItem];
-    
-    [[self contentView] addSubview:menuItemView];
-    
-    [self tile];
-}
-
-- (void)menuDidRemoveItem:(CPNotification)aNotification
-{
-    var index = [[aNotification userInfo] objectForKey:@"CPMenuItemIndex"],
-        menuItemView = [_menuItemViews objectAtIndex:index];
-
-    [_menuItemViews removeObjectAtIndex:index];
-
-    [menuItemView removeFromSuperview];
-        
-    [self tile];
-}
-
-- (void)mouseDown:(CPEvent)anEvent
-{
-    var constraintRect = CGRectInset([[self platformWindow] visibleFrame], 5.0, 0.0);
-
-    constraintRect.size.height -= 5.0;
-
-    [[_CPMenuManager sharedMenuManager]
-        beginTracking:anEvent
-        menuContainer:self
-       constraintRect:constraintRect
-             callback:function(aMenuContainer, aMenu)
-             {
-                [aMenu _performActionOfHighlightedItemChain];
-                [aMenu _highlightItemAtIndex:CPNotFound];
-             }];
-}
-
-- (CPFont)font
-{
-    [CPFont systemFontOfSize:12.0];
-}
-
-- (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 setFrame:CGRectMake(x, 0.0, CGRectGetWidth(frame), MENUBAR_HEIGHT)];
-
-            x += CGRectGetWidth([menuItemView frame]);
-        }
-        else
-        {
-            [menuItemView setFrame:CGRectMake(x - CGRectGetWidth(frame), 0.0, CGRectGetWidth(frame), MENUBAR_HEIGHT)];
-     
-            x = CGRectGetMinX([menuItemView frame]);
-        }
-    }
-    
-    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)];
-    }
-}
-
-- (void)setFrame:(CGRect)aRect display:(BOOL)shouldDisplay animate:(BOOL)shouldAnimate
-{
-    var size = [self frame].size;
-
-    [super setFrame:aRect display:shouldDisplay animate:shouldAnimate];
-
-    if (!_CGSizeEqualToSize(size, aRect.size))
-        [self tile];
-}
-
-@end
-
-@implementation _CPMenuBarWindow (CPMenuContainer)
-
-- (BOOL)isMenuBar
-{
-    return YES;
-}
-
-- (CGRect)globalFrame
-{
-    return [self frame];
-}
-
-- (_CPManagerScrollingState)scrollingStateForPoint:(CGPoint)aGlobalLocation
-{
-    return _CPMenuManagerScrollingStateNone;
-}
-
-- (CPInteger)itemIndexAtPoint:(CGPoint)aPoint
-{
-    var items = [_menu itemArray],
-        index = items.length;
-
-    while (index--)
-    {
-        var item = items[index];
-
-        if ([item isHidden] || [item isSeparatorItem])
-            continue;
-
-        if (CGRectContainsPoint([self rectForItemAtIndex:index], aPoint))
-            return index;
-    }
-
-    return CPNotFound;
-}
-
-- (CGRect)rectForItemAtIndex:(CPInteger)anIndex
-{
-    var menuItem = [_menu itemAtIndex:anIndex === CPNotFound ? 0 : anIndex];
-
-    return [[menuItem _menuItemView] frame];
-}
-
-@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,370 +0,0 @@
-
-#include "../CoreGraphics/CGGeometry.h"
-
-@import <Foundation/CPObject.j>
-
-
-_CPMenuManagerScrollingStateUp      = -1,
-_CPMenuManagerScrollingStateDown    = 1,
-_CPMenuManagerScrollingStateNone    = 0;
-
-var STICKY_TIME_INTERVAL        = 500;
-
-var SharedMenuManager = nil;
-
-@implementation _CPMenuManager: CPObject
-{
-    CPTimeInterval      _startTime;
-    int                 _scrollingState;
-    CGPoint             _lastGlobalLocation;
-
-    CPView              _lastMouseOverMenuView;
-
-    CGRect              _constraintRect;
-    CPMutableArray      _menuContainerStack;
-
-    Function            _trackingCallback;
-}
-
-+ (_CPMenuManager)sharedMenuManager
-{
-    if (!SharedMenuManager)
-        SharedMenuManager = [[_CPMenuManager alloc] init];
-
-    return SharedMenuManager;
-}
-
-- (id)init
-{
-    if (SharedMenuManager)
-        return SharedMenuManager;
-
-    return [super init];    
-}
-
-- (id)trackingMenuContainer
-{
-    return _menuContainerStack[0];
-}
-
-- (CPMenu)trackingMenu
-{
-    return [[self trackingMenuContainer] menu];
-}
-
-- (void)beginTracking:(CPEvent)anEvent
-        menuContainer:(id)aMenuContainer
-       constraintRect:(CGRect)aRect
-             callback:(Function)aCallback
-{
-    var menu = [aMenuContainer menu];
-
-    CPApp._activeMenu = menu;
-
-    _startTime = [anEvent timestamp];//new Date();
-    _scrollingState = _CPMenuManagerScrollingStateNone;
-
-    _constraintRect = aRect;
-    _menuContainerStack = [aMenuContainer];
-    _trackingCallback = aCallback;
-
-    if (menu === [CPApp mainMenu])
-    {
-        var globalLocation = [anEvent globalLocation];
-
-        // Find which menu window the mouse is currently on top of
-        var menuLocation = [aMenuContainer convertGlobalToBase:globalLocation];
-
-        // Find out the item the mouse is currently on top of
-        var activeItemIndex = [aMenuContainer itemIndexAtPoint:menuLocation],
-            activeItem = activeItemIndex !== CPNotFound ? [menu itemAtIndex:activeItemIndex] : nil;
-
-        _menuBarButtonItemIndex = activeItemIndex;
-        _menuBarButtonMenuContainer = aMenuContainer;
-
-        if ([activeItem _isMenuBarButton])
-            return [self trackMenuBarButtonEvent:anEvent];
-    }
-
-    [self trackEvent:anEvent];
-}
-
-- (void)trackEvent:(CPEvent)anEvent
-{
-    var type = [anEvent type],
-        trackingMenu = [self trackingMenu];
-
-    // Close Menu Event.
-    if (type === CPAppKitDefined)
-        return [self completeTracking]
-
-    [CPApp setTarget:self selector:@selector(trackEvent:) forNextEventMatchingMask:CPPeriodicMask | CPMouseMovedMask | CPLeftMouseDraggedMask | CPLeftMouseUpMask | CPAppKitDefinedMask untilDate:nil inMode:nil dequeue:YES];
-
-    // Periodic events don't have a valid location.
-    var globalLocation = type === CPPeriodic ? _lastGlobalLocation : [anEvent globalLocation];
-
-    // Remember this for the next periodic event.
-    _lastGlobalLocation = globalLocation;
-
-    // Find which menu window the mouse is currently on top of
-    var activeMenuContainer = [self menuContainerForPoint:globalLocation],
-        activeMenu = [activeMenuContainer menu],
-        menuLocation = [activeMenuContainer convertGlobalToBase:globalLocation];
-
-    // Find out the item the mouse is currently on top of
-    var activeItemIndex = activeMenuContainer ? [activeMenuContainer itemIndexAtPoint:menuLocation] : CPNotFound,
-        activeItem = activeItemIndex !== CPNotFound ? [activeMenu itemAtIndex:activeItemIndex] : nil;
-
-    // If the item isn't enabled its as if we clicked on nothing.
-    if (![activeItem isEnabled] || [activeItem _isMenuBarButton])
-    {
-        activeItemIndex = CPNotFound;
-        activeItem = nil;
-    }
-
-    var mouseOverMenuView = [activeItem view];
-
-    if (type === CPPeriodic)
-    {
-        if (_scrollingState === _CPMenuManagerScrollingStateUp)
-            [activeMenuContainer scrollUp];
-
-        else if (_scrollingState === _CPMenuManagerScrollingStateDown)
-            [activeMenuContainer scrollDown];
-    }
-
-    // If we're over a custom menu view...
-    if (mouseOverMenuView)
-    {
-        if (!_lastMouseOverMenuView)
-            [activeMenu _highlightItemAtIndex:CPNotFound];
-        
-        if (_lastMouseOverMenuView != mouseOverMenuView)
-        {
-            [mouseOverMenuView mouseExited:anEvent];
-            // FIXME: Possibly multiple of these?
-            [_lastMouseOverMenuView mouseEntered:anEvent];
-            
-            _lastMouseOverMenuView = mouseOverMenuView;
-        }
-
-        var menuContainerWindow = activeMenuContainer;
-
-        if (![menuContainerWindow isKindOfClass:[CPWindow class]])
-            menuContainerWindow = [menuContainerWindow window];
-
-        [menuContainerWindow
-            sendEvent:[CPEvent mouseEventWithType:type location:menuLocation modifierFlags:[anEvent modifierFlags]
-            timestamp:[anEvent timestamp]
-         windowNumber:menuContainerWindow
-              context:nil
-          eventNumber:0
-           clickCount:[anEvent clickCount]
-             pressure:[anEvent pressure]]];
-    }
-    else
-    {
-        if (_lastMouseOverMenuView)
-        {
-            [_lastMouseOverMenuView mouseExited:anEvent];
-            _lastMouseOverMenuView = nil;
-        }
-        
-        [activeMenu _highlightItemAtIndex:activeItemIndex];
-        
-        if (type === CPMouseMoved || type === CPLeftMouseDragged || type === CPLeftMouseDown)
-        {
-            var oldScrollingState = _scrollingState;
-
-            _scrollingState = [activeMenuContainer scrollingStateForPoint:globalLocation];
-
-            if (_scrollingState !== oldScrollingState)
-            {
-                if (_scrollingState === _CPMenuManagerScrollingStateNone)
-                    [CPEvent stopPeriodicEvents];
-            
-                else if (oldScrollingState === _CPMenuManagerScrollingStateNone)
-                    [CPEvent startPeriodicEventsAfterDelay:0.0 withPeriod:0.04];
-            }
-        }
-        else if (type === CPLeftMouseUp && ([anEvent timestamp] - _startTime > STICKY_TIME_INTERVAL))
-            [trackingMenu cancelTracking];
-    }
-
-    // If the item has a submenu, show it.
-    if ([activeItem hasSubmenu])// && [activeItem action] === @selector(submenuAction:))
-    {
-        var activeItemRect = [activeMenuContainer rectForItemAtIndex:activeItemIndex];
-
-        if ([activeMenuContainer isMenuBar])
-            var newMenuOrigin = CGPointMake(CGRectGetMinX(activeItemRect), CGRectGetMaxY(activeItemRect));
-        else
-            var newMenuOrigin = CGPointMake(CGRectGetMaxX(activeItemRect), CGRectGetMinY(activeItemRect));
-
-        newMenuOrigin = [activeMenuContainer convertBaseToGlobal:newMenuOrigin];
-
-        [self showMenu:[activeItem submenu] fromMenu:[activeItem menu] atPoint:newMenuOrigin];
-    }
-
-    // This handles both the case where we've moved away from the menu, and where 
-    // we've moved to an item without a submenu.
-    else
-        [self showMenu:nil fromMenu:activeMenu atPoint:CGPointMakeZero()];
-}
-
-- (void)trackMenuBarButtonEvent:(CPEvent)anEvent
-{
-    var type = [anEvent type];
-
-    if (type === CPAppKitDefined)
-        return [self completeTracking];
-
-    var globalLocation = [anEvent globalLocation];
-
-    // Find which menu window the mouse is currently on top of
-    var menu = [self trackingMenu],
-        trackingMenuContainer = [self trackingMenuContainer],
-        menuLocation = [trackingMenuContainer convertGlobalToBase:globalLocation];
-
-    if ([trackingMenuContainer itemIndexAtPoint:menuLocation] === _menuBarButtonItemIndex)
-        [menu _highlightItemAtIndex:_menuBarButtonItemIndex];
-
-    else
-        [menu _highlightItemAtIndex:CPNotFound];
-
-    [CPApp setTarget:self selector:@selector(trackMenuBarButtonEvent:) forNextEventMatchingMask:CPPeriodicMask | CPMouseMovedMask | CPLeftMouseDraggedMask | CPLeftMouseUpMask | CPAppKitDefinedMask untilDate:nil inMode:nil dequeue:YES];
-
-    if (type === CPLeftMouseUp)
-        [menu cancelTracking];
-}
-
-- (void)completeTracking
-{
-    var trackingMenu = [self trackingMenu];
-
-    // Stop all periodic events at this point.
-    [CPEvent stopPeriodicEvents];
-
-    // Get the highlighted item from the original menu.
-    var highlightedItem = [trackingMenu highlightedItem];
-
-    // Hide all submenus.
-    [self showMenu:nil fromMenu:trackingMenu atPoint:nil];
-
-    var delegate = [trackingMenu delegate];
-
-    if ([delegate respondsToSelector:@selector(menuDidClose:)])
-        [delegate menuDidClose:trackingMenu];
-
-    if (_trackingCallback)
-        _trackingCallback([self trackingMenuContainer], trackingMenu);
-
-    [[CPNotificationCenter defaultCenter]
-        postNotificationName:CPMenuDidEndTrackingNotification
-                      object:trackingMenu];
-
-    CPApp._activeMenu = nil;
-}
-
-- (id)menuContainerForPoint:(float)aGlobalLocation
-{
-    var count = [_menuContainerStack count],
-        firstMenuContainer = _menuContainerStack[0];
-
-    // Trivial case.
-    if (count === 1)
-        return firstMenuContainer;
-
-    var firstMenuWindowIndex = 0,
-        lastMenuWindowIndex = count - 1;
-
-    // If the first menu container is a bar, then it has to fall strictly within its bounds.
-    if ([firstMenuContainer isMenuBar])
-    {
-        if (CGRectContainsPoint([firstMenuContainer globalFrame], aGlobalLocation))
-            return firstMenuContainer;
-
-        firstMenuWindowIndex = 1;
-    }
-
-    var index = count,
-        x = aGlobalLocation.x,
-        closerDeltaX = Infinity,
-        closerMenuContainer = nil;
-
-    while (index-- > firstMenuWindowIndex)
-    {
-        var menuContainer = _menuContainerStack[index],
-            menuContainerFrame = [menuContainer globalFrame],
-            menuContainerMinX = _CGRectGetMinX(menuContainerFrame),
-            menuContainerMaxX = _CGRectGetMaxX(menuContainerFrame);
-
-        // If within the x bounds of this menu container, return it.
-        if (x < menuContainerMaxX && x >= menuContainerMinX)
-            return menuContainer;
-
-        // If this is either the first or last menu *window*, check to see how close we are to it.
-        if (index === firstMenuWindowIndex || index === lastMenuWindowIndex)
-        {
-            var deltaX = ABS(x < menuContainerMinX ? menuContainerMinX - x : menuContainerMaxX - x);
-
-            if (deltaX < closerDeltaX)
-            {
-                closerMenuContainer = menuContainer;
-                closerDeltaX = deltaX;
-            }
-        }
-    }
-
-    return closerMenuContainer;
-}
-
-- (void)showMenu:(CPMenu)newMenu fromMenu:(CPMenu)baseMenu atPoint:(CGPoint)aGlobalLocation
-{
-    var count = _menuContainerStack.length,
-        index = count;
-
-    // Hide all menus up to the base menu...
-    while (index--)
-    {
-        var menuContainer = _menuContainerStack[index],
-            menu = [menuContainer menu];
-
-        // If we reach the base menu, or this menu is already being shown, break.
-        if (menu === baseMenu)
-            break;
-
-        // If this menu is already being shown, unhighlight and return.
-        if (menu === newMenu)//&& [menu supermenu] === baseMenu)
-            return [newMenu _highlightItemAtIndex:CPNotFound];
-
-        [menuContainer orderOut:self];
-        [menuContainer setMenu:nil];
-
-        [_CPMenuWindow poolMenuWindow:menuContainer];
-        [_menuContainerStack removeObjectAtIndex:index];
-    }
-
-    if (!newMenu)
-        return;
-
-    // Unhighlight any previously highlighted item.
-    [newMenu _highlightItemAtIndex:CPNotFound];
-
-    var menuWindow = [_CPMenuWindow menuWindowWithMenu:newMenu font:[_menuContainerStack[0] font]];
-
-    [_menuContainerStack addObject:menuWindow];
-
-    [menuWindow setConstraintRect:_constraintRect];
-
-    // If our parent menu is a menu bar...
-    if (baseMenu === [self trackingMenu] && [[self trackingMenuContainer] isMenuBar])
-        [menuWindow setBackgroundStyle:_CPMenuWindowMenuBarBackgroundStyle];
-    else
-        [menuWindow setBackgroundStyle:_CPMenuWindowPopUpBackgroundStyle];        
-    
-    [menuWindow setFrameOrigin:aGlobalLocation];
-    [menuWindow orderFront:self];
-}
-
-@end

AppKit/CPMenu/_CPMenuWindow.j

@@ -1,548 +0,0 @@
-
-#include "../CoreGraphics/CGGeometry.h"
-
-
-var _CPMenuWindowPool                       = [],
-    _CPMenuWindowPoolCapacity               = 5,
-    
-    _CPMenuWindowBackgroundColors           = [];
-    
-_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
-*/
-@implementation _CPMenuWindow : CPWindow
-{
-    _CPMenuView         _menuView;
-    CPClipView          _menuClipView;
-    
-    CPImageView         _moreAboveView;
-    CPImageView         _moreBelowView;
-    
-    CGRect              _unconstrainedFrame;
-    CGRect              _constraintRect;
-}
-
-+ (id)menuWindowWithMenu:(CPMenu)aMenu font:(CPFont)aFont
-{
-    var menuWindow = nil;
-
-    if (_CPMenuWindowPool.length)
-    {
-        menuWindow = _CPMenuWindowPool.pop();
-
-        // Do this so that coordinates will be accurate.
-        [menuWindow setFrameOrigin:CGPointMakeZero()];
-    }
-    else
-        menuWindow = [[_CPMenuWindow alloc] init];
-
-    [menuWindow setFont:aFont];
-    [menuWindow setMenu:aMenu];
-    [menuWindow setMinWidth:[aMenu minimumWidth]];
-
-    return menuWindow;
-}
-
-+ (void)poolMenuWindow:(_CPMenuWindow)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();
-
-    self = [super initWithContentRect:aRect styleMask:CPBorderlessWindowMask];
-
-    if (self)
-    {
-        [self setLevel:CPPopUpMenuWindowLevel];
-        [self setHasShadow:YES];
-        [self setShadowStyle:CPMenuWindowShadowStyle];
-        [self setAcceptsMouseMovedEvents:YES];
-
-        var contentView = [self contentView];
-        
-        _menuView = [[_CPMenuView alloc] initWithFrame:CGRectMakeZero()];
-        
-        _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:_CPMenuWindowMoreAboveImage];
-        [_moreAboveView setFrameSize:[_CPMenuWindowMoreAboveImage size]];
-        
-        [contentView addSubview:_moreAboveView];
-        
-        _moreBelowView = [[CPImageView alloc] initWithFrame:CGRectMakeZero()];
-    
-        [_moreBelowView setImage:_CPMenuWindowMoreBelowImage];
-        [_moreBelowView setFrameSize:[_CPMenuWindowMoreBelowImage size]];
-        
-        [contentView addSubview:_moreBelowView];
-
-        [self setShadowStyle:CPWindowShadowStyleMenu];
-    }
-    
-    return self;
-}
-
-+ (float)_standardLeftMargin
-{
-    return LEFT_MARGIN;
-}
-
-- (void)setFont:(CPFont)aFont
-{
-    [_menuView setFont:aFont];
-}
-
-- (CPFont)font
-{
-    return [_menuView font];
-}
-
-+ (CPColor)backgroundColorForBackgroundStyle:(_CPMenuWindowBackgroundStyle)aBackgroundStyle
-{
-    var color = _CPMenuWindowBackgroundColors[aBackgroundStyle];
-    
-    if (!color)
-    {
-        var bundle = [CPBundle bundleForClass:[self class]];
-
-        if (aBackgroundStyle == _CPMenuWindowPopUpBackgroundStyle)
-            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 = [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;
-    }
-
-    return color;
-}
-
-- (void)setBackgroundStyle:(_CPMenuWindowBackgroundStyle)aBackgroundStyle
-{
-    [self setBackgroundColor:[[self class] backgroundColorForBackgroundStyle:aBackgroundStyle]];
-}
-
-- (void)setMenu:(CPMenu)aMenu
-{
-    [aMenu _setMenuWindow:self];
-    [_menuView setMenu:aMenu];
-    
-    var menuViewSize = [_menuView frame].size;
-    
-    [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(LEFT_MARGIN, TOP_MARGIN, menuViewSize.width, menuViewSize.height)];
-}
-
-- (void)setMinWidth:(float)aWidth
-{
-    var size = [self unconstrainedFrame].size;
-
-    [self setFrameSize:CGSizeMake(MAX(size.width, aWidth), size.height)];
-}
-
-- (CPMenu)menu
-{
-    return [_menuView menu];
-}
-
-- (void)orderFront:(id)aSender
-{
-    [self setFrame:_unconstrainedFrame];
-    
-    [super orderFront:aSender];
-}
-
-- (void)setConstraintRect:(CGRect)aRect
-{
-    _constraintRect = aRect;
-
-    [self setFrame:_unconstrainedFrame];
-}
-
-- (CGRect)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))];
-}
-
-- (void)setFrameSize:(CGSize)aSize
-{
-    [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);
-
-    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).
-    constrainedFrame.origin.x = CGRectGetMinX(_unconstrainedFrame);
-    constrainedFrame.size.width = CGRectGetWidth(_unconstrainedFrame);
-
-    if (CGRectGetWidth(constrainedFrame) > CGRectGetWidth(_constraintRect))
-        constrainedFrame.size.width = CGRectGetWidth(_constraintRect);
-
-    if (CGRectGetMaxX(constrainedFrame) > CGRectGetMaxX(_constraintRect))
-        constrainedFrame.origin.x -= CGRectGetMaxX(constrainedFrame) - CGRectGetMaxX(_constraintRect);
-
-    if (CGRectGetMinX(constrainedFrame) < CGRectGetMinX(_constraintRect))
-        constrainedFrame.origin.x = CGRectGetMinX(_constraintRect);
-
-    [super setFrame:constrainedFrame display:shouldDisplay animate:shouldAnimate];
-
-    // This needs to happen before changing the frame.
-    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 = TOP_MARGIN,
-        bottomMargin = BOTTOM_MARGIN,
-        
-        contentView = [self contentView],
-        bounds = [contentView bounds];
-
-    if (moreAbove)
-    {
-        topMargin += SCROLL_INDICATOR_HEIGHT;
-    
-        var frame = [_moreAboveView frame];
-        
-        [_moreAboveView setFrameOrigin:CGPointMake((CGRectGetWidth(bounds) - CGRectGetWidth(frame)) / 2.0, (TOP_MARGIN + SCROLL_INDICATOR_HEIGHT - CGRectGetHeight(frame)) / 2.0)];
-    }
-
-    [_moreAboveView setHidden:!moreAbove];
-
-    if (moreBelow)
-    {
-        bottomMargin += SCROLL_INDICATOR_HEIGHT;
-    
-        [_moreBelowView setFrameOrigin:CGPointMake((CGRectGetWidth(bounds) - CGRectGetWidth([_moreBelowView frame])) / 2.0, CGRectGetHeight(bounds) - SCROLL_INDICATOR_HEIGHT - BOTTOM_MARGIN)];
-    }
-    
-    [_moreBelowView setHidden:!moreBelow];
-
-    var clipFrame = CGRectMake(LEFT_MARGIN, topMargin, CGRectGetWidth(constrainedFrame) - LEFT_MARGIN - RIGHT_MARGIN, CGRectGetHeight(constrainedFrame) - topMargin - bottomMargin)
-
-    [_menuClipView setFrame:clipFrame];
-    [_menuView setFrameSize:CGSizeMake(CGRectGetWidth(clipFrame), CGRectGetHeight([_menuView frame]))];
-
-    [_menuView scrollPoint:CGPointMake(0.0, [self convertBaseToGlobal:clipFrame.origin].y - menuViewOrigin.y)];
-}
-
-- (BOOL)hasMinimumNumberOfVisibleItems
-{
-    var visibleRect = [_menuView visibleRect];
-
-    // Clearly if the entire view isn't visible the minimum won't be visible.
-    if (CGRectIsEmpty(visibleRect))
-        return NO;
-
-    var numberOfUnhiddenItems = [_menuView numberOfUnhiddenItems],
-        minimumNumberOfVisibleItems = MIN(numberOfUnhiddenItems, 3),
-        count = 0,
-        index = [_menuView itemIndexAtPoint:[_menuView convertPoint:[_menuClipView frame].origin fromView:nil]];
-
-    for (; index < numberOfUnhiddenItems && count < minimumNumberOfVisibleItems; ++index)
-    {
-        var itemRect = [_menuView rectForUnhiddenItemAtIndex:index],
-            visibleItemRect = CGRectIntersection(visibleRect, itemRect);
-
-        // As soon as we get to the first unhidden item that is no longer visible, stop.
-        if (CGRectIsEmpty(visibleItemRect))
-            break;
-
-        // If the item is *completely* visible, count it.
-        if (CGRectEqualToRect(visibleItemRect, itemRect))
-            ++count;
-    }
-
-    return count >= minimumNumberOfVisibleItems;
-}
-
-- (BOOL)canScrollUp
-{
-    return ![_moreAboveView isHidden];
-}
-
-- (BOOL)canScrollDown
-{
-    return ![_moreBelowView isHidden];
-}
-
-- (BOOL)canScroll
-{
-    return [self canScrollUp] || [self canScrollDown];
-}
-
-- (void)scrollUp
-{
-    if (CGRectGetMinY(_unconstrainedFrame) >= CGRectGetMinY(_constraintRect))
-        return;
-
-    _unconstrainedFrame.origin.y += 10;
-
-    [self setFrame:_unconstrainedFrame];
-}
-
-- (void)scrollDown
-{
-    if (CGRectGetMaxY(_unconstrainedFrame) <= CGRectGetHeight(_constraintRect))
-        return;
-
-    _unconstrainedFrame.origin.y -= 10;
-
-    [self setFrame:_unconstrainedFrame];
-}
-
-@end
-
-@implementation _CPMenuWindow (CPMenuContainer)
-
-- (CGRect)globalFrame
-{
-    return [self frame];
-}
-
-- (BOOL)isMenuBar
-{
-    return NO;
-}
-
-- (_CPManagerScrollingState)scrollingStateForPoint:(CGPoint)aGlobalLocation
-{
-    var frame = [self frame];
-
-    if (![self canScroll])
-        return _CPMenuManagerScrollingStateNone;
-
-    // If we're at or above of the top scroll indicator...
-    if (aGlobalLocation.y < CGRectGetMinY(frame) + TOP_MARGIN + SCROLL_INDICATOR_HEIGHT)
-        return _CPMenuManagerScrollingStateUp;
-
-    // If we're at or below the bottom scroll indicator...
-    if (aGlobalLocation.y > CGRectGetMaxY(frame) - BOTTOM_MARGIN - SCROLL_INDICATOR_HEIGHT)
-        return _CPMenuManagerScrollingStateDown;
-
-    return _CPMenuManagerScrollingStateNone;
-}
-
-- (float)deltaYForItemAtIndex:(int)anIndex
-{
-    return TOP_MARGIN + CGRectGetMinY([_menuView rectForItemAtIndex:anIndex]);
-}
-
-- (CGPoint)rectForItemAtIndex:(int)anIndex
-{
-    return [_menuView convertRect:[_menuView rectForItemAtIndex:anIndex] toView:nil];
-}
-
-- (int)itemIndexAtPoint:(CGPoint)aPoint
-{
-    // Don't return indexes of items that aren't visible.
-    if (!CGRectContainsPoint([_menuClipView bounds], [_menuClipView convertPoint:aPoint fromView:nil]))
-        return NO;
-
-    return [_menuView itemIndexAtPoint:[_menuView convertPoint:aPoint fromView:nil]];
-}
-
-@end
-
-/*
-    @ignore
-*/
-
-@implementation _CPMenuView : CPView
-{
-    CPArray _menuItemViews;
-    CPArray _visibleMenuItemInfos;
-    
-    CPFont  _font @accessors(property=font);
-}
-
-- (unsigned)numberOfUnhiddenItems
-{
-    return _visibleMenuItemInfos.length;
-}
-
-- (CGRect)rectForUnhiddenItemAtIndex:(int)anIndex
-{
-    return [self rectForItemAtIndex:_visibleMenuItemInfos[anIndex].index];
-}
-
-- (CGRect)rectForItemAtIndex:(int)anIndex
-{
-    return [_menuItemViews[anIndex === CPNotFound ? 0 : anIndex] frame];
-}
-
-- (int)itemIndexAtPoint:(CGPoint)aPoint
-{
-    var x = aPoint.x,
-        bounds = [self bounds];
-
-    if (x < CGRectGetMinX(bounds) || x > CGRectGetMaxX(bounds))
-        return CPNotFound;
-
-    var y = aPoint.y,
-        low = 0,
-        high = _visibleMenuItemInfos.length - 1;
-
-    while (low <= high)
-    {
-        var middle = FLOOR(low + (high - low) / 2),
-            info = _visibleMenuItemInfos[middle]
-            frame = [info.view frame];
-
-        if (y < CGRectGetMinY(frame))
-            high = middle - 1;
-
-        else if (y > CGRectGetMaxY(frame))
-            low = middle + 1;
-
-        else
-            return info.index;
-   }
-
-   return CPNotFound;
-}
-
-- (void)tile
-{
-    [_menuItemViews makeObjectsPerformSelector:@selector(removeFromSuperview)];   
-
-    _menuItemViews = [];
-    _visibleMenuItemInfos = [];
-
-    var menu = [self menu];
-
-    if (!menu)
-        return;
-
-    var items = [menu itemArray],
-        index = 0,
-        count = [items count],
-        maxWidth = 0,
-        y = 0,
-        showsStateColumn = [menu showsStateColumn];
-
-    for (; index < count; ++index)
-    {
-        var item = items[index],
-            view = [item _menuItemView];        
-        
-        _menuItemViews.push(view);
-        
-        if ([item isHidden])
-            continue;
-
-        _visibleMenuItemInfos.push({ view:view, index:index });
-        
-        [view setFont:_font];
-        [view setShowsStateColumn:showsStateColumn];
-        [view synchronizeWithMenuItem];
-
-        [view setFrameOrigin:CGPointMake(0.0, y)];
-
-        [self addSubview:view];
-
-        var size = [view minSize],
-            width = size.width;
-
-        if (maxWidth < width)
-            maxWidth = width;
-
-        y += size.height;
-    }
-
-    for (index = 0; index < count; ++index)
-    {
-        var view = _menuItemViews[index];
-
-        [view setFrameSize:CGSizeMake(maxWidth, CGRectGetHeight([view frame]))];
-    }
-
-    [self setAutoresizesSubviews:NO];
-    [self setFrameSize:CGSizeMake(maxWidth, y)];
-    [self setAutoresizesSubviews:YES];
-}
-
-- (void)setMenu:(CPMenu)aMenu
-{
-    [super setMenu:aMenu];
-    [self tile];
-}
-
-@end

AppKit/CPMenuItem.j

@@ -24,10 +24,9 @@
 @import <Foundation/CPObject.j>
 @import <Foundation/CPString.j>
 
-@import "CPImage.j"
-@import "CPMenu.j"
-@import "CPView.j"
-@import "_CPMenuItemView.j"
+@import <AppKit/CPImage.j>
+@import <AppKit/CPMenu.j>
+@import <AppKit/CPView.j>
 
 /*! 
     @ingroup appkit
@@ -79,11 +78,6 @@
     _CPMenuItemView _menuItemView;
 }
 
-- (id)init
-{
-    return [self initWithTitle:@"" action:nil keyEquivalent:nil];
-}
-
 /*!
     Initializes the menu item with a title, action, and keyboard equivalent.
     @param aTitle the menu item's title
@@ -109,9 +103,7 @@
         
         _keyEquivalent = aKeyEquivalent || @"";
         _keyEquivalentModifierMask = CPPlatformActionKeyMask;
-
-        _indentationLevel = 0;
-
+        
         _mnemonicLocation = CPNotFound;
     }
     
@@ -121,7 +113,7 @@
 // Enabling a Menu Item
 /*!
     Sets whether the menu item is enabled or not
-    @param isEnabled \c YES enables the item. \c NO disables it.
+    @param isEnabled <code>YES</code> enables the item. <code>NO</code> disables it.
 */
 - (void)setEnabled:(BOOL)isEnabled
 {
@@ -136,7 +128,7 @@
 }
 
 /*!
-    Returns \c YES if the item is enabled.
+    Returns <code>YES</code> if the item is enabled.
 */
 - (BOOL)isEnabled
 {
@@ -146,7 +138,7 @@
 // Managing Hidden Status
 /*!
     Sets whether the item should be hidden. A hidden item can not be triggered by keyboard shortcuts.
-    @param isHidden \c YES hides the item. \c NO reveals it.
+    @param isHidden <code>YES</code> hides the item. <code>NO</code> reveals it.
 */
 - (void)setHidden:(BOOL)isHidden
 {
@@ -159,7 +151,7 @@
 }
 
 /*!
-    Returns \c YES if the item is hidden.
+    Returns <code>YES</code> if the item is hidden.
 */
 - (BOOL)isHidden
 {
@@ -167,7 +159,7 @@
 }
 
 /*!
-    Returns \c YES if the item is hidden or if one of it's supermenus is hidden.
+    Returns <code>YES</code> if the item is hidden or if one of it's supermenus is hidden.
 */
 - (BOOL)isHiddenOrHasHiddenAncestor
 {
@@ -451,37 +443,25 @@ CPOffState
 */
 - (void)setSubmenu:(CPMenu)aMenu
 {
-    if (_submenu === aMenu)
-        return;
-
     var supermenu = [_submenu supermenu];
-
+    
+    if (supermenu == self)
+        return;
+    
     if (supermenu)
-        [CPException raise:CPInvalidArgumentException
-		   reason: @"Can't add submenu \"" + [aMenu title] + "\" to item \"" + [self title] + "\", because it is already submenu of \"" + [[aMenu supermenu] title] + "\""];
-
+        return alert("bad");
+    
+    [_submenu setSupermenu:_menu];
+    
     _submenu = aMenu;
-
-    if (_submenu)
-    {
-        [_submenu setSupermenu:_menu];
-
-        [self setTarget:_menu];
-        [self setAction:@selector(submenuAction:)];
-    }
-    else
-    {
-        [self setTarget:nil];
-        [self setAction:NULL];
-    }
-
+    
     [_menuItemView setDirty];
-
+    
     [_menu itemChanged:self];
 }
 
 /*!
-    Returns the submenu of the item. \c nil if there is no submenu.
+    Returns the submenu of the item. <code>nil</code> if there is no submenu.
 */
 - (CPMenu)submenu
 {
@@ -489,7 +469,7 @@ CPOffState
 }
 
 /*!
-    Returns \c YES if the menu item has a submenu.
+    Returns <code>YES</code> if the menu item has a submenu.
 */
 - (BOOL)hasSubmenu
 {
@@ -511,7 +491,7 @@ CPOffState
 }
 
 /*!
-    Returns \c YES if the menu item is a separator.
+    Returns <code>YES</code> if the menu item is a separator.
 */
 - (BOOL)isSeparatorItem
 {
@@ -585,43 +565,6 @@ CPControlKeyMask
     return _keyEquivalentModifierMask;
 }
 
-- (CPString)keyEquivalentStringRepresentation
-{
-    if (![_keyEquivalent length])
-        return @"";
-
-    var string = _keyEquivalent.toUpperCase(),
-        needsShift = _keyEquivalentModifierMask & CPShiftKeyMask || string === _keyEquivalent;
-
-    if (CPBrowserIsOperatingSystem(CPMacOperatingSystem))
-    {
-        if (_keyEquivalentModifierMask & CPCommandKeyMask)
-            string = "⌘" + string;
-
-        if (needsShift)
-            string = "⇧" + string;
-
-        if (_keyEquivalentModifierMask & CPAlternateKeyMask)
-            string = "⌥" + string;
-
-        if (_keyEquivalentModifierMask & CPControlKeyMask)
-            string = "^" + string;
-    }
-    else
-    {
-        if (needsShift)
-            string = "Shift-" + string;
-
-        if (_keyEquivalentModifierMask & CPAlternateKeyMask)
-            string = "Alt-" + string;
-
-        if (_keyEquivalentModifierMask & CPControlKeyMask || _keyEquivalentModifierMask & CPCommandKeyMask)
-            string = "Ctrl-" + string;
-    }
-
-    return string;
-}
-
 // Managing Mnemonics
 /*!
     Sets the index of the mnemonic character in the title. The character
@@ -670,7 +613,7 @@ CPControlKeyMask
 
 /*!
     Sets whether this item is an alternate for the previous menu item.
-    @param isAlternate \c YES denotes that this menu item is an alternate
+    @param isAlternate <code>YES</code> denotes that this menu item is an alternate
 */
 - (void)setAlternate:(BOOL)isAlternate
 {
@@ -678,7 +621,7 @@ CPControlKeyMask
 }
 
 /*!
-    Returns \c YES if the menu item is an alternate for the previous item.
+    Returns <code>YES</code> if the menu item is an alternate for the previous item.
 */
 - (BOOL)isAlternate
 {
@@ -695,7 +638,7 @@ CPControlKeyMask
 - (void)setIndentationLevel:(unsigned)aLevel
 {
     if (aLevel < 0)
-        [CPException raise:CPInvalidArgumentException reason:"setIndentationLevel: argument must be greater than or equal to 0."];
+        [CPException raise:CPInvalidArgumentException reason:"setIndentationLevel: argument must be greater than 0."];
         
     _indentationLevel = MIN(15, aLevel);
 }
@@ -774,7 +717,7 @@ CPControlKeyMask
 // Getting Highlighted Status
 
 /*!
-    Returns \c YES if the menu item is highlighted.
+    Returns <code>YES</code> if the menu item is highlighted.
 */
 - (BOOL)isHighlighted
 {
@@ -794,43 +737,28 @@ CPControlKeyMask
     return _menuItemView;
 }
 
-- (BOOL)_isSelectable
-{
-    return ![self submenu] || [self action] !== @selector(submenuAction:) || [self target] !== [self menu];
-}
-
-- (BOOL)_isMenuBarButton
-{
-    return ![self submenu] && [self menu] === [CPApp mainMenu];
-}
-
 @end
 
-var CPMenuItemIsSeparatorKey                = @"CPMenuItemIsSeparatorKey",
+var CPMenuItemIsSeparatorKey        = @"CPMenuItemIsSeparatorKey",
 
-    CPMenuItemTitleKey                      = @"CPMenuItemTitleKey",
-    CPMenuItemTargetKey                     = @"CPMenuItemTargetKey",
-    CPMenuItemActionKey                     = @"CPMenuItemActionKey",
+    CPMenuItemTitleKey              = @"CPMenuItemTitleKey",
+    CPMenuItemTargetKey             = @"CPMenuItemTargetKey",
+    CPMenuItemActionKey             = @"CPMenuItemActionKey",
 
-    CPMenuItemIsEnabledKey                  = @"CPMenuItemIsEnabledKey",
-    CPMenuItemIsHiddenKey                   = @"CPMenuItemIsHiddenKey",
+    CPMenuItemIsEnabledKey          = @"CPMenuItemIsEnabledKey",
+    CPMenuItemIsHiddenKey           = @"CPMenuItemIsHiddenKey",
 
-    CPMenuItemTagKey                        = @"CPMenuItemTagKey",
-    CPMenuItemStateKey                      = @"CPMenuItemStateKey",
+    CPMenuItemTagKey                = @"CPMenuItemTagKey",
+    CPMenuItemStateKey              = @"CPMenuItemStateKey",
 
-    CPMenuItemImageKey                      = @"CPMenuItemImageKey",
-    CPMenuItemAlternateImageKey             = @"CPMenuItemAlternateImageKey",
+    CPMenuItemImageKey              = @"CPMenuItemImageKey",
+    CPMenuItemAlternateImageKey     = @"CPMenuItemAlternateImageKey",
 
-    CPMenuItemSubmenuKey                    = @"CPMenuItemSubmenuKey",
-    CPMenuItemMenuKey                       = @"CPMenuItemMenuKey",
+    CPMenuItemSubmenuKey            = @"CPMenuItemSubmenuKey",
+    CPMenuItemMenuKey               = @"CPMenuItemMenuKey",
 
-    CPMenuItemKeyEquivalentKey              = @"CPMenuItemKeyEquivalentKey",
-    CPMenuItemKeyEquivalentModifierMaskKey  = @"CPMenuItemKeyEquivalentModifierMaskKey",
-
-    CPMenuItemIndentationLevelKey           = @"CPMenuItemIndentationLevelKey",
-
-    CPMenuItemRepresentedObjectKey          = @"CPMenuItemRepresentedObjectKey",
-    CPMenuItemViewKey                       = @"CPMenuItemViewKey";
+    CPMenuItemRepresentedObjectKey  = @"CPMenuItemRepresentedObjectKey",
+    CPMenuItemViewKey               = @"CPMenuItemViewKey";
 
 #define DEFAULT_VALUE(aKey, aDefaultValue) [aCoder containsValueForKey:(aKey)] ? [aCoder decodeObjectForKey:(aKey)] : (aDefaultValue)
 #define ENCODE_IFNOT(aKey, aValue, aDefaultValue) if ((aValue) !== (aDefaultValue)) [aCoder encodeObject:(aValue) forKey:(aKey)];
@@ -868,19 +796,16 @@ var CPMenuItemIsSeparatorKey                = @"CPMenuItemIsSeparatorKey",
 //    CPImage         _offStateImage;
 //    CPImage         _mixedStateImage;
 
-        // This order matters because setSubmenu: needs _menu to be around.
+        _submenu = DEFAULT_VALUE(CPMenuItemSubmenuKey, nil);
         _menu = DEFAULT_VALUE(CPMenuItemMenuKey, nil);
-        [self setSubmenu:DEFAULT_VALUE(CPMenuItemSubmenuKey, nil)];
 
-        _keyEquivalent = [aCoder decodeObjectForKey:CPMenuItemKeyEquivalentKey] || @"";
-        _keyEquivalentModifierMask = [aCoder decodeObjectForKey:CPMenuItemKeyEquivalentModifierMaskKey] || 0;
+//    CPString        _keyEquivalent;
+//    unsigned        _keyEquivalentModifierMask;
 
 //    int             _mnemonicLocation;
 
 //    BOOL            _isAlternate;
-
-        // Default is 0.
-        [self setIndentationLevel:[aCoder decodeIntForKey:CPMenuItemIndentationLevelKey] || 0];
+//    int             _indentationLevel;
 
 //    CPString        _toolTip;
 
@@ -917,17 +842,423 @@ var CPMenuItemIsSeparatorKey                = @"CPMenuItemIsSeparatorKey",
     ENCODE_IFNOT(CPMenuItemSubmenuKey, _submenu, nil);
     ENCODE_IFNOT(CPMenuItemMenuKey, _menu, nil);
 
-    if (_keyEquivalent && _keyEquivalent.length)
-        [aCoder encodeObject:_keyEquivalent forKey:CPMenuItemKeyEquivalentKey];
-
-    if (_keyEquivalentModifierMask)
-        [aCoder encodeObject:_keyEquivalentModifierMask forKey:CPMenuItemKeyEquivalentModifierMaskKey];
-
-    if (_indentationLevel > 0)
-        [aCoder encodeInt:_indentationLevel forKey:CPMenuItemIndentationLevelKey];
-
     ENCODE_IFNOT(CPMenuItemRepresentedObjectKey, _representedObject, nil);
     ENCODE_IFNOT(CPMenuItemViewKey, _view, nil);
 }
 
 @end
+
+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
+*/
+@implementation _CPMenuItemView : CPView
+{
+    CPMenuItem              _menuItem;
+
+    CPFont                  _font;
+    CPColor                 _textColor;
+    CPColor                 _textShadowColor;
+    CPColor                 _activateColor;
+    CPColor                 _activateShadowColor;
+
+    CGSize                  _minSize;
+    BOOL                    _isDirty;
+    BOOL                    _showsStateColumn;
+    BOOL                    _belongsToMenuBar;
+
+    CPImageView             _stateView;
+    _CPImageAndTextView     _imageAndTextView;
+    CPView                  _submenuView;
+}
+
++ (void)initialize
+{
+    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;
+}
+
++ (float)leftMargin
+{
+    return LEFT_MARGIN + STATE_COLUMN_WIDTH;
+}
+
+- (id)initWithFrame:(CGRect)aFrame forMenuItem:(CPMenuItem)aMenuItem
+{
+    self = [super initWithFrame:aFrame];
+    
+    if (self)
+    {
+        _menuItem = aMenuItem;
+        _showsStateColumn = YES;
+        _isDirty = YES;
+        
+        [self setAutoresizingMask:CPViewWidthSizable];
+        
+        [self synchronizeWithMenuItem];
+    }
+    
+    return self;
+}
+
+- (CGSize)minSize
+{
+    return _minSize;
+}
+
+- (void)setDirty
+{
+    _isDirty = YES;
+}
+
+- (void)synchronizeWithMenuItem
+{
+    if (!_isDirty)
+        return;
+        
+    _isDirty = NO;
+        
+    var view = [_menuItem view];
+    
+    if ([_menuItem isSeparatorItem])
+    {
+        var line = [[CPView alloc] initWithFrame:CGRectMake(0.0, 5.0, 10.0, 1.0)];
+        
+        view = [[CPView alloc] initWithFrame:CGRectMake(0.0, 0.0, 0.0, 10.0)];
+        
+        [view setAutoresizingMask:CPViewWidthSizable];
+        [line setAutoresizingMask:CPViewWidthSizable];
+        
+        [line setBackgroundColor:[CPColor lightGrayColor]];
+        
+        [view addSubview:line];
+    }
+    
+    if (view)
+    {
+        [_imageAndTextView removeFromSuperview];
+        _imageAndTextView = nil;
+        
+        [_stateView removeFromSuperview];
+        _stateView = nil;
+        
+        [_submenuView removeFromSuperview];
+        _submenuView = nil;
+        
+        _minSize = [view frame].size;
+        
+        [self setFrameSize:_minSize];
+        
+        [self addSubview:view];
+        
+        return;
+    }
+    
+    // State Column
+    var x = _belongsToMenuBar ? 0.0 : (LEFT_MARGIN + [_menuItem indentationLevel] * INDENTATION_WIDTH);
+    
+    if (_showsStateColumn)
+    {
+        if (!_stateView)
+        {
+            _stateView = [[CPImageView alloc] initWithFrame:CGRectMake(x, (CGRectGetHeight([self frame]) - STATE_COLUMN_WIDTH) / 2.0, STATE_COLUMN_WIDTH, STATE_COLUMN_WIDTH)];
+            
+            [_stateView setAutoresizingMask:CPViewMinYMargin | CPViewMaxYMargin];
+            
+            [self addSubview:_stateView];
+        }
+        
+        var state = [_menuItem state];
+            
+        switch (state)
+        {
+            case CPOffState:
+            case CPOnState:
+            case CPMixedState:  [_stateView setImage:_CPMenuItemDefaultStateImages[state]];
+                                break;
+                                
+            default:            [_stateView setImage:nil];
+        }
+        
+        x += STATE_COLUMN_WIDTH;
+    }
+    else
+    {
+        [_stateView removeFromSuperview];
+        
+        _stateView = nil;
+    }
+    
+    // Image and Title
+    
+    if (!_imageAndTextView)
+    {
+        _imageAndTextView = [[_CPImageAndTextView alloc] initWithFrame:CGRectMake(0.0, 0.0, 0.0, 0.0)];
+        
+        [_imageAndTextView setImagePosition:CPImageLeft];
+        [_imageAndTextView setTextShadowOffset:CGSizeMake(0.0, 1.0)];
+        
+        [self addSubview:_imageAndTextView];
+    }
+    
+    var font = [_menuItem font];
+    
+    if (!font)
+        font = _font;
+
+    [_imageAndTextView setFont:font];
+    [_imageAndTextView setVerticalAlignment:CPCenterVerticalTextAlignment];
+    [_imageAndTextView setImage:[_menuItem image]];
+    [_imageAndTextView setText:[_menuItem title]];
+    [_imageAndTextView setTextColor:[self textColor]];
+    [_imageAndTextView setTextShadowColor:[self textShadowColor]];
+    [_imageAndTextView setTextShadowOffset:CGSizeMake(0, 1)];
+    [_imageAndTextView setFrameOrigin:CGPointMake(x, VERTICAL_MARGIN)];
+    [_imageAndTextView sizeToFit];
+    
+    var frame = [_imageAndTextView frame];
+    
+//    frame.size.height += 1.0;
+//    [_imageAndTextView setFrame:frame];
+    
+    frame.size.height += 2 * VERTICAL_MARGIN;
+    
+    x += CGRectGetWidth(frame);
+    
+    // Submenu Arrow
+    if ([_menuItem hasSubmenu])
+    {
+        x += 3.0;
+        
+        if (!_submenuView)
+        {
+            _submenuView = [[_CPMenuItemArrowView alloc] initWithFrame:CGRectMake(0.0, 0.0, 10.0, 10.0)];
+            
+            [self addSubview:_submenuView];
+        }
+        
+        [_submenuView setHidden:NO];
+        [_submenuView setColor:_belongsToMenuBar ? [self textColor] : nil];
+        [_submenuView setFrameOrigin:CGPointMake(x, (CGRectGetHeight(frame) - 10.0) / 2.0)];
+        
+        x += 10.0;
+    }
+    else
+        [_submenuView setHidden:YES];
+
+    _minSize = CGSizeMake(x + (_belongsToMenuBar ? 0.0 : RIGHT_MARGIN) + 3.0, CGRectGetHeight(frame));
+ 
+    [self setFrameSize:_minSize];
+}
+
+- (CGFloat)overlapOffsetWidth
+{
+    return LEFT_MARGIN + ([[_menuItem menu] showsStateColumn] ? STATE_COLUMN_WIDTH : 0.0);
+}
+
+- (void)setShowsStateColumn:(BOOL)shouldShowStateColumn
+{
+    _showsStateColumn = shouldShowStateColumn;
+}
+
+- (void)setBelongsToMenuBar:(BOOL)shouldBelongToMenuBar
+{
+    _belongsToMenuBar = shouldBelongToMenuBar;
+}
+
+- (void)highlight:(BOOL)shouldHighlight
+{
+    // ASSERT(![_menuItem view]);
+    
+    if (_belongsToMenuBar)
+        [_imageAndTextView setImage:shouldHighlight ? [_menuItem alternateImage] : [_menuItem image]];
+    
+    else if ([_menuItem isEnabled])
+    {
+        if (shouldHighlight)
+        {
+            [self setBackgroundColor:_CPMenuItemSelectionColor];
+    
+            [_imageAndTextView setTextColor:[CPColor whiteColor]];
+            [_imageAndTextView setTextShadowColor:_CPMenuItemTextShadowColor];
+        }
+        else
+        {
+            [self setBackgroundColor:nil];
+            
+            [_imageAndTextView setTextColor:[self textColor]];
+            [_imageAndTextView setTextShadowColor:[self textShadowColor]];
+        }
+        
+        var state = [_menuItem state];
+        
+        switch (state)
+        {
+            case CPOffState:
+            case CPOnState:
+            case CPMixedState:  [_stateView setImage:shouldHighlight ? _CPMenuItemDefaultStateHighlightedImages[state] : _CPMenuItemDefaultStateImages[state]];
+                            break;
+                            
+            default:            [_stateView setImage:nil];
+        }
+    }
+}
+
+- (void)activate:(BOOL)shouldActivate
+{
+    [_imageAndTextView setImage:[_menuItem image]];
+    
+    if (shouldActivate)
+    {
+        [_imageAndTextView setTextColor:[self activateColor] || [CPColor whiteColor]];
+        [_imageAndTextView setTextShadowColor:[self activateShadowColor] || [CPColor blackColor]];
+        [_submenuView setColor:[self activateColor] || [CPColor whiteColor]];
+    }
+    else
+    {
+        [_imageAndTextView setTextColor:[self textColor]];
+        [_imageAndTextView setTextShadowColor:[self textShadowColor]];
+        [_submenuView setColor:[self textColor]];
+    }
+}
+
+- (BOOL)eventOnSubmenu:(CPEvent)anEvent
+{
+    if (![_menuItem hasSubmenu])
+        return NO;
+        
+    return CGRectContainsPoint([_submenuView frame], [self convertPoint:[anEvent locationInWindow] fromView:nil]);
+}
+
+- (BOOL)isHidden
+{
+    return [_menuItem isHidden];
+}
+
+- (CPMenuItem)menuItem
+{
+    return _menuItem;
+}
+
+- (void)setFont:(CPFont)aFont
+{
+    if (_font == aFont)
+        return;
+    
+    _font = aFont;
+    
+    [self setDirty];
+}
+
+- (void)setTextColor:(CPColor)aColor
+{
+    if (_textColor == aColor)
+        return;
+    
+    _textColor = aColor;
+
+    [_imageAndTextView setTextColor:[self textColor]];
+    [_submenuView setColor:[self textColor]];
+}
+
+- (CPColor)textColor
+{
+    return [_menuItem isEnabled] ? (_textColor ? _textColor : [CPColor colorWithCalibratedRed:70.0 / 255.0 green:69.0 / 255.0 blue:69.0 / 255.0 alpha:1.0]) : [CPColor darkGrayColor];
+}
+
+- (void)setTextShadowColor:(CPColor)aColor
+{
+    if (_textShadowColor == aColor)
+        return;
+    
+    _textShadowColor = aColor;
+
+    [_imageAndTextView setTextShadowColor:[self textShadowColor]];
+    //[_submenuView setColor:[self textColor]];
+}
+
+- (CPColor)textShadowColor
+{
+    return [_menuItem isEnabled] ? (_textShadowColor ? _textShadowColor : [CPColor colorWithWhite:1.0 alpha:0.8]) : [CPColor colorWithWhite:0.8 alpha:0.8];
+}
+
+- (void)setActivateColor:(CPColor)aColor
+{
+    _activateColor = aColor;
+}
+
+- (CPColor)activateColor
+{
+    return _activateColor;
+}
+
+- (void)setActivateShadowColor:(CPColor)aColor
+{
+    _activateShadowColor = aColor;
+}
+
+- (CPColor)activateShadowColor
+{
+    return _activateShadowColor;
+}
+
+@end
+
+@implementation _CPMenuItemArrowView : CPView
+{
+    CPColor _color;
+}
+
+- (void)setColor:(CPColor)aColor
+{
+    if (_color == aColor)
+        return;
+
+    _color = aColor;
+    
+    [self setNeedsDisplay:YES];
+}
+
+- (void)drawRect:(CGRect)aRect
+{
+    var context = [[CPGraphicsContext currentContext] graphicsPort];
+    
+    CGContextBeginPath(context);
+    
+    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);
+    CGContextFillPath(context);
+}
+
+@end

AppKit/CPMenuItem/_CPMenuItemMenuBarView.j

@@ -1,235 +0,0 @@
-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
-{
-    CPMenuItem              _menuItem @accessors(property=menuItem);
-
-    CPFont                  _font;
-    CPColor                 _textColor;
-    CPColor                 _textShadowColor;
-
-    BOOL                    _isDirty;
-
-    _CPImageAndTextView     _imageAndTextView;
-    CPView                  _submenuIndicatorView;
-}
-
-+ (void)initialize
-{
-    if (self !== [_CPMenuItemMenuBarView class])
-        return;
-
-    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
-{
-    return [[self alloc] init];
-}
-
-- (id)initWithFrame:(CGRect)aFrame
-{
-    self = [super initWithFrame:aFrame];
-
-    if (self)
-    {
-        _imageAndTextView = [[_CPImageAndTextView alloc] initWithFrame:CGRectMake(HORIZONTAL_MARGIN, 0.0, 0.0, 0.0)];
-
-        [_imageAndTextView setImagePosition:CPImageLeft];
-        [_imageAndTextView setTextShadowOffset:CGSizeMake(0.0, 1.0)];
-        [_imageAndTextView setAutoresizingMask:CPViewMinYMargin | CPViewMaxYMargin];
-
-        [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;
-}
-
-- (CPColor)textColor
-{
-    if (![_menuItem isEnabled])
-        return [CPColor lightGrayColor];
-
-    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 colorWithWhite:0.8 alpha:0.8];
-
-    return _textShadowColor || [CPColor colorWithWhite:1.0 alpha:0.8];
-}
-
-- (void)update
-{
-    var x = HORIZONTAL_MARGIN,
-        height = 0.0;
-
-    [_imageAndTextView setFont:[_menuItem font] || [_CPMenuBarWindow font]];
-    [_imageAndTextView setVerticalAlignment:CPCenterVerticalTextAlignment];
-    [_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));
-
-    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];
-    }
-
-    _minSize = CGSizeMake(x + HORIZONTAL_MARGIN, height);
-    
-    [self setAutoresizesSubviews:NO];
-    [self setFrameSize:_minSize];
-    [self setAutoresizesSubviews:YES];
-}
-
-- (void)highlight:(BOOL)shouldHighlight
-{
-    // FIXME: This should probably be even throw.
-    if (![_menuItem isEnabled])
-        shouldHighlight = NO;
-
-    if (shouldHighlight)
-    {
-        if (![_menuItem _isMenuBarButton])
-            [self setBackgroundColor:SelectionColor];
-
-        [_imageAndTextView setImage:[_menuItem alternateImage] || [_menuItem image]];
-        [_imageAndTextView setTextColor:[CPColor whiteColor]];
-        [_imageAndTextView setTextShadowColor:_CPMenuItemTextShadowColor];
-
-        [_submenuIndicatorView setColor:[CPColor whiteColor]];
-        [_submenuIndicatorView setShadowColor:[CPColor colorWithWhite:0.1 alpha:0.7]];
-    }
-    else
-    {
-        [self setBackgroundColor:nil];
-
-        [_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,38 +0,0 @@
-
-@import <AppKit/CPView.j>
-
-
-@implementation _CPMenuItemSeparatorView : CPView
-{
-}
-
-+ (id)view
-{
-    return [[self alloc] initWithFrame:CGRectMake(0.0, 0.0, 0.0, 10.0)];
-}
-
-- (id)initWithFrame:(CGRect)aFrame
-{
-    self = [super initWithFrame:aFrame];
-
-    if (self)
-        [self setAutoresizingMask:CPViewWidthSizable];
-
-    return self;
-}
-
-- (void)drawRect:(CGRect)aRect
-{
-    var context = [[CPGraphicsContext currentContext] graphicsPort],
-        bounds = [self bounds];
-
-    CGContextBeginPath(context);
-    
-    CGContextMoveToPoint(context, CGRectGetMinX(bounds), FLOOR(CGRectGetMidY(bounds)) - 0.5);
-    CGContextAddLineToPoint(context, CGRectGetMaxX(bounds), FLOOR(CGRectGetMidY(bounds)) - 0.5);
-    
-    CGContextSetStrokeColor(context, [CPColor lightGrayColor]);
-    CGContextStrokePath(context);
-}
-
-@end

AppKit/CPMenuItem/_CPMenuItemStandardView.j

@@ -1,300 +0,0 @@
-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;
-
-    CPImageView             _stateView;
-    _CPImageAndTextView     _imageAndTextView;
-    _CPImageAndTextView     _keyEquivalentView;
-    CPView                  _submenuIndicatorView;
-}
-
-+ (void)initialize
-{
-    if (self !== [_CPMenuItemStandardView class])
-        return;
-
-    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
-{
-    return [[self alloc] init];
-}
-
-+ (float)_standardLeftMargin
-{
-    return LEFT_MARGIN + STATE_COLUMN_WIDTH;
-}
-
-- (id)initWithFrame:(CGRect)aFrame
-{
-    self = [super initWithFrame:aFrame];
-
-    if (self)
-    {
-        _stateView = [[CPImageView alloc] initWithFrame:CGRectMake(0.0, 0.0, 0.0, 0.0)];
-
-        [_stateView setImageScaling:CPScaleNone];
-
-        [self addSubview:_stateView];
-
-        _imageAndTextView = [[_CPImageAndTextView alloc] initWithFrame:CGRectMake(0.0, 0.0, 0.0, 0.0)];
-
-        [_imageAndTextView setImagePosition:CPImageLeft];
-        [_imageAndTextView setTextShadowOffset:CGSizeMake(0.0, 1.0)];
-
-        [self addSubview:_imageAndTextView];
-
-        _keyEquivalentView = [[_CPImageAndTextView alloc] initWithFrame:CGRectMake(0.0, 0.0, 0.0, 0.0)];
-
-        [_keyEquivalentView setImagePosition:CPNoImage];
-        [_keyEquivalentView setTextShadowOffset:CGSizeMake(0.0, 1.0)];
-        [_keyEquivalentView setAutoresizingMask:CPViewMinXMargin];
-
-        [self addSubview:_keyEquivalentView];
-
-        _submenuIndicatorView = [[_CPMenuItemSubmenuIndicatorView alloc] initWithFrame:CGRectMake(0.0, 0.0, 8.0, 10.0)];
-
-        [_submenuIndicatorView setColor:SUBMENU_INDICATOR_COLOR];
-        [_submenuIndicatorView setAutoresizingMask:CPViewMinXMargin];
-
-        [self addSubview:_submenuIndicatorView];
-
-        [self setAutoresizingMask:CPViewWidthSizable];
-    }
-
-    return self;
-}
-
-- (CPColor)textColor
-{
-    if (![_menuItem isEnabled])
-        return [CPColor lightGrayColor];
-
-    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 nil;
-
-    return _textShadowColor || [CPColor colorWithWhite:1.0 alpha:0.8];
-}
-
-- (void)setFont:(CPFont)aFont
-{
-    _font = aFont;
-}
-
-- (void)update
-{
-    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];
-
-        x += STATE_COLUMN_WIDTH;
-    }
-    else
-        [_stateView setHidden:YES];
-
-    [_imageAndTextView setFont:[_menuItem font] || _font];
-    [_imageAndTextView setVerticalAlignment:CPCenterVerticalTextAlignment];
-    [_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));
-
-    var hasKeyEquivalent = !![_menuItem keyEquivalent],
-        hasSubmenu = [_menuItem hasSubmenu];
-
-    if (hasKeyEquivalent || hasSubmenu)
-        x += RIGHT_COLUMNS_MARGIN;
-
-    if (hasKeyEquivalent)
-    {
-        [_keyEquivalentView setFont:[_menuItem font] || _font];
-        [_keyEquivalentView setVerticalAlignment:CPCenterVerticalTextAlignment];
-        [_keyEquivalentView setImage:[_menuItem image]];
-        [_keyEquivalentView setText:[_menuItem keyEquivalentStringRepresentation]];
-        [_keyEquivalentView setTextColor:[self textColor]];
-        [_keyEquivalentView setTextShadowColor:[self textShadowColor]];
-        [_keyEquivalentView setTextShadowOffset:CGSizeMake(0, 1)];
-        [_keyEquivalentView setFrameOrigin:CGPointMake(x, VERTICAL_MARGIN)];
-        [_keyEquivalentView sizeToFit];
-        
-        var keyEquivalentViewFrame = [_keyEquivalentView frame];
-
-        keyEquivalentViewFrame.origin.x = x;
-        x += CGRectGetWidth(keyEquivalentViewFrame);
-        height = MAX(height, CGRectGetHeight(keyEquivalentViewFrame));
-
-        if (hasSubmenu)
-            x += RIGHT_COLUMNS_MARGIN;
-    }
-    else
-        [_keyEquivalentView setHidden:YES];
-
-    if (hasSubmenu)
-    {
-        [_submenuIndicatorView setHidden:NO];
-
-        var submenuViewFrame = [_submenuIndicatorView frame];
-
-        submenuViewFrame.origin.x = x;
-
-        x += CGRectGetWidth(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 (hasStateColumn)
-        [_stateView setFrameSize:CGSizeMake(STATE_COLUMN_WIDTH, height)];
-
-    if (hasKeyEquivalent)
-    {
-        keyEquivalentViewFrame.origin.y = FLOOR((height - CGRectGetHeight(keyEquivalentViewFrame)) / 2.0);
-        [_keyEquivalentView setFrame:keyEquivalentViewFrame];
-    }
-    
-    if (hasSubmenu)
-    {
-        submenuViewFrame.origin.y = FLOOR((height - CGRectGetHeight(submenuViewFrame)) / 2.0);
-        [_submenuIndicatorView setFrame:submenuViewFrame];
-    }
-
-    _minSize = CGSizeMake(x + RIGHT_MARGIN, height);
-    
-    [self setAutoresizesSubviews:NO];
-    [self setFrameSize:_minSize];
-    [self setAutoresizesSubviews:YES];
-}
-
-- (void)highlight:(BOOL)shouldHighlight
-{
-    // FIXME: This should probably be even throw.
-    if (![_menuItem isEnabled])
-        return; 
-
-    if (shouldHighlight)
-    {
-        [self setBackgroundColor:_CPMenuItemSelectionColor];
-
-        [_imageAndTextView setImage:[_menuItem alternateImage] || [_menuItem image]];
-        [_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]];
-        [_imageAndTextView setTextColor:[self textColor]];
-        [_keyEquivalentView setTextColor:[self textColor]];
-        [_submenuIndicatorView setColor:SUBMENU_INDICATOR_COLOR];
-
-        [_imageAndTextView setTextShadowColor:[self textShadowColor]];
-        [_keyEquivalentView setTextShadowColor:[self textShadowColor]];
-    }
-    
-    if (shouldHighlight)
-        [_stateView setImage:_CPMenuItemDefaultStateHighlightedImages[[_menuItem state]] || nil];
-    else
-        [_stateView setImage:_CPMenuItemDefaultStateImages[[_menuItem state]] || nil];
-}
-
-@end
-
-@implementation _CPMenuItemSubmenuIndicatorView : CPView
-{
-    CPColor _color;
-}
-
-- (void)setColor:(CPColor)aColor
-{
-    if (_color === aColor)
-        return;
-
-    _color = aColor;
-
-    [self setNeedsDisplay:YES];
-}
-
-- (void)drawRect:(CGRect)aRect
-{
-    var context = [[CPGraphicsContext currentContext] graphicsPort],
-        bounds = [self bounds];
-    
-    CGContextBeginPath(context);
-    
-    CGContextMoveToPoint(context, CGRectGetMinX(bounds), CGRectGetMinY(bounds));
-    CGContextAddLineToPoint(context, CGRectGetMaxX(bounds), CGRectGetMidY(bounds));
-    CGContextAddLineToPoint(context, CGRectGetMinX(bounds), CGRectGetMaxY(bounds));
-    
-    CGContextClosePath(context);
-    
-    CGContextSetFillColor(context, _color);
-    CGContextFillPath(context);
-}
-
-@end

AppKit/CPMenuItem/_CPMenuItemView.j

@@ -1,255 +0,0 @@
-
-@import "_CPMenuItemSeparatorView.j"
-@import "_CPMenuItemStandardView.j"
-@import "_CPMenuItemMenuBarView.j"
-
-
-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
-*/
-@implementation _CPMenuItemView : CPView
-{
-    CPMenuItem              _menuItem;
-    CPView                  _view;
-
-    CPFont                  _font;
-    CPColor                 _textColor;
-    CPColor                 _textShadowColor;
-
-    CGSize                  _minSize;
-    BOOL                    _isDirty;
-    BOOL                    _showsStateColumn;
-
-    CPImageView             _stateView;
-    _CPImageAndTextView     _imageAndTextView;
-    CPView                  _submenuView;
-}
-
-+ (void)initialize
-{
-    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;
-}
-
-+ (float)leftMargin
-{
-    return LEFT_MARGIN + STATE_COLUMN_WIDTH;
-}
-
-- (id)initWithFrame:(CGRect)aFrame forMenuItem:(CPMenuItem)aMenuItem
-{
-    self = [super initWithFrame:aFrame];
-
-    if (self)
-    {
-        _menuItem = aMenuItem;
-        _showsStateColumn = YES;
-        _isDirty = YES;
-        
-        [self setAutoresizingMask:CPViewWidthSizable];
-
-        [self synchronizeWithMenuItem];
-    }
-    
-    return self;
-}
-
-- (CGSize)minSize
-{
-    return _minSize;
-}
-
-- (void)setDirty
-{
-    _isDirty = YES;
-}
-
-- (void)synchronizeWithMenuItem
-{
-    var menuItemView = [_menuItem view];
-
-    if ([_menuItem isSeparatorItem])
-    {
-        if (![_view isKindOfClass:[_CPMenuItemSeparatorView class]])
-        {
-            [_view removeFromSuperview];
-            _view = [_CPMenuItemSeparatorView view];
-        }
-    }
-    else if (menuItemView)
-    {
-        if (_view !== menuItemView)
-        {
-            [_view removeFromSuperview];
-            _view = menuItemView;
-        }
-    }
-    
-    else if ([_menuItem menu] == [CPApp mainMenu])
-    {
-        if (![_view isKindOfClass:[_CPMenuItemMenuBarView class]])
-        {
-            [_view removeFromSuperview];
-            _view = [_CPMenuItemMenuBarView view];
-        }
-
-        [_view setMenuItem:_menuItem];
-    }
-    else
-    {
-        if (![_view isKindOfClass:[_CPMenuItemStandardView class]])
-        {
-            [_view removeFromSuperview];
-            _view = [_CPMenuItemStandardView view];
-        }
-        
-        [_view setMenuItem:_menuItem];
-    }
-
-    if ([_view superview] !== self)
-        [self addSubview:_view];
-
-    if ([_view respondsToSelector:@selector(update)])
-        [_view update];
-
-    _minSize = [_view frame].size;
-    [self setAutoresizesSubviews:NO];
-    [self setFrameSize:_minSize];
-    [self setAutoresizesSubviews:YES];
-}
-
-- (void)setShowsStateColumn:(BOOL)shouldShowStateColumn
-{
-    _showsStateColumn = shouldShowStateColumn;
-}
-
-- (void)highlight:(BOOL)shouldHighlight
-{
-    if ([_view respondsToSelector:@selector(highlight:)])
-        [_view highlight:shouldHighlight];
-}
-
-- (BOOL)eventOnSubmenu:(CPEvent)anEvent
-{
-    if (![_menuItem hasSubmenu])
-        return NO;
-        
-    return CGRectContainsPoint([_submenuView frame], [self convertPoint:[anEvent locationInWindow] fromView:nil]);
-}
-
-- (BOOL)isHidden
-{
-    return [_menuItem isHidden];
-}
-
-- (CPMenuItem)menuItem
-{
-    return _menuItem;
-}
-
-- (void)setFont:(CPFont)aFont
-{
-    if (_font === aFont)
-        return;
-
-    _font = aFont;
-
-    if ([_view respondsToSelector:@selector(setFont:)])
-        [_view setFont:aFont];
-
-    [self setDirty];
-}
-
-- (void)setTextColor:(CPColor)aColor
-{
-    if (_textColor == aColor)
-        return;
-    
-    _textColor = aColor;
-
-    [_imageAndTextView setTextColor:[self textColor]];
-    [_submenuView setColor:[self textColor]];
-}
-
-- (CPColor)textColor
-{
-    return nil;
-}
-
-- (void)setTextShadowColor:(CPColor)aColor
-{
-    if (_textShadowColor == aColor)
-        return;
-    
-    _textShadowColor = aColor;
-
-    [_imageAndTextView setTextShadowColor:[self textShadowColor]];
-    //[_submenuView setColor:[self textColor]];
-}
-
-- (CPColor)textShadowColor
-{
-    return [_menuItem isEnabled] ? (_textShadowColor ? _textShadowColor : [CPColor colorWithWhite:1.0 alpha:0.8]) : [CPColor colorWithWhite:0.8 alpha:0.8];
-}
-
-@end
-
-@implementation _CPMenuItemArrowView : CPView
-{
-    CPColor _color;
-}
-
-- (void)setColor:(CPColor)aColor
-{
-    if (_color == aColor)
-        return;
-
-    _color = aColor;
-    
-    [self setNeedsDisplay:YES];
-}
-
-- (void)drawRect:(CGRect)aRect
-{
-    var context = [[CPGraphicsContext currentContext] graphicsPort];
-    
-    CGContextBeginPath(context);
-    
-    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);
-    CGContextFillPath(context);
-}
-
-@end

AppKit/CPOpenPanel.j

@@ -1,46 +0,0 @@
-
-@import <AppKit/CPPanel.j>
-
-
-@implementation CPOpenPanel : CPPanel
-{
-    BOOL    _canChooseFiles             @accessors(property=canChooseFiles);
-    BOOL    _canChooseDirectories       @accessors(property=canChooseDirectories);
-    BOOL    _allowsMultipleSelection    @accessors(property=allowsMultipleSelection);
-    CPURL   _directoryURL               @accessors(property=directoryURL);
-    CPArray _URLs;
-}
-
-+ (id)openPanel
-{
-    return [[CPOpenPanel alloc] init];
-}
-
-- (CPInteger)runModal
-{
-    if (typeof window["cpOpenPanel"] === "function")
-    {
-        // FIXME: Is this correct???
-        [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
-
-        var options = { directoryURL: [self directoryURL],
-                        canChooseFiles: [self canChooseFiles],
-                        canChooseDirectories: [self canChooseDirectories],
-                        allowsMultipleSelection: [self allowsMultipleSelection] };
-
-        var result = window.cpOpenPanel(options);
-
-        _URLs = result.URLs;
-
-        return result.button;
-    }
-
-    throw "-runModal is unimplemented.";
-}
-
-- (CPArray)URLs
-{
-    return _URLs;
-}
-
-@end

AppKit/CPPanel.j

@@ -46,13 +46,6 @@ CPCancelButton  = 0;
     <li>A panel can be made to work even when there's an attention panel on-screen. This permits actions within the panel to affect the attention panel.</li>
 </ul>
 */
-
-/*
-    @global
-    @class CPWindow
-*/
-CPDocModalWindowMask			= 1 << 6;
-
 @implementation CPPanel : CPWindow
 {
     BOOL    _becomesKeyOnlyIfNeeded;
@@ -60,7 +53,7 @@ CPDocModalWindowMask			= 1 << 6;
 }
 
 /*!
-    Returns \c YES if the receiver is a floating panel (like a palette).
+    Returns <code>YES</code> if the receiver is a floating panel (like a palette).
 */
 - (BOOL)isFloatingPanel
 {
@@ -68,8 +61,8 @@ CPDocModalWindowMask			= 1 << 6;
 }
 
 /*!
-    Sets the receiver to be a floating panel. \c YES
-    makes the window a floating panel. \c NO makes it a normal window.
+    Sets the receiver to be a floating panel. <code>YES</code>
+    makes the window a floating panel. <code>NO</code> makes it a normal window.
     @param isFloatingPanel specifies whether to make it floating
 */
 - (void)setFloatingPanel:(BOOL)isFloatingPanel
@@ -78,8 +71,8 @@ CPDocModalWindowMask			= 1 << 6;
 }
 
 /*!
-    Returns \c YES if the window only becomes key
-    if needed. \c NO means it behaves just like other windows.
+    Returns <code>YES</code> if the window only becomes key
+    if needed. <code>NO</code> means it behaves just like other windows.
 */
 - (BOOL)becomesKeyOnlyIfNeeded
 {
@@ -88,7 +81,7 @@ CPDocModalWindowMask			= 1 << 6;
 
 /*!
     Sets whether the the window becomes key only if needed.
-    @param shouldBecomeKeyOnlyIfNeeded \c YES makes the window become key only if needed
+    @param shouldBecomeKeyOnlyIfNeeded <code>YES</code> makes the window become key only if needed
 */
 - (void)setBecomesKeyOnlyIfNeeded:(BOOL)shouldBecomeKeyOnlyIfNeeded
 {

AppKit/CPPasteboard.j

@@ -25,8 +25,6 @@
 @import <Foundation/CPDictionary.j>
 @import <Foundation/CPPropertyListSerialization.j>
 
-#include "Platform/Platform.h"
-
 
 CPGeneralPboard         = @"CPGeneralPboard";
 CPFontPboard            = @"CPFontPboard";
@@ -43,14 +41,10 @@ CPURLPboardType         = @"CPURLPboardType";
 CPImagesPboardType      = @"CPImagesPboardType";
 CPVideosPboardType      = @"CPVideosPboardType";
 
-UTF8PboardType          = @"public.utf8-plain-text";
-
 // Deprecated
 CPImagePboardType       = @"CPImagePboardType";
 
-
-var CPPasteboards = nil,
-    supportsNativePasteboard = NO;
+var CPPasteboards = nil;
 
 /*! 
     @ingroup appkit
@@ -66,8 +60,6 @@ var CPPasteboards = nil,
     
     unsigned        _changeCount;
     CPString        _stateUID;
-
-    WebScriptObject _nativePasteboard;
 }
 
 /*
@@ -81,9 +73,6 @@ var CPPasteboards = nil,
     [self setVersion:1.0];
     
     CPPasteboards = [CPDictionary dictionary];
-
-    if (typeof window.cpPasteboardWithName !== "undefined")
-        supportsNativePasteboard = YES;
 }
 
 /*!
@@ -102,7 +91,7 @@ var CPPasteboards = nil,
 + (id)pasteboardWithName:(CPString)aName
 {
     var pasteboard = [CPPasteboards objectForKey:aName];
-
+    
     if (pasteboard)
         return pasteboard;
     
@@ -126,12 +115,6 @@ var CPPasteboards = nil,
         _provided = [CPDictionary dictionary];
         
         _changeCount = 0;
-
-        if (supportsNativePasteboard)
-        {
-            _nativePasteboard = window.cpPasteboardWithName(aName);
-            [self _synchronizePasteboard];
-        }
     }
     
     return self;
@@ -160,16 +143,7 @@ var CPPasteboards = nil,
         
         [_owners setObject:anOwner forKey:type];
     }
-
-    if (_nativePasteboard)
-    {
-        var nativeTypes = [types copy];
-        if ([types containsObject:CPStringPboardType])
-            nativeTypes.push(UTF8PboardType);
-
-        _nativePasteboard.addTypes_(nativeTypes);
-    }
-
+    
     return ++_changeCount;
 }
 
@@ -180,12 +154,6 @@ var CPPasteboards = nil,
     @return the pasteboard's change count
 */
 - (unsigned)declareTypes:(CPArray)types owner:(id)anOwner
-{
-    [self _declareTypes:types owner:anOwner updateNativePasteboard:YES];
-}
-
-/*! @ignore */
-- (unsigned)_declareTypes:(CPArray)types owner:(id)anOwner updateNativePasteboard:(BOOL)shouldUpdate
 {
     [_types setArray:types];
 
@@ -196,16 +164,7 @@ var CPPasteboards = nil,
     
     while (count--)
         [_owners setObject:anOwner forKey:_types[count]];
-
-    if (_nativePasteboard && shouldUpdate)
-    {
-        var nativeTypes = [types copy];
-        if ([types containsObject:CPStringPboardType])
-            nativeTypes.push(UTF8PboardType);
-
-        _nativePasteboard.declareTypes_(nativeTypes);
-        _changeCount = _nativePasteboard.changeCount();
-    }
+        
     return ++_changeCount;
 }
 
@@ -213,15 +172,12 @@ var CPPasteboards = nil,
     Sets the pasteboard data for the specified type
     @param aData the data
     @param aType the data type being set
-    @return \c YES if the data was successfully written to the pasteboard
+    @return <code>YES</code> if the data was successfully written to the pasteboard
 */
 - (BOOL)setData:(CPData)aData forType:(CPString)aType
 {
     [_provided setObject:aData forKey:aType];
-
-    if (aType === CPStringPboardType)
-        [self setData:aData forType:UTF8PboardType];
-
+    
     return YES;
 }
 
@@ -229,22 +185,22 @@ var CPPasteboards = nil,
     Writes the specified property list as data for the specified type
     @param aPropertyList the property list to write
     @param aType the data type
-    @return \c YES if the property list was successfully written to the pasteboard
+    @return <code>YES</code> if the property list was successfully written to the pasteboard
 */
 - (BOOL)setPropertyList:(id)aPropertyList forType:(CPString)aType
 {
-    return [self setData:[CPPropertyListSerialization dataFromPropertyList:aPropertyList format:CPPropertyList280NorthFormat_v1_0] forType:aType];
+    return [self setData:[CPPropertyListSerialization dataFromPropertyList:aPropertyList format:CPPropertyListXMLFormat_v1_0 errorDescription:nil] forType:aType];
 }
 
 /*!
     Sets the specified string as data for the specified type
     @param aString the string to write
     @param aType the data type
-    @return \c YES if the string was successfully written to the pasteboard
+    @return <code>YES</code> if the string was successfully written to the pasteboard
 */
 - (void)setString:(CPString)aString forType:(CPString)aType
 {
-    [self setPropertyList:aString forType:aType];
+    return [self setPropertyList:aString forType:aType];
 }
 
 // Determining Types
@@ -252,11 +208,11 @@ var CPPasteboards = nil,
     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
+    @return the highest match with the pasteboard's supported types or <code>nil</code> if no match was found
 */
 - (CPString)availableTypeFromArray:(CPArray)anArray
 {
-    return [[self types] firstObjectCommonWithArray:anArray];
+    return [_types firstObjectCommonWithArray:anArray];
 }
 
 /*!
@@ -264,7 +220,6 @@ var CPPasteboards = nil,
 */
 - (CPArray)types
 {
-    [self _synchronizePasteboard];
     return _types;
 }
 
@@ -280,7 +235,7 @@ var CPPasteboards = nil,
 /*!
     Returns the pasteboard data for the specified data type
     @param aType the requested data type
-    @return the requested data or \c nil if the data doesn't exist
+    @return the requested data or <code>nil</code> if the data doesn't exist
 */
 - (CPData)dataForType:(CPString)aType
 {
@@ -293,57 +248,27 @@ var CPPasteboards = nil,
     
     if (owner)
     {
-        [owner pasteboard:self provideDataForType:aType];        
+        [owner pasteboard:self provideDataForType:aType];
+        
+        ++_changeCount;
+        
         return [_provided objectForKey:aType];
     }
     
-    if (aType === CPStringPboardType)
-        return [self dataForType:UTF8PboardType];
-
     return nil;
 }
 
-- (void)_synchronizePasteboard
-{
-    if (_nativePasteboard && _nativePasteboard.changeCount() > _changeCount)
-    {
-        var nativeTypes = [_nativePasteboard.types() copy];
-        if ([nativeTypes containsObject:UTF8PboardType])
-            nativeTypes.push(CPStringPboardType);
-
-        [self _declareTypes:nativeTypes owner:self updateNativePasteboard:NO];
-
-        _changeCount = _nativePasteboard.changeCount();
-    }
-}
-
-/*! @ignore
-    method provided for integration with native pasteboard
-*/
-- (void)pasteboard:(CPPasteboard)aPasteboard provideDataForType:(CPString)aType
-{
-    if (aType === CPStringPboardType)
-    {
-        var string = _nativePasteboard.stringForType_(UTF8PboardType);
-
-        [self setString:string forType:CPStringPboardType];
-        [self setString:string forType:UTF8PboardType];
-    }
-    else
-        [self setString:_nativePasteboard.stringForType_(aType) forType:aType];
-}
-
 /*!
     Returns the property list for the specified data type
     @param aType the requested data type
-    @return the property list or \c nil if the list was not found
+    @return the property list or <code>nil</code> if the list was not found
 */
 - (id)propertyListForType:(CPString)aType
 {
     var data = [self dataForType:aType];
     
     if (data)
-        return [CPPropertyListSerialization propertyListFromData:data format:CPPropertyList280NorthFormat_v1_0];
+        return [CPPropertyListSerialization propertyListFromData:data format:CPPropertyListXMLFormat_v1_0 errorDescription:nil];
         
     return nil;
 }
@@ -351,7 +276,7 @@ var CPPasteboards = nil,
 /*!
     Returns the string for the specified data type
     @param aType the requested data type
-    @return the string or \c nil if the string was not found
+    @return the string or <code>nil</code> if the string was not found
 */
 - (CPString)stringForType:(CPString)aType
 {
@@ -378,70 +303,3 @@ var CPPasteboards = nil,
 }
 
 @end
-
-#if PLATFORM(DOM)
-
-var DOMDataTransferPasteboard = nil;
-
-@implementation _CPDOMDataTransferPasteboard : CPPasteboard
-{
-    DataTransfer    _dataTransfer;
-}
-
-+ (_CPDOMDataTransferPasteboard)DOMDataTransferPasteboard
-{
-    if (!DOMDataTransferPasteboard)
-        DOMDataTransferPasteboard = [[_CPDOMDataTransferPasteboard alloc] init];
-
-    return DOMDataTransferPasteboard;
-}
-
-- (void)_setDataTransfer:(DataTransfer)aDataTransfer
-{
-    _dataTransfer = aDataTransfer;
-}
-
-- (void)_setPasteboard:(CPPasteboard)aPasteboard
-{
-    _dataTransfer.clearData();
-
-    var types = [aPasteboard types],
-        count = types.length;
-
-    while (count--)
-    {
-        var type = types[count];
-
-        if (type === CPStringPboardType)
-            _dataTransfer.setData(type, [aPasteboard stringForType:type]);
-        else
-            _dataTransfer.setData(type, [[aPasteboard dataForType:type] rawString]);
-    }
-}
-
-- (CPArray)types
-{
-    return Array.prototype.slice.apply(_dataTransfer.types);
-}
-
-- (CPData)dataForType:(CPString)aType
-{
-    var dataString = _dataTransfer.getData(aType);
-
-    if (aType === CPStringPboardType)
-        return [CPData dataFromPropertyList:dataString format:kCFPropertyList280NorthFormat_v1_0];
-
-    return [CPData dataWithRawString:dataString];
-}
-
-- (id)propertyListForType:(CPString)aType
-{
-    if (aType === CPStringPboardType)
-        return _dataTransfer.getData(aType);
-
-    return [CPPropertyListSerialization propertyListFromData:[self dataForType:aType] format:CPPropertyListUnknownFormat];
-}
-
-@end
-
-#endif

AppKit/CPPopUpButton.j

@@ -54,7 +54,7 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
 /*!
     Initializes the pop-up button to the specified size.
     @param aFrame the size for the button
-    @param shouldPullDown \c YES makes this a pull-down menu, \c NO makes it a pop-up menu.
+    @param shouldPullDown <code>YES</code> makes this a pull-down menu, <code>NO</code> makes it a pop-up menu.
     @return the initialized pop-up button
 */
 - (id)initWithFrame:(CGRect)aFrame pullsDown:(BOOL)shouldPullDown
@@ -87,8 +87,8 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
 
 /*!
     Specifies whether the object is a pull-down or a pop-up menu.
-    @param shouldPullDown \c YES makes the pop-up button
-    a pull-down menu. \c NO makes it a pop-up menu.
+    @param shouldPullDown <code>YES</code> makes the pop-up button
+    a pull-down menu. <code>NO</code> makes it a pop-up menu.
 */
 - (void)setPullsDown:(BOOL)shouldPullDown
 {
@@ -111,7 +111,7 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
 }
 
 /*!
-    Returns \c YES if the button is a pull-down menu. \c NO if the button is a pop-up menu.
+    Returns <code>YES</code> if the button is a pull-down menu. <code>NO</code> if the button is a pop-up menu.
 */
 - (BOOL)pullsDown
 {
@@ -200,18 +200,18 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
 
 // Getting the User's Selection
 /*!
-    Returns the selected item or \c nil if no item is selected.
+    Returns the selected item or <code>nil</code> if no item is selected.
 */
 - (CPMenuItem)selectedItem
 {
-    if (_selectedIndex < 0 || _selectedIndex > [self numberOfItems] - 1)
+    if (_selectedIndex < 0)
         return nil;
     
     return [_menu itemAtIndex:_selectedIndex];
 }
 
 /*!
-    Returns the title of the selected item or \c nil if no item is selected.
+    Returns the title of the selected item or <code>nil</code> if no item is selected.
 */
 - (CPString)titleOfSelectedItem
 {
@@ -372,7 +372,7 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
 }
 
 /*!
-    Returns the item at the specified index or \c nil if the item does not exist.
+    Returns the item at the specified index or <code>nil</code> if the item does not exist.
     @param anIndex the index of the item to obtain
 */
 - (CPMenuItem)itemAtIndex:(unsigned)anIndex
@@ -381,7 +381,7 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
 }
 
 /*!
-    Returns the title of the item at the specified index or \c nil if no item exists.
+    Returns the title of the item at the specified index or <code>nil</code> if no item exists.
     @param anIndex the index of the item
 */
 - (CPString)itemTitleAtIndex:(unsigned)anIndex
@@ -628,59 +628,29 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
 {
     var numberOfItems = [self numberOfItems];
     
-    if (numberOfItems <= _selectedIndex && numberOfItems > 0)
+    if (numberOfItems <= _selectedIndex)
         [self selectItemAtIndex:numberOfItems - 1];
-    else
-        [self synchronizeTitleAndSelectedItem];
 }
 
 - (void)mouseDown:(CPEvent)anEvent
 {
-    if (![self isEnabled] || ![self numberOfItems])
+    if (![self isEnabled])
         return;
-
+        
     [self highlight:YES];
 
     var menu = [self menu],
-        bounds = [self bounds],
-        minimumWidth = CGRectGetWidth(bounds);
-
-    // FIXME: setFont: should set the font on the menu.
-    [menu setFont:[self font]];
-
+        theWindow = [self window],
+        menuWindow = [_CPMenuWindow menuWindowWithMenu:menu font:[self font]];
+    
+    [menuWindow setDelegate:self];
+    [menuWindow setBackgroundStyle:_CPMenuWindowPopUpBackgroundStyle];
+    
+    // Pull Down Menus show up directly below their buttons.
     if ([self pullsDown])
-    {
-        var positionedItem = nil,
-            location = CGPointMake(0.0, CGRectGetMaxY(bounds));
-    }
-    else
-    {
-        var contentRect = [self contentRectForBounds:bounds],
-            positionedItem = [self selectedItem],
-            standardLeftMargin = [_CPMenuWindow _standardLeftMargin] + [_CPMenuItemStandardView _standardLeftMargin],
-            location = CGPointMake(CGRectGetMinX(contentRect) - standardLeftMargin, 0.0);
-
-        minimumWidth += standardLeftMargin;
-    }
-
-    [menu setMinimumWidth:minimumWidth];
-
-    [menu
-        _popUpMenuPositioningItem:positionedItem
-                       atLocation:location
-                             topY:CGRectGetMinY(bounds)
-                          bottomY:CGRectGetMaxY(bounds)
-                           inView:self
-                         callback:function(aMenu)
-        {
-            [self highlight:NO];
-
-            var highlightedItem = [aMenu highlightedItem];
-
-            if ([highlightedItem _isSelectable])
-                [self selectItem:highlightedItem];
-        }];
-/*
+        var menuOrigin = [theWindow convertBaseToBridge:[self convertPoint:CGPointMake(0.0, CGRectGetMaxY([self bounds])) toView:nil]];
+    
+    // Pop Up Menus attempt to show up "on top" of the selected item.
     else
     {
         // This is confusing, I KNOW, so let me explain it to you.
@@ -688,14 +658,43 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
         // 1. So calculate where our content is, then calculate where the menu item is.
         // 2. Move LEFT by whatever indentation we have (offsetWidths, aka, window margin, item margin, etc).
         // 3. MOVE UP by the difference in sizes of the content and menu item, this will only work if the content is vertically centered.
-        var contentRect = [self convertRect:[self contentRectForBounds:bounds] toView:nil],
-            menuOrigin = [theWindow convertBaseToGlobal:contentRect.origin],
+        var contentRect = [self convertRect:[self contentRectForBounds:[self bounds]] toView:nil],
+            menuOrigin = [theWindow convertBaseToBridge:contentRect.origin],
             menuItemRect = [menuWindow rectForItemAtIndex:_selectedIndex];
-
+        
         menuOrigin.x -= CGRectGetMinX(menuItemRect) + [menuWindow overlapOffsetWidth] + [[[menu itemAtIndex:_selectedIndex] _menuItemView] overlapOffsetWidth];
         menuOrigin.y -= CGRectGetMinY(menuItemRect) + (CGRectGetHeight(menuItemRect) - CGRectGetHeight(contentRect)) / 2.0;
     }
+    
+    [menuWindow setFrameOrigin:menuOrigin];
+    
+    var menuMaxX = CGRectGetMaxX([menuWindow frame]),
+        buttonMaxX = [theWindow convertBaseToBridge:CGPointMake(CGRectGetMaxX([self convertRect:[self bounds] toView:nil]), 0.0)].x;
+        
+    if (menuMaxX < buttonMaxX)
+        [menuWindow setMinWidth:CGRectGetWidth([menuWindow frame]) + buttonMaxX - menuMaxX - ([self pullsDown] ? 0.0 : VISIBLE_MARGIN)];
+    
+    [menuWindow orderFront:self];
+    [menuWindow beginTrackingWithEvent:anEvent sessionDelegate:self didEndSelector:@selector(menuWindowDidFinishTracking:highlightedItem:)];
+}
+
+/*
+    @ignore
 */
+- (void)menuWindowDidFinishTracking:(_CPMenuWindow)aMenuWindow highlightedItem:(CPMenuItem)aMenuItem
+{
+    [_CPMenuWindow poolMenuWindow:aMenuWindow];
+
+    [self highlight:NO];
+    
+    var index = [_menu indexOfItem:aMenuItem];
+    
+    if (index == CPNotFound)
+        return;
+    
+    [self selectItemAtIndex:index];
+    
+    [CPApp sendAction:[aMenuItem action] to:[aMenuItem target] from:aMenuItem];
 }
 
 - (void)_popUpItemAction:(id)aSender

AppKit/CPProgressIndicator.j

@@ -104,14 +104,17 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
     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";
@@ -123,20 +126,30 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
     CPProgressIndicatorStyleSizes = [];
 
     // Bar Sttyle
-    var prefixes = [
-        CPProgressIndicatorClassName + @"BezelBorder" + CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorBarStyle],
-        CPProgressIndicatorClassName + @"Bar" + CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorBarStyle],
-        CPProgressIndicatorClassName + @"BezelBorder" + CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorHUDBarStyle],
-        CPProgressIndicatorClassName + @"Bar" + CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorHUDBarStyle]
-    ];
+    var prefix = CPProgressIndicatorClassName + @"BezelBorder" + CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorBarStyle];
 
-    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)];
-    }
+    CPProgressIndicatorStyleSizes[prefix + regularIdentifier] = [_CGSizeMake(3.0, 15.0), _CGSizeMake(1.0, 15.0), _CGSizeMake(3.0, 15.0)];
+    CPProgressIndicatorStyleSizes[prefix + smallIdentifier] = [_CGSizeMake(3.0, 15.0), _CGSizeMake(1.0, 15.0), _CGSizeMake(3.0, 15.0)];
+    CPProgressIndicatorStyleSizes[prefix + miniIdentifier] = [_CGSizeMake(3.0, 15.0), _CGSizeMake(1.0, 15.0), _CGSizeMake(3.0, 15.0)];
+
+    prefix = CPProgressIndicatorClassName + @"Bar" + CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorBarStyle];
+
+    CPProgressIndicatorStyleSizes[prefix + regularIdentifier] = _CGSizeMake(1.0, 9.0);
+    CPProgressIndicatorStyleSizes[prefix + smallIdentifier] = _CGSizeMake(1.0, 9.0);
+    CPProgressIndicatorStyleSizes[prefix + miniIdentifier] = _CGSizeMake(1.0, 9.0);
+
+    // HUD Bar Style
+    prefix = CPProgressIndicatorClassName + @"BezelBorder" + CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorHUDBarStyle];
+
+    CPProgressIndicatorStyleSizes[prefix + regularIdentifier] = [_CGSizeMake(3.0, 15.0), _CGSizeMake(1.0, 15.0), _CGSizeMake(3.0, 15.0)];
+    CPProgressIndicatorStyleSizes[prefix + smallIdentifier] = [_CGSizeMake(3.0, 15.0), _CGSizeMake(1.0, 15.0), _CGSizeMake(3.0, 15.0)];
+    CPProgressIndicatorStyleSizes[prefix + miniIdentifier] = [_CGSizeMake(3.0, 15.0), _CGSizeMake(1.0, 15.0), _CGSizeMake(3.0, 15.0)];
+
+    prefix = CPProgressIndicatorClassName + @"Bar" + CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorHUDBarStyle];
+
+    CPProgressIndicatorStyleSizes[prefix + regularIdentifier] = _CGSizeMake(1.0, 9.0);
+    CPProgressIndicatorStyleSizes[prefix + smallIdentifier] = _CGSizeMake(1.0, 9.0);
+    CPProgressIndicatorStyleSizes[prefix + miniIdentifier] = _CGSizeMake(1.0, 9.0);
 }
 
 - (id)initWithFrame:(CGRect)aFrame
@@ -192,7 +205,7 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
 }
 
 /*!
-    Always returns \c NO. Cappuccino does not have multiple threads.
+    Always returns <code>NO</code>. Cappuccino does not have multiple threads.
 */
 - (BOOL)usesThreadedAnimation
 {
@@ -316,7 +329,7 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
 
 /*!
     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
+    @param isDeterminate <code>YES</code> makes the indicator indeterminate
 */
 - (void)setIndeterminate:(BOOL)isIndeterminate
 {
@@ -329,7 +342,7 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
 }
 
 /*!
-    Returns \c YES if the progress bar is indeterminate.
+    Returns <code>YES</code> if the progress bar is indeterminate.
 */
 - (BOOL)isIndeterminate
 {
@@ -364,9 +377,9 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
 }
 
 /*!
-    Sets whether the indicator should be displayed when it isn't animating. By default this is \c YES if the style
-    is CPProgressIndicatorBarStyle, and \c NO if it's CPProgressIndicatorSpinningStyle.
-    @param isDisplayedWhenStopped \c YES means the indicator will be displayed when it's not animating.
+    Sets whether the indicator should be displayed when it isn't animating. By default this is <code>YES</code> if the style
+    is CPProgressIndicatorBarStyle, and <code>NO</code> if it's CPProgressIndicatorSpinningStyle.
+    @param isDisplayedWhenStopped <code>YES</code> means the indicator will be displayed when it's not animating.
 */
 - (void)setDisplayedWhenStopped:(BOOL)isDisplayedWhenStopped
 {
@@ -381,7 +394,7 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
 }
 
 /*!
-    Returns \c YES if the progress bar is displayed when not animating.
+    Returns <code>YES</code> if the progress bar is displayed when not animating.
 */
 - (BOOL)isDisplayedWhenStopped
 {
@@ -415,25 +428,21 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
     
     if (!_barView)
     {
-        _barView = [[CPView alloc] initWithFrame:CGRectMake(0.0, 0.0, 0.0, 16.0)];        
+        _barView = [[CPView alloc] initWithFrame:CGRectMake(2.0, 2.0, 0.0, 9.0)];
+        
+        [_barView setBackgroundColor:[CPColor redColor]];
+        
         [self addSubview:_barView];
     }
     
-    [_barView setBackgroundColor:_CPControlThreePartImagePattern(
-        NO,
+    [_barView setBackgroundColor:_CPControlColorWithPatternImage(
         CPProgressIndicatorStyleSizes,
         CPProgressIndicatorClassName,
         @"Bar",
         CPProgressIndicatorStyleIdentifiers[_style],
         _CPControlIdentifierForControlSize(_controlSize))];
-
-    var width = CGRectGetWidth([self bounds]),
-        barWidth = width * ((_doubleValue - _minValue) / (_maxValue - _minValue));
-
-    if (barWidth > 0.0 && barWidth < 4.0)
-        barWidth = 4.0;
-
-    [_barView setFrameSize:CGSizeMake(barWidth, 16.0)];
+                    
+    [_barView setFrameSize:CGSizeMake(CGRectGetWidth([self bounds]) * (_doubleValue - _minValue) / (_maxValue - _minValue) - 4.0, 9.0)];
 }
 
 /* @ignore */

AppKit/CPRadio.j

@@ -98,7 +98,7 @@
     
     if (self)
     {
-        [self setRadioGroup:aRadioGroup];
+        [self setRadioGroup:aRadioGroup || [CPRadioGroup new]];
 
         [self setHighlightsBy:CPContentsCellMask];
         [self setShowsStateBy:CPContentsCellMask];
@@ -115,7 +115,7 @@
 
 - (id)initWithFrame:(CGRect)aFrame
 {
-    return [self initWithFrame:aFrame radioGroup:[CPRadioGroup new]];
+    return [self initWithFrame:aFrame radioGroup:nil];
 }
 
 - (CPInteger)nextState
@@ -175,9 +175,6 @@ var CPRadioRadioGroupKey    = @"CPRadioRadioGroupKey";
 {
     CPSet   _radios;
     CPRadio _selectedRadio;
-
-    id      _target @accessors(property=target);
-    SEL     _action @accessors(property=action);
 }
 
 - (id)init
@@ -216,8 +213,6 @@ var CPRadioRadioGroupKey    = @"CPRadioRadioGroupKey";
 
     [_selectedRadio setState:CPOffState];
     _selectedRadio = aRadio;
-
-    [CPApp sendAction:_action to:_target from:self];
 }
 
 - (CPRadio)selectedRadio

AppKit/CPResponder.j

@@ -27,9 +27,6 @@ CPDeleteKeyCode     = 8;
 CPTabKeyCode        = 9;
 CPReturnKeyCode     = 13;
 CPEscapeKeyCode     = 27;
-CPSpaceKeyCode      = 32;
-CPPageUpKeyCode     = 33;
-CPPageDownKeyCode   = 34;
 CPLeftArrowKeyCode  = 37;
 CPUpArrowKeyCode    = 38;
 CPRightArrowKeyCode = 39;
@@ -49,7 +46,7 @@ CPDownArrowKeyCode  = 40;
 
 // Changing the first responder
 /*!
-    Returns \c YES if the receiver is able to become the first responder. \c NO otherwise.
+    Returns <code>YES</code> if the receiver is able to become the first responder. <code>NO</code> otherwise.
 */
 - (BOOL)acceptsFirstResponder
 {
@@ -58,8 +55,8 @@ CPDownArrowKeyCode  = 40;
 
 /*!
     Notifies the receiver that it will become the first responder. The receiver can reject first
-    responder if it returns \c NO. The default implementation always returns \c YES.
-    @return \c YES if the receiver accepts first responder status.
+    responder if it returns <code>NO</code>. The default implementation always returns <code>YES</code>.
+    @return <code>YES</code> if the receiver accepts first responder status.
 */
 - (BOOL)becomeFirstResponder
 {
@@ -68,7 +65,7 @@ CPDownArrowKeyCode  = 40;
 
 /*!
     Notifies the receiver that it has been asked to give up first responder status.
-    @return \c YES if the receiver is willing to give up first responder status.
+    @return <code>YES</code> if the receiver is willing to give up first responder status.
 */
 - (BOOL)resignFirstResponder
 {
@@ -99,42 +96,36 @@ CPDownArrowKeyCode  = 40;
 */
 - (void)interpretKeyEvents:(CPArray)events
 {
-    var index = 0,
-        count = [events count];
-
-    for (; index < count; ++index)
+    var event,
+        index = 0;
+    
+    while(event = events[index++])
     {
-        var event = events[index];
-
         switch([event keyCode])
         {
-            case CPPageUpKeyCode:       [self doCommandBySelector:@selector(pageUp:)];
+            case CPLeftArrowKeyCode:    [self moveBackward:self];
                                         break;
-            case CPPageDownKeyCode:     [self doCommandBySelector:@selector(pageDown:)];
+            case CPRightArrowKeyCode:   [self moveForward:self];
                                         break;
-            case CPLeftArrowKeyCode:    [self doCommandBySelector:@selector(moveLeft:)];
+            case CPUpArrowKeyCode:      [self moveUp:self];
                                         break;
-            case CPRightArrowKeyCode:   [self doCommandBySelector:@selector(moveRight:)];
+            case CPDownArrowKeyCode:    [self moveDown:self];
                                         break;
-            case CPUpArrowKeyCode:      [self doCommandBySelector:@selector(moveUp:)];
-                                        break;
-            case CPDownArrowKeyCode:    [self doCommandBySelector:@selector(moveDown:)];
-                                        break;
-            case CPDeleteKeyCode:       [self doCommandBySelector:@selector(deleteBackward:)];
+            case CPDeleteKeyCode:       [self deleteBackward:self];
                                         break;
             case CPReturnKeyCode:
-            case 3:                     [self doCommandBySelector:@selector(insertLineBreak:)];
+            case 3:                     [self insertLineBreak:self];
                                         break;
             
-            case CPEscapeKeyCode:       [self doCommandBySelector:@selector(cancel:)];
+            case CPEscapeKeyCode:       [self cancel:self];
                                         break;
 
             case CPTabKeyCode:          var shift = [event modifierFlags] & CPShiftKeyMask;
 
                                         if (!shift)
-                                            [self doCommandBySelector:@selector(insertTab:)];
+                                            [self insertTab:self];
                                         else
-                                            [self doCommandBySelector:@selector(insertBackTab:)];
+                                            [self insertBackTab:self];
 
                                         break;
 
@@ -152,15 +143,6 @@ CPDownArrowKeyCode  = 40;
     [_nextResponder performSelector:_cmd withObject:anEvent];
 }
 
-/*!
-    Notifies the receiver that the user has clicked the right mouse down in its area.
-    @param anEvent contains information about the right click
-*/
-- (void)rightMouseDown:(CPEvent)anEvent
-{
-    [_nextResponder performSelector:_cmd withObject:anEvent];
-}
-
 /*!
     Notifies the receiver that the user has initiated a drag
     over it. A drag is a mouse movement while the left button is down.
@@ -180,15 +162,6 @@ CPDownArrowKeyCode  = 40;
     [_nextResponder performSelector:_cmd withObject:anEvent];
 }
 
-/*!
-    Notifies the receiver that the user has released the right mouse button.
-    @param anEvent contains information about the release
-*/
-- (void)rightMouseUp:(CPEvent)anEvent
-{
-    [_nextResponder performSelector:_cmd withObject:anEvent];
-}
-
 /*!
     Notifies the receiver that the user has moved the mouse (with no buttons down).
     @param anEvent contains information about the movement
@@ -241,9 +214,9 @@ CPDownArrowKeyCode  = 40;
 
 /*
     FIXME This description is bad.
-    Based on \c anEvent, the receiver should simulate the event.
+    Based on <code>anEvent</code>, the receiver should simulate the event.
     @param anEvent the event to simulate
-    @return \c YES if the event receiver simulated the  event
+    @return <code>YES</code> if the event receiver simulated the  event
 */
 - (BOOL)performKeyEquivalent:(CPEvent)anEvent
 {
@@ -251,6 +224,14 @@ CPDownArrowKeyCode  = 40;
 }
 
 // Action Methods
+/*!
+    Deletes one character backward, or the selection if anything is selected.
+    @param aSender the object requesting this
+*/
+- (void)deleteBackward:(id)aSender
+{
+}
+
 /*!
     Insert a line break at the caret position or selection.
     @param aSender the object requesting this
@@ -266,7 +247,7 @@ CPDownArrowKeyCode  = 40;
 */
 - (void)insertNewline:(id)aSender
 {
-    [[self nextResponder] insertNewline:aSender];
+    [self insertNewline:aSender];
 }
 
 - (void)cancel:(id)sender
@@ -292,12 +273,12 @@ CPDownArrowKeyCode  = 40;
 // Dispatch methods
 /*!
     The receiver will attempt to perform the command,
-    if it responds to it. If not, the \c -nextResponder will be called to do it.
+    if it responds to it. If not, the <code>nextResponder</code> will be called to do it.
     @param aSelector the command to attempt
 */
 - (void)doCommandBySelector:(SEL)aSelector
 {
-    if ([self respondsToSelector:aSelector])
+    if([self respondsToSelector:aSelector])
         [self performSelector:aSelector];
     else
         [_nextResponder doCommandBySelector:aSelector];
@@ -307,7 +288,7 @@ CPDownArrowKeyCode  = 40;
     The receiver will attempt to perform the command, or pass it on to the next responder if it doesn't respond to it.
     @param aSelector the command to perform
     @param anObject the argument to the method
-    @return \c YES if the receiver was able to perform the command, or a responder down the chain was
+    @return <code>YES</code> if the receiver was able to perform the command, or a responder down the chain was
     able to perform the command.
 */
 - (BOOL)tryToPerform:(SEL)aSelector with:(id)anObject

AppKit/CPSavePanel.j

@@ -1,67 +0,0 @@
-
-@import <AppKit/CPPanel.j>
-
-
-@implementation CPSavePanel : CPPanel
-{
-    CPURL   _URL;
-
-    BOOL    _isExtensionHidden @accessors(getter=isExtensionHidden, setter=setExtensionHidden:);
-    BOOL    _canSelectHiddenExtension @accessors(property=canSelectHiddenExtension);
-    BOOL    _allowsOtherFileTypes @accessors(property=allowsOtherFileTypes);
-    BOOL    _canCreateDirectories @accessors(property=canCreateDirectories);
-
-    CPArray _allowedFileTypes @accessors(property=allowedFileTypes);
-}
-
-+ (id)savePanel
-{
-    return [[CPSavePanel alloc] init];
-}
-
-- (id)init
-{
-    if (self = [super init])
-    {
-        _canCreateDirectories = YES;
-    }
-
-    return self;
-}
-
-- (CPInteger)runModal
-{
-    // FIXME: Is this correct???
-    [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
-
-    if (typeof window["cpSavePanel"] === "function")
-    {
-        var resultObject = window.cpSavePanel({
-                isExtensionHidden: _isExtensionHidden,
-                canSelectHiddenExtension: _canSelectHiddenExtension,
-                allowsOtherFileTypes: _allowsOtherFileTypes,
-                canCreateDirectories: _canCreateDirectories,
-                allowedFileTypes: _allowedFileTypes
-            }),
-            result = resultObject.button;
-
-        _URL = result ? [CPURL URLWithString:resultObject.URL] : nil;
-    }
-    else
-    {
-        // FIXME: This is not the best way to do this.
-        var documentName = window.prompt("Document Name:"),
-            result = documentName !== null;
-
-        _URL = result ? [[self class] proposedFileURLWithDocumentName:documentName] : nil;
-    }
-
-    return result;
-}
-
-- (CPURL)URL
-{
-    return _URL;
-}
-
-@end

AppKit/CPScreen.j

@@ -1,16 +0,0 @@
-
-@import <Foundation/CPObject.j>
-
-
-#import "CoreGraphics/CGGeometry.h"
-
-@implementation CPScreen : CPObject
-{
-}
-
-- (CGRect)visibleFrame
-{
-    return _CGRectMake(window.screen.availLeft, window.screen.availTop, window.screen.availWidth, window.screen.availHeight);
-}
-
-@end

AppKit/CPScrollView.j

@@ -38,9 +38,7 @@
 @implementation CPScrollView : CPView
 {
     CPClipView  _contentView;
-    CPClipView  _headerClipView;
-    CPView      _cornerView;
-
+    
     BOOL        _hasVerticalScroller;
     BOOL        _hasHorizontalScroller;
     BOOL        _autohidesScrollers;
@@ -59,27 +57,23 @@
 - (id)initWithFrame:(CGRect)aFrame
 {
     self = [super initWithFrame:aFrame];
-
+    
     if (self)
     {
         _verticalLineScroll = 10.0;
         _verticalPageScroll = 10.0;
-
+        
         _horizontalLineScroll = 10.0;
         _horizontalPageScroll = 10.0;
 
         _contentView = [[CPClipView alloc] initWithFrame:[self bounds]];
-
+        
         [self addSubview:_contentView];
-
-        _headerClipView = [[CPClipView alloc] init];
-
-        [self addSubview:_headerClipView];
-
+        
         [self setHasVerticalScroller:YES];
         [self setHasHorizontalScroller:YES];
     }
-
+    
     return self;
 }
 
@@ -106,24 +100,24 @@
 */
 - (void)setContentView:(CPClipView)aContentView
 {
-    if (_contentView !== aContentView || !aContentView)
+    if (!aContentView)
         return;
-
+    
     var documentView = [aContentView documentView];
-
+    
     if (documentView)
         [documentView removeFromSuperview];
-
+    
     [_contentView removeFromSuperview];
-
+    
+    var size = [self contentSize];
+    
     _contentView = aContentView;
-
+        
+    [_contentView setFrame:CGRectMake(0.0, 0.0, size.width, size.height)];
     [_contentView setDocumentView:documentView];
 
     [self addSubview:_contentView];
-
-    // This will size the content view appropriately, so no need to size it in this method.
-    [self reflectScrolledClipView:_contentView];
 }
 
 /*!
@@ -140,11 +134,8 @@
 */
 - (void)setDocumentView:(CPView)aView
 {
-    [_contentView setDocumentView:aView];
-
-    // FIXME: This should be observed.
-    [self _updateCornerAndHeaderView];
-    [self reflectScrolledClipView:_contentView];
+   [_contentView setDocumentView:aView];
+   [self reflectScrolledClipView:_contentView];
 }
 
 /*!
@@ -175,98 +166,72 @@
 //            [_verticalScroller setEnabled:NO];
 //            [_horizontalScroller setEnabled:NO];
         }
-
+        
         [_contentView setFrame:[self bounds]];
-        [_headerClipView setFrame:_CGRectMakeZero()];
-
+        
         --_recursionCount;
-
+        
         return;
     }
 
-    var documentFrame = [documentView frame], // the size of the whole document
-        contentFrame = [self bounds], // assume it takes up the entire size of the scrollview (no scrollers)
-        headerClipViewFrame = [self _headerClipViewFrame],
-        headerClipViewHeight = _CGRectGetHeight(headerClipViewFrame);
-
-    contentFrame.origin.y += headerClipViewHeight;
-    contentFrame.size.height -= headerClipViewHeight;
-
-    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),
-        shouldShowHorizontalScroller = _hasHorizontalScroller && (!_autohidesScrollers || hasHorizontalScroll);
-
-    // Now we have to account for the shown scrollers affecting the deltas.
-    if (shouldShowVerticalScroller)
-    {
-        difference.width += verticalScrollerWidth;
-        hasHorizontalScroll = difference.width > 0.0;
-        shouldShowHorizontalScroller = _hasHorizontalScroller && (!_autohidesScrollers || hasHorizontalScroll);
-    }
-
-    if (shouldShowHorizontalScroller)
-    {
-        difference.height += horizontalScrollerHeight;
-        hasVerticalScroll = difference.height > 0.0;
-        shouldShowVerticalScroller = _hasVerticalScroller && (!_autohidesScrollers || hasVerticalScroll);
-    }
-
-    // We now definitively know which scrollers are shown or not, as well as whether they are showing scroll values.
-    [_verticalScroller setHidden:!shouldShowVerticalScroller];
-    [_verticalScroller setEnabled:hasVerticalScroll];
-
-    [_horizontalScroller setHidden:!shouldShowHorizontalScroller];
-    [_horizontalScroller setEnabled:hasHorizontalScroll];
-
-    // We can thus appropriately account for them changing the content size.
-    if (shouldShowVerticalScroller)
-        contentFrame.size.width -= verticalScrollerWidth;
-
-    if (shouldShowHorizontalScroller)
-        contentFrame.size.height -= horizontalScrollerHeight;
-
-    var scrollPoint = [_contentView bounds].origin,
+    var documentFrame = [documentView frame],
+        contentViewFrame = [self bounds],
+        scrollPoint = [_contentView bounds].origin,
+        difference = _CGSizeMake(CPRectGetWidth(documentFrame) - CPRectGetWidth(contentViewFrame), CPRectGetHeight(documentFrame) - CPRectGetHeight(contentViewFrame)),
+        shouldShowVerticalScroller = (!_autohidesScrollers || difference.height > 0.0) && _hasVerticalScroller,
+        shouldShowHorizontalScroller = (!_autohidesScrollers || difference.width > 0.0) && _hasHorizontalScroller,
         wasShowingVerticalScroller = ![_verticalScroller isHidden],
-        wasShowingHorizontalScroller = ![_horizontalScroller isHidden];
+        wasShowingHorizontalScroller = ![_horizontalScroller isHidden],
+        verticalScrollerWidth = _CGRectGetWidth([_verticalScroller frame]);
+        horizontalScrollerHeight = _CGRectGetHeight([_horizontalScroller frame]);
 
-    if (shouldShowVerticalScroller)
+    if (_autohidesScrollers)
     {
-        var verticalScrollerY = MAX(_CGRectGetHeight([self _cornerViewFrame]), headerClipViewHeight),
-            verticalScrollerHeight = _CGRectGetHeight([self bounds]) - verticalScrollerY;
+        // Check to see if either affected the other!
+        if (shouldShowVerticalScroller)
+            shouldShowHorizontalScroller = (!_autohidesScrollers || difference.width > -verticalScrollerWidth) && _hasHorizontalScroller;
 
         if (shouldShowHorizontalScroller)
-            verticalScrollerHeight -= horizontalScrollerHeight;
+            shouldShowVerticalScroller = (!_autohidesScrollers || difference.height > -horizontalScrollerHeight) && _hasVerticalScroller;
+    }
 
-        [_verticalScroller setFloatValue:(difference.height <= 0.0) ? 0.0 : scrollPoint.y / difference.height];
-        [_verticalScroller setKnobProportion:_CGRectGetHeight(contentFrame) / _CGRectGetHeight(documentFrame)];
-        [_verticalScroller setFrame:_CGRectMake(_CGRectGetMaxX(contentFrame), verticalScrollerY, verticalScrollerWidth, verticalScrollerHeight)];
+    [_verticalScroller setHidden:!shouldShowVerticalScroller];
+    [_verticalScroller setEnabled:difference.height > 0.0];
+
+    [_horizontalScroller setHidden:!shouldShowHorizontalScroller];
+    [_horizontalScroller setEnabled:difference.width > 0.0];
+
+    if (shouldShowVerticalScroller)
+    {
+        var verticalScrollerHeight = CPRectGetHeight(contentViewFrame);
+        
+        if (shouldShowHorizontalScroller)
+            verticalScrollerHeight -= horizontalScrollerHeight;
+    
+        difference.width += verticalScrollerWidth;
+        contentViewFrame.size.width -= verticalScrollerWidth;
+    
+        [_verticalScroller setFloatValue:(difference.height <= 0.0) ? 0.0 : scrollPoint.y / difference.height
+            knobProportion:CPRectGetHeight(contentViewFrame) / CPRectGetHeight(documentFrame)];
+        [_verticalScroller setFrame:CPRectMake(CPRectGetMaxX(contentViewFrame), 0.0, verticalScrollerWidth, verticalScrollerHeight)];
     }
     else if (wasShowingVerticalScroller)
-    {
-        [_verticalScroller setFloatValue:0.0];
-        [_verticalScroller setKnobProportion:1.0];
-    }
+        [_verticalScroller setFloatValue:0.0 knobProportion:1.0];
     
     if (shouldShowHorizontalScroller)
     {
-        [_horizontalScroller setFloatValue:(difference.width <= 0.0) ? 0.0 : scrollPoint.x / difference.width];
-        [_horizontalScroller setKnobProportion:_CGRectGetWidth(contentFrame) / _CGRectGetWidth(documentFrame)];
-        [_horizontalScroller setFrame:_CGRectMake(0.0, _CGRectGetMaxY(contentFrame), _CGRectGetWidth(contentFrame), horizontalScrollerHeight)];
+        difference.height += horizontalScrollerHeight;
+        contentViewFrame.size.height -= horizontalScrollerHeight;
+        
+        [_horizontalScroller setFloatValue:(difference.width <= 0.0) ? 0.0 : scrollPoint.x / difference.width
+            knobProportion:CPRectGetWidth(contentViewFrame) / CPRectGetWidth(documentFrame)];
+        [_horizontalScroller setFrame:CPRectMake(0.0, CPRectGetMaxY(contentViewFrame), CPRectGetWidth(contentViewFrame), horizontalScrollerHeight)];
     }
     else if (wasShowingHorizontalScroller)
-    {
-        [_horizontalScroller setFloatValue:0.0];
-        [_horizontalScroller setKnobProportion:1.0];
-    }
-
-    [_contentView setFrame:contentFrame];
-    [_headerClipView setFrame:headerClipViewFrame];
-    [_cornerView setFrame:[self _cornerViewFrame]];
-
+        [_horizontalScroller setFloatValue:0.0 knobProportion:1.0];
+    
+    [_contentView setFrame:contentViewFrame];
+    
     --_recursionCount;
 }
 
@@ -304,7 +269,7 @@
 
 /*!
     Specifies whether the scroll view can have a horizontal scroller.
-    @param hasHorizontalScroller \c YES lets the scroll view
+    @param hasHorizontalScroller <code>YES</code> lets the scroll view
     allocate a horizontal scroller if necessary.
 */
 - (void)setHasHorizontalScroller:(BOOL)shouldHaveHorizontalScroller
@@ -313,18 +278,20 @@
         return;
 
     _hasHorizontalScroller = shouldHaveHorizontalScroller;
-
+    
     if (_hasHorizontalScroller && !_horizontalScroller)
-    {
-        [self setHorizontalScroller:[[CPScroller alloc] initWithFrame:CGRectMake(0.0, 0.0, MAX(_CGRectGetWidth([self bounds]), [CPScroller scrollerWidth]+1), [CPScroller scrollerWidth])]];
-        [[self horizontalScroller] setFrameSize:CGSizeMake(_CGRectGetWidth([self bounds]), [CPScroller scrollerWidth])];
-    }
+        [self setHorizontalScroller:[[CPScroller alloc] initWithFrame:CGRectMake(0.0, 0.0, CPRectGetWidth([self bounds]), [CPScroller scrollerWidth])]];
 
-    [self reflectScrolledClipView:_contentView];
+    else if (!_hasHorizontalScroller && _horizontalScroller)
+    {
+        [_horizontalScroller setHidden:YES];
+
+        [self reflectScrolledClipView:_contentView];
+    }
 }
 
 /*!
-    Returns \c YES if the scroll view can have a horizontal scroller.
+    Returns <code>YES</code> if the scroll view can have a horizontal scroller.
 */
 - (BOOL)hasHorizontalScroller
 {
@@ -365,7 +332,7 @@
 /*!
     Specifies whether the scroll view has can have
     a vertical scroller. It allocates it if necessary.
-    @param hasVerticalScroller \c YES allows
+    @param hasVerticalScroller <code>YES</code> allows
     the scroll view to display a vertical scroller
 */
 - (void)setHasVerticalScroller:(BOOL)shouldHaveVerticalScroller
@@ -376,16 +343,18 @@
     _hasVerticalScroller = shouldHaveVerticalScroller;
 
     if (_hasVerticalScroller && !_verticalScroller)
-    {
-        [self setVerticalScroller:[[CPScroller alloc] initWithFrame:_CGRectMake(0.0, 0.0, [CPScroller scrollerWidth], MAX(_CGRectGetHeight([self bounds]), [CPScroller scrollerWidth]+1))]];
-        [[self verticalScroller] setFrameSize:CGSizeMake([CPScroller scrollerWidth], _CGRectGetHeight([self bounds]))];
-    }
+        [self setVerticalScroller:[[CPScroller alloc] initWithFrame:CPRectMake(0.0, 0.0, [CPScroller scrollerWidth], CPRectGetHeight([self bounds]))]];
 
-    [self reflectScrolledClipView:_contentView];
+    else if (!_hasVerticalScroller && _verticalScroller)
+    {
+        [_verticalScroller setHidden:YES];
+
+        [self reflectScrolledClipView:_contentView];
+    }
 }
 
 /*!
-    Returns \c YES if the scroll view can have a vertical scroller.
+    Returns <code>YES</code> if the scroll view can have a vertical scroller.
 */
 - (BOOL)hasVerticalScroller
 {
@@ -394,7 +363,7 @@
 
 /*!
     Sets whether the scroll view hides its scoll bars when not needed.
-    @param autohidesScrollers \c YES causes the scroll bars
+    @param autohidesScrollers <code>YES</code> causes the scroll bars
     to be hidden when not needed.
 */
 - (void)setAutohidesScrollers:(BOOL)autohidesScrollers
@@ -408,76 +377,20 @@
 }
 
 /*!
-    Returns \c YES if the scroll view hides its scroll
+    Returns <code>YES</code> if the scroll view hides its scroll
     bars when not necessary.
 */
 - (BOOL)autohidesScrollers
 {
     return _autohidesScrollers;
 }
-
-- (void)_updateCornerAndHeaderView
+/*
+- (void)setFrameSize:(CPRect)aSize
 {
-    var documentView = [self documentView],
-        currentHeaderView = [self _headerView],
-        documentHeaderView = [documentView respondsToSelector:@selector(headerView)] ? [documentView headerView] : nil;
-
-    if (currentHeaderView !== documentHeaderView)
-    {
-        [currentHeaderView removeFromSuperview];
-        [_headerClipView setDocumentView:documentHeaderView];
-    }
-
-    var documentCornerView = [documentView respondsToSelector:@selector(cornerView)] ? [documentView cornerView] : nil;
-
-    if (_cornerView !== documentCornerView)
-    {
-        [_cornerView removeFromSuperview];
-
-        _cornerView = documentCornerView;
-
-        if (_cornerView)
-            [self addSubview:_cornerView];
-    }
-
+    [super setFrameSize:aSize];
+    
     [self reflectScrolledClipView:_contentView];
-}
-
-- (CPView)_headerView
-{
-    var headerClipViewSubviews = [_headerClipView subviews];
-
-    return [headerClipViewSubviews count] ? headerClipViewSubviews[0] : nil;
-}
-
-- (CGRect)_cornerViewFrame
-{
-    if (!_cornerView)
-        return _CGRectMakeZero();
-
-    var bounds = [self bounds],
-        frame = [_cornerView frame];
-
-    frame.origin.x = _CGRectGetMaxX(bounds) - _CGRectGetWidth(frame);
-    frame.origin.y = 0;
-
-    return frame;
-}
-
-- (CGRect)_headerClipViewFrame
-{
-    var headerView = [self _headerView];
-
-    if (!headerView)
-        return _CGRectMakeZero();
-
-    var frame = [self bounds];
-
-    frame.size.height = _CGRectGetHeight([headerView frame]);
-    frame.size.width -= _CGRectGetWidth([self _cornerViewFrame]);
-
-    return frame;
-}
+}*/
 
 /* @ignore */
 - (void)_verticalScrollerDidScroll:(CPScroller)aScroller
@@ -502,8 +415,7 @@
         
         case CPScrollerKnobSlot:
         case CPScrollerKnob:
-                                        // We want integral bounds!
-        default:                        contentBounds.origin.y = ROUND(value * (_CGRectGetHeight(documentFrame) - _CGRectGetHeight(contentBounds)));
+        default:                        contentBounds.origin.y = value * (_CGRectGetHeight(documentFrame) - _CGRectGetHeight(contentBounds));
     }
     
     [_contentView scrollToPoint:contentBounds.origin];
@@ -532,12 +444,10 @@
         
         case CPScrollerKnobSlot:
         case CPScrollerKnob:
-                                        // We want integral bounds!
-        default:                        contentBounds.origin.x = ROUND(value * (_CGRectGetWidth(documentFrame) - _CGRectGetWidth(contentBounds)));
+        default:                        contentBounds.origin.x = value * (_CGRectGetWidth(documentFrame) - _CGRectGetWidth(contentBounds));
     }
 
     [_contentView scrollToPoint:contentBounds.origin];
-    [_headerClipView scrollToPoint:CGPointMake(contentBounds.origin.x, 0.0)];
 }
 
 /*!
@@ -670,80 +580,67 @@
 */
 - (void)scrollWheel:(CPEvent)anEvent
 {
-   var documentFrame = [[self documentView] frame],
+   var value = [_verticalScroller floatValue],
+       documentFrame = [[self documentView] frame],
        contentBounds = [_contentView bounds];
 
-    // We want integral bounds!
-    contentBounds.origin.x = ROUND(contentBounds.origin.x + [anEvent deltaX] * _horizontalLineScroll);
-    contentBounds.origin.y = ROUND(contentBounds.origin.y + [anEvent deltaY] * _verticalLineScroll);
+    contentBounds.origin.x += [anEvent deltaX] * _horizontalLineScroll;
+    contentBounds.origin.y += [anEvent deltaY] * _verticalLineScroll;
 
     [_contentView scrollToPoint:contentBounds.origin];
-    [_headerClipView scrollToPoint:CGPointMake(contentBounds.origin.x, 0.0)];
 }
 
 - (void)keyDown:(CPEvent)anEvent
 {
-    [self interpretKeyEvents:[anEvent]];
-}
-
-- (void)pageUp:(id)sender
-{
-    var contentBounds = [_contentView bounds];
-    [self moveByOffset:CGSizeMake(0.0, -(_CGRectGetHeight(contentBounds) - _verticalPageScroll))];
-}
-
-- (void)pageDown:(id)sender
-{
-    var contentBounds = [_contentView bounds];
-    [self moveByOffset:CGSizeMake(0.0, _CGRectGetHeight(contentBounds) - _verticalPageScroll)];
-}
-
-- (void)moveLeft:(id)sender
-{
-    [self moveByOffset:CGSizeMake(-_horizontalLineScroll, 0.0)];
-}
-
-- (void)moveRight:(id)sender
-{
-    [self moveByOffset:CGSizeMake(_horizontalLineScroll, 0.0)];
-}
-
-- (void)moveUp:(id)sender
-{
-    [self moveByOffset:CGSizeMake(0.0, -_verticalLineScroll)];
-}
-
-- (void)moveDown:(id)sender
-{
-    [self moveByOffset:CGSizeMake(0.0, _verticalLineScroll)];
-}
-
-- (void)moveByOffset:(CGSize)aSize
-{
-    var documentFrame = [[self documentView] frame],
+    var keyCode = [anEvent keyCode],
+        value = [_verticalScroller floatValue],
+        documentFrame = [[self documentView] frame],
         contentBounds = [_contentView bounds];
+    
+    switch (keyCode)
+    {
+        case 33:    /*pageup*/
+                    contentBounds.origin.y -= _CGRectGetHeight(contentBounds) - _verticalPageScroll;
+                    break;
+                    
+        case 34:    /*pagedown*/
+                    contentBounds.origin.y += _CGRectGetHeight(contentBounds) - _verticalPageScroll;
+                    break;
+                    
+        case 38:    /*up arrow*/
+                    contentBounds.origin.y -= _verticalLineScroll;
+                    break;
 
-    contentBounds.origin.x += aSize.width;
-    contentBounds.origin.y += aSize.height;
+        case 40:    /*down arrow*/
+                    contentBounds.origin.y += _verticalLineScroll;
+                    break;
+                    
+        case 37:    /*left arrow*/
+                    contentBounds.origin.x -= _horizontalLineScroll;
+                    break;
+
+        case 49:    /*right arrow*/
+                    contentBounds.origin.x += _horizontalLineScroll;
+                    break;
+                    
+        default:    return [super keyDown:anEvent];
+    }
 
     [_contentView scrollToPoint:contentBounds.origin];
-    [_headerClipView scrollToPoint:CGPointMake(contentBounds.origin, 0)];
 }
 
 @end
 
-var CPScrollViewContentViewKey       = "CPScrollViewContentView",
-    CPScrollViewHeaderClipViewKey    = "CPScrollViewHeaderClipViewKey",
-    CPScrollViewVLineScrollKey       = "CPScrollViewVLineScroll",
-    CPScrollViewHLineScrollKey       = "CPScrollViewHLineScroll",
-    CPScrollViewVPageScrollKey       = "CPScrollViewVPageScroll",
-    CPScrollViewHPageScrollKey       = "CPScrollViewHPageScroll",
-    CPScrollViewHasVScrollerKey      = "CPScrollViewHasVScroller",
-    CPScrollViewHasHScrollerKey      = "CPScrollViewHasHScroller",
-    CPScrollViewVScrollerKey         = "CPScrollViewVScroller",
-    CPScrollViewHScrollerKey         = "CPScrollViewHScroller",
-    CPScrollViewAutohidesScrollerKey = "CPScrollViewAutohidesScroller",
-    CPScrollViewCornerViewKey        = "CPScrollViewCornerViewKey";
+var CPScrollViewContentViewKey = "CPScrollViewContentView",
+    CPScrollViewVLineScrollKey = "CPScrollViewVLineScroll",
+    CPScrollViewHLineScrollKey = "CPScrollViewHLineScroll",
+    CPScrollViewVPageScrollKey = "CPScrollViewVPageScroll",
+    CPScrollViewHPageScrollKey = "CPScrollViewHPageScroll",
+    CPScrollViewHasVScrollerKey = "CPScrollViewHasVScroller",
+    CPScrollViewHasHScrollerKey = "CPScrollViewHasHScroller",
+    CPScrollViewVScrollerKey = "CPScrollViewVScroller",
+    CPScrollViewHScrollerKey = "CPScrollViewHScroller",
+    CPScrollViewAutohidesScrollerKey = "CPScrollViewAutohidesScroller";
 
 @implementation CPScrollView (CPCoding)
 
@@ -758,7 +655,6 @@ var CPScrollViewContentViewKey       = "CPScrollViewContentView",
         _horizontalPageScroll   = [aCoder decodeFloatForKey:CPScrollViewHPageScrollKey];
         
         _contentView            = [aCoder decodeObjectForKey:CPScrollViewContentViewKey];
-        _headerClipView         = [aCoder decodeObjectForKey:CPScrollViewHeaderClipViewKey];
         
         _verticalScroller       = [aCoder decodeObjectForKey:CPScrollViewVScrollerKey];
         _horizontalScroller     = [aCoder decodeObjectForKey:CPScrollViewHScrollerKey];
@@ -766,9 +662,7 @@ var CPScrollViewContentViewKey       = "CPScrollViewContentView",
         _hasVerticalScroller    = [aCoder decodeBoolForKey:CPScrollViewHasVScrollerKey];
         _hasHorizontalScroller  = [aCoder decodeBoolForKey:CPScrollViewHasHScrollerKey];
         _autohidesScrollers     = [aCoder decodeBoolForKey:CPScrollViewAutohidesScrollerKey];
-
-        _cornerView             = [aCoder decodeObjectForKey:CPScrollViewCornerViewKey];
-
+        
         // Do to the anything goes nature of decoding, our subviews may not exist yet, so layout at the end of the run loop when we're sure everything is in a correct state.
         [[CPRunLoop currentRunLoop] performSelector:@selector(reflectScrolledClipView:) target:self argument:_contentView order:0 modes:[CPDefaultRunLoopMode]];
     }
@@ -781,8 +675,7 @@ var CPScrollViewContentViewKey       = "CPScrollViewContentView",
     [super encodeWithCoder:aCoder];
     
     [aCoder encodeObject:_contentView           forKey:CPScrollViewContentViewKey];
-    [aCoder encodeObject:_headerClipView        forKey:CPScrollViewHeaderClipViewKey];
-
+    
     [aCoder encodeObject:_verticalScroller      forKey:CPScrollViewVScrollerKey];
     [aCoder encodeObject:_horizontalScroller    forKey:CPScrollViewHScrollerKey];
     
@@ -794,8 +687,6 @@ var CPScrollViewContentViewKey       = "CPScrollViewContentView",
     [aCoder encodeBool:_hasVerticalScroller     forKey:CPScrollViewHasVScrollerKey];
     [aCoder encodeBool:_hasHorizontalScroller   forKey:CPScrollViewHasHScrollerKey];
     [aCoder encodeBool:_autohidesScrollers      forKey:CPScrollViewAutohidesScrollerKey];
-
-    [aCoder encodeObject:_cornerView            forKey:CPScrollViewCornerViewKey];
 }
 
 @end

AppKit/CPScroller.j

@@ -64,9 +64,9 @@ NAMES_FOR_PARTS[CPScrollerKnob]             = @"knob";
 
     BOOL                    _isVertical @accessors(readonly, getter=isVertical);
     float                   _knobProportion;
-
+    
     CPScrollerPart          _hitPart;
-
+    
     CPScrollerPart          _trackingPart;
     float                   _trackingFloatValue;
     CGPoint                 _trackingStartPoint;
@@ -79,7 +79,7 @@ NAMES_FOR_PARTS[CPScrollerKnob]             = @"knob";
 
 + (id)themeAttributes
 {
-    return [CPDictionary dictionaryWithObjects:[    [CPNull null], [CPNull null], [CPNull null], [CPNull null],
+    return [CPDictionary dictionaryWithObjects:[    nil, nil, nil, nil,
                                                     _CGSizeMakeZero(), _CGSizeMakeZero(), _CGInsetMakeZero(), _CGInsetMakeZero(), _CGSizeMakeZero()]
                                        forKeys:[    @"knob-slot-color",
                                                     @"decrement-line-color",
@@ -104,12 +104,11 @@ NAMES_FOR_PARTS[CPScrollerKnob]             = @"knob";
         _controlSize = CPRegularControlSize;
         _partRects = [];
 
-        [self setFloatValue:0.0];
-        [self setKnobProportion:1.0];
+        [self setFloatValue:0.0 knobProportion:1.0];
         
         _hitPart = CPScrollerNoPart;
 
-        [self _calculateIsVertical];
+        [self _recalculateIsVertical];
     }
 
     return self;
@@ -121,7 +120,7 @@ NAMES_FOR_PARTS[CPScrollerKnob]             = @"knob";
 */
 + (float)scrollerWidth
 {
-    return 15.0;//[self scrollerWidthForControlSize:CPRegularControlSize];
+    return 17.0;//[self scrollerWidthForControlSize:CPRegularControlSize];
 }
 
 /*!
@@ -130,7 +129,7 @@ NAMES_FOR_PARTS[CPScrollerKnob]             = @"knob";
 */
 + (float)scrollerWidthForControlSize:(CPControlSize)aControlSize
 {
-    return 15.0;//_CPScrollerWidths[aControlSize];
+    return 17.0;//_CPScrollerWidths[aControlSize];
 }
 
 /*!
@@ -156,17 +155,28 @@ NAMES_FOR_PARTS[CPScrollerKnob]             = @"knob";
     return _controlSize;
 }
 
-- (void)setObjectValue:(id)aValue
+// Setting the Knob Position
+/*!
+    Sets the scroller's knob position (ranges from 0.0 to 1.0).
+    @param aValue the knob position (ranges from 0.0 to 1.0)
+*/
+- (void)setFloatValue:(float)aValue
 {
-    [super setObjectValue:MIN(1.0, MAX(0.0, +aValue))];
+    [super setFloatValue:MIN(1.0, MAX(0.0, aValue))];
+    
+    [self setNeedsLayout];
 }
 
-- (void)setKnobProportion:(float)aProportion
+/*!
+    Sets the position and proportion of the knob.
+    @param aValue the knob position (ranges from 0.0 to 1.0)
+    @param aProportion the knob's proportion (ranges from 0.0 to 1.0)
+*/
+- (void)setFloatValue:(float)aValue knobProportion:(float)aProportion
 {
     _knobProportion = MIN(1.0, MAX(0.0001, aProportion));
 
-    [self setNeedsDisplay:YES];
-    [self setNeedsLayout];
+    [self setFloatValue:aValue];
 }
 
 /*!
@@ -198,7 +208,7 @@ NAMES_FOR_PARTS[CPScrollerKnob]             = @"knob";
 }
 
 /*!
-    Returns the part of the scroller that would be hit by \c aPoint.
+    Returns the part of the scroller that would be hit by <code>aPoint</code>.
     @param aPoint the simulated point hit
     @return the part of the scroller that intersects the point
 */
@@ -242,14 +252,14 @@ NAMES_FOR_PARTS[CPScrollerKnob]             = @"knob";
     {
         _usableParts = CPNoScrollerParts;
     
-        _partRects[CPScrollerDecrementPage] = CGRectMakeZero();
-        _partRects[CPScrollerKnob]          = CGRectMakeZero();
-        _partRects[CPScrollerIncrementPage] = CGRectMakeZero();
-        _partRects[CPScrollerDecrementLine] = CGRectMakeZero();
-        _partRects[CPScrollerIncrementLine] = CGRectMakeZero();
+        _partRects[CPScrollerDecrementPage] = _CGRectMakeZero();
+        _partRects[CPScrollerKnob]          = _CGRectMakeZero();
+        _partRects[CPScrollerIncrementPage] = _CGRectMakeZero();
+        _partRects[CPScrollerDecrementLine] = _CGRectMakeZero();
+        _partRects[CPScrollerIncrementLine] = _CGRectMakeZero();
 
         // In this case, the slot is the entirety of the scroller.
-        _partRects[CPScrollerKnobSlot] = CGRectMakeCopy(bounds);
+        _partRects[CPScrollerKnobSlot] = _CGRectMakeCopy(bounds);
         
         return;
     }
@@ -279,18 +289,9 @@ NAMES_FOR_PARTS[CPScrollerKnob]             = @"knob";
         _partRects[CPScrollerIncrementPage] = _CGRectMake(0.0, knobLocation + knobHeight, width, height - (knobLocation + knobHeight) - effectiveIncrementLineHeight);
         _partRects[CPScrollerKnobSlot]      = _CGRectMake(trackInset.left, effectiveDecrementLineHeight, width - trackInset.left - trackInset.right, slotHeight);
         _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();
-        
-        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] = _CGRectMake(0.0, height - incrementLineSize.height, incrementLineSize.width, incrementLineSize.height);  
     }
+
     else
     {
         var decrementLineSize = [self currentValueForThemeAttribute:"decrement-line-size"],
@@ -309,16 +310,6 @@ NAMES_FOR_PARTS[CPScrollerKnob]             = @"knob";
         _partRects[CPScrollerKnobSlot]      = _CGRectMake(effectiveDecrementLineWidth, trackInset.top, slotWidth, 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();
-        
-        if(width < decrementLineSize.width + incrementLineSize.width - 2)
-        {
-            _partRects[CPScrollerIncrementLine] = _CGRectMakeZero();
-            _partRects[CPScrollerDecrementLine] = _CGRectMakeZero();
-            _partRects[CPScrollerKnobSlot]      = _CGRectMake(0.0, 0.0,  width, slotHeight);
-        }
     }
 }
 
@@ -542,15 +533,15 @@ NAMES_FOR_PARTS[CPScrollerKnob]             = @"knob";
 
 }
 
-- (void)_calculateIsVertical
+- (void)_recalculateIsVertical
 {
     // Recalculate isVertical.
     var bounds = [self bounds],
         width = _CGRectGetWidth(bounds),
         height = _CGRectGetHeight(bounds);
-
+    
     _isVertical = width < height ? 1 : (width > height ? 0 : -1);
-
+    
     if (_isVertical === 1)
         [self setThemeState:CPThemeStateVertical];
     else if (_isVertical === 0)
@@ -561,6 +552,8 @@ NAMES_FOR_PARTS[CPScrollerKnob]             = @"knob";
 {
     [super setFrameSize:aSize];
 
+    [self _recalculateIsVertical];
+
     [self checkSpaceForParts];
     [self setNeedsLayout];
 }
@@ -597,16 +590,18 @@ var CPScrollerControlSizeKey = "CPScrollerControlSize",
         _controlSize = CPRegularControlSize;
         if ([aCoder containsValueForKey:CPScrollerControlSizeKey])
             _controlSize = [aCoder decodeIntForKey:CPScrollerControlSizeKey];
-
+            
         _knobProportion = 1.0;
         if ([aCoder containsValueForKey:CPScrollerKnobProportionKey])
             _knobProportion = [aCoder decodeFloatForKey:CPScrollerKnobProportionKey];
-
+            
         _partRects = [];
         
         _hitPart = CPScrollerNoPart;
 
-        [self _calculateIsVertical];
+        [self _recalculateIsVertical];
+//        [self checkSpaceForParts];
+//        [self setNeedsLayout];
     }
     
     return self;
@@ -621,18 +616,3 @@ var CPScrollerControlSizeKey = "CPScrollerControlSize",
 }
 
 @end
-
-@implementation CPScroller (Deprecated)
-
-/*!
-    Sets the position and proportion of the knob.
-    @param aValue the knob position (ranges from 0.0 to 1.0)
-    @param aProportion the knob's proportion (ranges from 0.0 to 1.0)
-*/
-- (void)setFloatValue:(float)aValue knobProportion:(float)aProportion
-{
-    [self setFloatValue:aValue];
-    [self setKnobProportion:aProportion];
-}
-
-@end

AppKit/CPSearchField.j

@@ -1,718 +0,0 @@
-/*
- * CPSearchField.j
- * AppKit
- *
- * Created by cacaodev.
- * Copyright 2009.
- *
- * 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 "CPTextField.j"
-
-#include "Platform/Platform.h"
-
-CPSearchFieldRecentsTitleMenuItemTag    = 1000;
-CPSearchFieldRecentsMenuItemTag         = 1001;
-CPSearchFieldClearRecentsMenuItemTag    = 1002;
-CPSearchFieldNoRecentsMenuItemTag       = 1003;
-
-var CPSearchFieldSearchImage = nil,
-    CPSearchFieldFindImage = nil,
-    CPSearchFieldCancelImage = nil,
-    CPSearchFieldCancelPressedImage = nil;
-
-/*! 
-    @ingroup appkit
-    @class CPSearchField
-    The CPSearchField class defines the programmatic interface for text fields that are optimized for text-based searches. A CPSearchField object directly inherits from the CPTextField class. The search field implemented by these classes presents a standard user interface for searches, including a search button, a cancel button, and a pop-up icon menu for listing recent search strings and custom search categories.
-
-    When the user types and then pauses, the text field's action message is sent to its target. You can query the text field's string value for the current text to search for. Do not rely on the sender of the action to be an CPMenu object because the menu may change. If you need to change the menu, modify the search menu template and call the setSearchMenuTemplate: method to update.    
-*/
-@implementation CPSearchField : CPTextField
-{
-    CPButton    _searchButton;
-    CPButton    _cancelButton;
-    CPMenu      _searchMenuTemplate;
-    CPMenu      _searchMenu;
-
-    CPString    _recentsAutosaveName;
-    CPArray     _recentSearches;
-    
-    int         _maximumRecents;
-    BOOL        _sendsWholeSearchString;
-    BOOL        _sendsSearchStringImmediately;
-    CPTimer     _partialStringTimer;
-}
-
-+ (void)initialize
-{
-    if (self != [CPSearchField class])
-        return;
-
-    var bundle = [CPBundle bundleForClass:self];
-    CPSearchFieldSearchImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPSearchField/CPSearchFieldSearch.png"] size:CGSizeMake(25, 22)];
-    CPSearchFieldFindImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPSearchField/CPSearchFieldFind.png"] size:CGSizeMake(25, 22)];
-    CPSearchFieldCancelImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPSearchField/CPSearchFieldCancel.png"] size:CGSizeMake(22, 22)];
-    CPSearchFieldCancelPressedImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPSearchField/CPSearchFieldCancelPressed.png"] size:CGSizeMake(22, 22)];
-}
-
-- (id)initWithFrame:(CGRect)frame
-{
-    if (self = [super initWithFrame:frame])
-    {
-        _recentSearches = [CPArray array];
-        _maximumRecents = 10;
-        _sendsWholeSearchString = NO;
-        _sendsSearchStringImmediately = NO;
-        _recentsAutosaveName = nil;
-
-        [self _initWithFrame:frame];
-#if PLATFORM(DOM)
-        _cancelButton._DOMElement.style.cursor = "default";
-        _searchButton._DOMElement.style.cursor = "default";
-#endif          
-    }
-    
-    return self;
-}
-
-- (void)_initWithFrame:(CGRect)frame
-{
-    [self setBezeled:YES];
-    [self setBezelStyle:CPTextFieldRoundedBezel];
-    [self setBordered:YES];
-    [self setEditable:YES];
-    [self setDelegate:self];
-    
-    _cancelButton = [[CPButton alloc] initWithFrame:CGRectMake(frame.size.width - 27,(frame.size.height-22)/2,22,22)];
-    [self resetCancelButton];
-    [_cancelButton setHidden:YES];
-    [_cancelButton setAutoresizingMask:CPViewMinXMargin];
-    [self addSubview:_cancelButton];
-    
-    _searchButton = [[CPButton alloc] initWithFrame:CGRectMake(5,(frame.size.height-25)/2,25,25)];
-    [self resetSearchButton];
-    [self addSubview:_searchButton];
-}
-
-// Managing Buttons
-/*!
-    Sets the button used to display the search-button image
-    @param button The search button.
-*/
-- (void)setSearchButton:(CPButton)button
-{ 
-    _searchButton = button;
-}
-
-/*!
-    Returns the button used to display the search-button image.
-    @return The search button.
-*/
-- (CPButton)searchButton
-{
-    return _searchButton;
-}
-
-/*!
-    Resets the search button to its default attributes.
-    This method resets the target, action, regular image, and pressed image. By default, when users click the search button or press the Return key, the action defined for the receiver is sent to its designated target. This method gives you a way to customize the search button for specific situations and then reset the button defaults without having to undo changes individually.
-*/
-- (void)resetSearchButton
-{
-    var searchButtonImage, 
-        action, 
-        target,
-        button = [self searchButton];
-        
-    if (_searchMenuTemplate === nil)
-    {
-        searchButtonImage = CPSearchFieldSearchImage;
-        action = @selector(_sendAction:);
-        target = self;
-    }
-    else
-    {
-        searchButtonImage = CPSearchFieldFindImage;
-        action = @selector(_showMenu:);
-        target = self;
-    }
-    
-    [button setBordered:NO];
-    [button setImageScaling:CPScaleToFit];
-    [button setImage:searchButtonImage];
-    [button setAutoresizingMask:CPViewMaxXMargin];
-    [button setTarget:target];
-    [button setAction:action];
-}
-
-/*!
-    Sets the button object used to display the cancel-button image.
-    @param button The cancel button.
-*/
-- (void)setCancelButton:(CPButton)button
-{
-    _cancelButton = button;
-}
-
-/*!
-    Returns the button object used to display the cancel-button image.
-    @return The cancel button.
-*/
-- (CPButton)cancelButton
-{
-    return _cancelButton;
-}
-
-/*!
-    Resets the cancel button to its default attributes.
-    This method resets the target, action, regular image, and pressed image. By default, when users click the cancel button, the delete: action message is sent up the responder chain. This method gives you a way to customize the cancel button for specific situations and then reset the button defaults without having to undo changes individually.
-*/
-- (void)resetCancelButton
-{
-    var button = [self cancelButton];
-    [button setBordered:NO];
-    [button setImageScaling:CPScaleToFit];
-    [button setImage:CPSearchFieldCancelImage];
-    [button setAlternateImage:CPSearchFieldCancelPressedImage];
-    [button setAutoresizingMask:CPViewMinXMargin];
-    [button setTarget:self];
-    [button setAction:@selector(_searchFieldCancel:)];
-}
-
-// Custom Layout
-/*!
-    Modifies the bounding rectangle for the search-text field.
-    @param rect The current bounding rectangle for the search text field.
-    @return The updated bounding rectangle to use for the search text field. The default value is the value passed into the rect parameter.
-    Subclasses can override this method to return a new bounding rectangle for the text-field object. You might use this method to provide a custom layout for the search field control.
-*/
-- (CPRect)searchTextRectForBounds:(CPRect)rect
-{
-    var leftOffset = 0, width = rect.size.width;
-    
-    if (_searchButton)
-    {
-        var searchRect = [_searchButton frame];
-        leftOffset = searchRect.origin.x + searchRect.size.width;
-    }
-    
-    if (_cancelButton)
-    {
-        var cancelRect = [_cancelButton frame];
-        width = cancelRect.origin.x - leftOffset;
-    }
-    
-    return CPMakeRect(leftOffset,rect.origin.y,width,rect.size.height);
-}
-
-/*!
-    Modifies the bounding rectangle for the search button.
-    @param rect The current bounding rectangle for the search button.
-    Subclasses can override this method to return a new bounding rectangle for the search button. You might use this method to provide a custom layout for the search field control.
-*/
-- (CPRect)searchButtonRectForBounds:(CPRect)rect
-{
-    return [_searchButton frame];
-}
-
-/*!
-    Modifies the bounding rectangle for the cancel button.
-    @param rect The updated bounding rectangle to use for the cancel button. The default value is the value passed into the rect parameter.
-    Subclasses can override this method to return a new bounding rectangle for the cancel button. You might use this method to provide a custom layout for the search field control.
-*/
-- (CPRect)cancelButtonRectForBounds:(CPRect)rect
-{
-    return [_cancelButton frame];
-}
-
-// Managing Menu Templates
-/*!
-    Returns the menu template object used to dynamically construct the search pop-up icon menu.
-    @return The current menu template.
-*/
-- (CPMenu)searchMenuTemplate
-{
-    return _searchMenuTemplate;
-}
-
-/*!
-    Sets the menu template object used to dynamically construct the receiver's pop-up icon menu.
-    @param menu The menu template to use.
-    The receiver looks for the tag constants described in ŇMenu tagsÓ to determine how to populate the menu with items related to recent searches. See ŇConfiguring a Search MenuÓ for a sample of how you might set up the search menu template.
-*/
-- (void)setSearchMenuTemplate:(CPMenu)menu
-{
-    _searchMenuTemplate = menu;
-    
-    [self resetSearchButton];
-    [self _loadRecentSearchList];
-    [self _updateSearchMenu];
-}
-
-// Managing Search Modes
-/*!
-    Returns a Boolean value indicating whether the receiver sends the search action message when the user clicks the search button (or presses return) or after each keystroke.
-    @return \c YES if the action message is sent all at once when the user clicks the search button or presses return; otherwise, NO if the search string is sent after each keystroke. The default value is NO.
-*/
-- (BOOL)sendsWholeSearchString
-{ 
-    return _sendsWholeSearchString; 
-}
-
-/*!
-    Sets whether the receiver sends the search action message when the user clicks the search button (or presses return) or after each keystroke.
-    @param flag \c YES to send the action message all at once when the user clicks the search button or presses return; otherwise, NO to send the search string after each keystroke.
-*/
-- (void)setSendsWholeSearchString:(BOOL)flag
-{
-    _sendsWholeSearchString = flag;
-}
-
-/*!
-    Returns a Boolean value indicating whether the receiver sends its action immediately upon being notified of changes to the search field text or after a brief pause.
-    @return \c YES if the text field sends its action immediately upon notification of any changes to the search field; otherwise, NO.
-*/
-- (BOOL)sendsSearchStringImmediately
-{ 
-    return _sendsSearchStringImmediately; 
-}
-
-/*!
-    Sets whether the text field sends its action message to the target immediately upon notification of any changes to the search field text or after a brief pause.
-    @param flag \c YES to send the text field's action immediately upon notification of any changes to the search field; otherwise, NO if you want the text field to pause briefly before sending its action message. Pausing gives the user the opportunity to type more text into the search field before initiating the search.
-*/
-- (void)setSendsSearchStringImmediately:(BOOL)flag
-{
-    _sendsSearchStringImmediately = flag;
-}
-
-// Managing Recent Search Strings
-/*!
-    Returns the maximum number of recent search strings to display in the custom search menu.
-    @return The maximum number of search strings that can appear in the menu. This value is between 0 and 254.
-*/
-- (int)maximumRecents
-{ 
-    return _maximumRecents;
-}
-
-/*!
-    Sets the maximum number of search strings that can appear in the search menu.
-    @param maxRecents The maximum number of search strings that can appear in the menu. This value can be between 0 and 254. Specifying a value less than 0 sets the value to the default, which is 10. Specifying a value greater than 254 sets the maximum to 254.
-*/
-- (void)setMaximumRecents:(int)max
-{
-    if (max > 254)
-        max = 254;
-    else if (max < 0)
-        max = 10;
-    
-    _maximumRecents = max;
-}
-
-/*!
-    Returns the list of recent search strings for the control.
-    @return An array of \c CPString objects, each of which contains a search string either displayed in the search menu or from a recent autosave archive. If there have been no recent searches and no prior searches saved under an autosave name, this array may be empty. 
- */
-- (CPArray)recentSearches
-{
-    return _recentSearches;
-}
-
-/*!
-    Sets the list of recent search strings to list in the pop-up icon menu of the receiver.
-    @param searches An array of CPString objects containing the search strings.
-    You might use this method to set the recent list of searches from an archived copy.
-*/
-- (void)setRecentSearches:(CPArray)searches
-{
-    var max = MIN([self maximumRecents], [searches count]),
-        searches = [searches subarrayWithRange:CPMakeRange(0, max)];
-    
-    _recentSearches = searches;    
-    [self _autosaveRecentSearchList];
-}
-
-/*!
-    Returns the key under which the prior list of recent search strings has been archived.
-    @return The autosave name, which is used as a key in the standard user defaults to save the recent searches. The default value is nil, which causes searches not to be autosaved.
-*/
-- (CPString)recentsAutosaveName
-{
-    return _recentsAutosaveName; 
-}
-
-/*!
-    Sets the autosave name under which the receiver automatically archives the list of recent search strings.
-    @param name The autosave name, which is used as a key in the standard user defaults to save the recent searches. If you specify nil or an empty string for this parameter, no autosave name is set and searches are not autosaved.
-*/
-- (void)setRecentsAutosaveName:(CPString)name
-{
-    if (_recentsAutosaveName != nil)
-        [self _deregisterForAutosaveNotification];
-        
-    _recentsAutosaveName = name;
-    
-    if (_recentsAutosaveName != nil)
-      [self _registerForAutosaveNotification];
-}
-
-// Private methods and subclassing
-
-- (CPRect)contentRectForBounds:(CPRect)bounds
-{
-    var superbounds = [super contentRectForBounds:bounds];    
-    return [self searchTextRectForBounds:superbounds];
-}
-
-+ (double)_keyboardDelayForPartialSearchString:(CPString)string
-{
-    return (6 - MIN([string length],4))/10;
-}
-
-- (CPMenu)menu
-{
-    return _searchMenu;
-}
-
-- (BOOL)isOpaque
-{
-  return [super isOpaque] && [_cancelButton isOpaque] && [_searchButton isOpaque];
-}
-
-- (void)_updateCancelButtonVisibility
-{
-    [_cancelButton setHidden:([[self stringValue] length] === 0)];
-}
-
-- (void)controlTextDidChange:(CPNotification)aNotification
-{
-    if (![self sendsWholeSearchString])
-    {
-        if ([self sendsSearchStringImmediately])
-            [self _sendPartialString];
-        else
-        {
-            [_partialStringTimer invalidate];
-            var timeInterval = [CPSearchField _keyboardDelayForPartialSearchString:[self stringValue]];
-    
-            _partialStringTimer = [CPTimer scheduledTimerWithTimeInterval:timeInterval 
-                                                                   target:self 
-                                                                 selector:@selector(_sendPartialString) 
-                                                                 userInfo:nil 
-                                                                  repeats:NO];         
-        }
-    }
-    
-    [self _updateCancelButtonVisibility];
-}
-
-- (void)_sendAction:(id)sender
-{
-    [self sendAction:[self action] to:[self target]];
-}
-
-- (void)sendAction:(SEL)anAction to:(id)anObject
-{
-    [super sendAction:anAction to:anObject];
-
-    [_partialStringTimer invalidate];
-
-    [self _addStringToRecentSearches:[self stringValue]];
-    [self _updateCancelButtonVisibility];
-}
-
-- (void)_addStringToRecentSearches:(CPString)string
-{
-    if (string === nil || string === @"" || [_recentSearches containsObject:string])
-        return;
-        
-    var searches = [CPMutableArray arrayWithArray:_recentSearches];
-    [searches addObject:string];
-    [self setRecentSearches:searches];
-    [self _updateSearchMenu];
-}
-
-- (BOOL)trackMouse:(CPEvent)event
-{
-    var rect,
-        point,
-        location = [event locationInWindow];
-    
-    point = [self convertPoint:location fromView:nil];
-    
-    rect = [self searchButtonRectForBounds:[self frame]];
-    if (CPRectContainsPoint(rect,point))
-    {
-        return [[self searchButton] trackMouse:event];
-    }
-    
-    rect = [self cancelButtonRectForBounds:[self frame]];
-    if (CPRectContainsPoint(rect,point))
-    {
-        return [[self cancelButton] trackMouse:event];
-    }
-    
-    return [super trackMouse:event];
-}
-
-- (CPMenu)_defaultSearchMenuTemplate
-{
-    var template, item;
-    
-    template = [[CPMenu alloc] init];
-    
-    item = [[CPMenuItem alloc] initWithTitle:@"Recent searches" 
-                                      action:NULL 
-                               keyEquivalent:@""];
-    [item setTag:CPSearchFieldRecentsTitleMenuItemTag];
-    [item setEnabled:NO];
-    [template addItem:item];
-    
-    item = [[CPMenuItem alloc] initWithTitle:@"Recent search item" 
-                                      action:@selector(_searchFieldSearch:) 
-                               keyEquivalent:@""];
-    [item setTag:CPSearchFieldRecentsMenuItemTag];
-    [item setTarget:self];
-    [template addItem:item];
-    
-    item = [[CPMenuItem alloc] initWithTitle:@"Clear recent searches" 
-                                      action:@selector(_searchFieldClearRecents:) 
-                               keyEquivalent:@""];
-    [item setTag:CPSearchFieldClearRecentsMenuItemTag];
-    [item setTarget:self];
-    [template addItem:item];
-    
-    item = [[CPMenuItem alloc] initWithTitle:@"No recent searches" 
-                                      action:NULL 
-                               keyEquivalent:@""];
-    [item setTag:CPSearchFieldNoRecentsMenuItemTag];
-    [item setEnabled:NO];
-    [template addItem:item];
-    
-    return template;
-}
-
-- (void)_updateSearchMenu
-{
-    if (_searchMenuTemplate === nil)
-        return;
-        
-    var i, menu = [[CPMenu alloc] init],
-        countOfRecents = [_recentSearches count],
-        numberOfItems = [_searchMenuTemplate numberOfItems];
-    
-    for (i = 0; i < numberOfItems; i++)
-    {
-        var item = [_searchMenuTemplate itemAtIndex:i],
-            tag = [item tag];
-        
-        if (!(tag === CPSearchFieldRecentsTitleMenuItemTag && countOfRecents === 0) &&
-            !(tag === CPSearchFieldClearRecentsMenuItemTag && countOfRecents === 0) &&
-            !(tag === CPSearchFieldNoRecentsMenuItemTag && countOfRecents != 0)    &&
-            !(tag === CPSearchFieldRecentsMenuItemTag))
-        {
-            var itemAction, itemTarget;
-            switch (tag)
-            {
-                case CPSearchFieldRecentsTitleMenuItemTag : itemAction = NULL; itemTarget = NULL; break;
-                case CPSearchFieldClearRecentsMenuItemTag : itemAction = @selector(_searchFieldClearRecents:); itemTarget = self; break;
-                case CPSearchFieldNoRecentsMenuItemTag : itemAction = NULL; itemTarget = NULL; break;
-                default: itemAction = [item action]; itemTarget = [item target]; break;
-            }
-            
-            if (tag === CPSearchFieldClearRecentsMenuItemTag || tag === CPSearchFieldRecentsTitleMenuItemTag)
-            {
-                var separator = [CPMenuItem separatorItem];
-                [separator setEnabled:NO];
-                [menu addItem:separator];
-            }
-        
-            var templateItem = [[CPMenuItem alloc] initWithTitle:[item title] 
-                                                          action:itemAction 
-                                                   keyEquivalent:[item keyEquivalent]];
-            [templateItem setTarget:itemTarget];
-            [templateItem setEnabled:([item isEnabled] && itemAction != NULL)];
-            [templateItem setTag:tag];
-            [menu addItem:templateItem];
-        }
-        else if (tag === CPSearchFieldRecentsMenuItemTag)
-        {
-            var j;
-            for (j = 0; j < countOfRecents; j++)
-            {
-                var rencentItem = [[CPMenuItem alloc] initWithTitle:[_recentSearches objectAtIndex:j] 
-                                                             action:@selector(_searchFieldSearch:) 
-                                                      keyEquivalent:[item keyEquivalent]];
-                [rencentItem setTarget:self];
-                [menu addItem:rencentItem];
-            }
-        }
-    }    
-    _searchMenu = menu;
-}
-
-- (void)_showMenu:(id)sender
-{
-    if (_searchMenu === nil || [_searchMenu numberOfItems] === 0 || ![self isEnabled])
-        return;
-        
-    var aFrame = [[self superview] convertRect:[self frame] toView:nil],
-        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];
-    
-    [CPMenu popUpContextMenu:_searchMenu withEvent:anEvent forView:sender];
-}
-
-- (void)_sendPartialString
-{
-    [[self target] performSelector:[self action] withObject:self];
-}
-
-- (void)_searchFieldCancel:(id)sender
-{   
-    [self setObjectValue:@""];
-    [self _sendPartialString];
-    [self _updateCancelButtonVisibility];
-}
-
-- (void)_searchFieldSearch:(id)sender
-{
-    var searchString = [sender title];
-    
-    if ([sender tag] != CPSearchFieldRecentsMenuItemTag)
-        [self _addStringToRecentSearches:searchString];
-    
-    [self setObjectValue:searchString];
-    [self _sendPartialString];
-
-    [self _updateCancelButtonVisibility];
-}
-
-- (void)_searchFieldClearRecents:(id)sender
-{
-    [self setRecentSearches:[CPArray array]];
-    [self _updateSearchMenu];
- }
-
-- (void)_registerForAutosaveNotification
-{
-    [[CPNotificationCenter defaultCenter] addObserver:self selector:@selector(_updateAutosavedRecents:) name:@"CPAutosavedRecentsChangedNotification" object:nil];
-}
-
-- (void)_deregisterForAutosaveNotification
-{
-    [[CPNotificationCenter defaultCenter] removeObserver:self name:@"CPAutosavedRecentsChangedNotification" object:nil];
-}
-
-- (void)_autosaveRecentSearchList
-{  
-    if (_recentsAutosaveName != nil) 
-        [[CPNotificationCenter defaultCenter] postNotificationName:@"CPAutosavedRecentsChangedNotification" object:_recentsAutosaveName];
-}
-
-- (void)_updateAutosavedRecents:(id)notification
-{
-    var list = [self recentSearches],
-        name = [notification object],
-        bundle_name = [[[CPBundle mainBundle] infoDictionary] objectForKey:"CPBundleName"],
-        cookie_name = [bundle_name lowercaseString] + "." + [notification object],
-
-        cookie = [[CPCookie alloc] initWithName:cookie_name],
-        cookie_value = [list componentsJoinedByString:@","];
-    
-    [cookie setValue:cookie_value 
-             expires:[[CPDate alloc] initWithTimeIntervalSinceNow:3600*24*365] 
-              domain:(window.location.href.hostname)];
-}
-
-- (void)_loadRecentSearchList
-{
-    var list,
-        name = [self recentsAutosaveName];
-    
-    if (name === nil)
-        return;
-
-    var bundle_name = [[[CPBundle mainBundle] infoDictionary] objectForKey:"CPBundleName"],
-        cookie_name = [bundle_name lowercaseString] + "." + name,     
-
-        cookie = [[CPCookie alloc] initWithName:cookie_name];
-
-    if (cookie != nil)
-    {
-        var cookie_value = [cookie value];
-        list = (cookie_value != @"") ? [cookie_value componentsSeparatedByString:@","] : [CPArray array];
-        _recentSearches = list;
-    }
-}
-
-@end
-
-var CPRecentsAutosaveNameKey            = @"CPRecentsAutosaveNameKey",
-    CPSendsWholeSearchStringKey         = @"CPSendsWholeSearchStringKey",
-    CPSendsSearchStringImmediatelyKey   = @"CPSendsSearchStringImmediatelyKey",
-    CPMaximumRecentsKey                 = @"CPMaximumRecentsKey",
-    CPSearchMenuTemplateKey             = @"CPSearchMenuTemplateKey";   
-
-@implementation CPSearchField (CPCoding)
-
-- (void)encodeWithCoder:(CPCoder)coder
-{
-    [_searchButton removeFromSuperview];
-    [_cancelButton removeFromSuperview];
-
-    [super encodeWithCoder:coder];    
-
-    if (_searchButton)
-        [self addSubview:_searchButton];
-    if (_cancelButton)
-        [self addSubview:_cancelButton];
-
-    [coder encodeBool:_sendsWholeSearchString forKey:CPSendsWholeSearchStringKey];
-    [coder encodeBool:_sendsSearchStringImmediately forKey:CPSendsSearchStringImmediatelyKey];
-    [coder encodeInt:_maximumRecents forKey:CPMaximumRecentsKey];
-
-    if (_recentsAutosaveName)
-        [coder encodeObject:_recentsAutosaveName forKey:CPRecentsAutosaveNameKey];
-    if (_searchMenuTemplate)
-        [coder encodeObject:_searchMenuTemplate forKey:CPSearchMenuTemplateKey];
-}
-
-- (id)initWithCoder:(CPCoder)coder
-{
-    if (self = [super initWithCoder:coder])
-    {
-        [self _initWithFrame:[self frame]];
-
-        _recentsAutosaveName      = [coder decodeObjectForKey:CPRecentsAutosaveNameKey];
-        _sendsWholeSearchString   = [coder decodeBoolForKey:CPSendsWholeSearchStringKey];
-        _sendsSearchStringImmediately = [coder decodeBoolForKey:CPSendsSearchStringImmediatelyKey];
-        _maximumRecents           = [coder decodeIntForKey:CPMaximumRecentsKey];
-
-        var template              = [coder decodeObjectForKey:CPSearchMenuTemplateKey];
-        if (template)
-            [self setSearchMenuTemplate:template];
-            
-        [self setDelegate:self];
-    }
-
-    return self;
-}
-
-@end

AppKit/CPSegmentedControl.j

@@ -26,8 +26,20 @@
 
 #include "CoreGraphics/CGGeometry.h"
 
+/*
+    @global
+    @group CPSegmentSwitchTracking
+*/
 CPSegmentSwitchTrackingSelectOne = 0;
+/*
+    @global
+    @group CPSegmentSwitchTracking
+*/
 CPSegmentSwitchTrackingSelectAny = 1;
+/*
+    @global
+    @group CPSegmentSwitchTracking
+*/
 CPSegmentSwitchTrackingMomentary = 2;
 
 /*! 
@@ -56,7 +68,7 @@ CPSegmentSwitchTrackingMomentary = 2;
 
 + (id)themeAttributes
 {
-    return [CPDictionary dictionaryWithObjects:[CPCenterTextAlignment, CPCenterVerticalTextAlignment, CPImageLeft, CPScaleNone, _CGInsetMakeZero(), _CGInsetMakeZero(), [CPNull null], [CPNull null], [CPNull null], [CPNull null], 1.0, 24.0]
+    return [CPDictionary dictionaryWithObjects:[CPCenterTextAlignment, CPCenterVerticalTextAlignment, CPImageLeft, CPScaleNone, _CGInsetMakeZero(), _CGInsetMakeZero(), nil, nil, nil, nil, 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"]];
 }
 
@@ -107,13 +119,13 @@ CPSegmentSwitchTrackingMomentary = 2;
     }
     else if (aCount < _segments.length)
     {
-        _segments.length = aCount;
-        _themeStates.length = aCount;
+        for (var index = aCount; index < _segments.length; ++index)
+            _segments[index] = nil;
     }
-
-    if (_selectedSegment >= _segments.length)
+    
+    if (_selectedSegment < _segments.length)
         _selectedSegment = -1;
-
+    
     [self tileWithChangedSegment:0];
 }
 
@@ -129,7 +141,7 @@ CPSegmentSwitchTrackingMomentary = 2;
 /*!
     Selects a segment.
     @param aSegment the segment to select
-    @throws CPRangeException if \c aSegment is out of bounds
+    @throws CPRangeException if <code>aSegment</code> is out of bounds
 */
 - (void)setSelectedSegment:(unsigned)aSegment
 {
@@ -213,7 +225,7 @@ CPSegmentSwitchTrackingMomentary = 2;
     Sets the width of the specified segment.
     @param aWidth the new width for the segment
     @param aSegment the segment to set the width for
-    @throws CPRangeException if \c aSegment is out of bounds
+    @throws CPRangeException if <code>aSegment</code> is out of bounds
 */
 - (void)setWidth:(float)aWidth forSegment:(unsigned)aSegment
 {
@@ -225,7 +237,7 @@ CPSegmentSwitchTrackingMomentary = 2;
 /*!
     Returns the width for the specified segment.
     @param aSegment the segment to get the width for
-    @throws CPRangeException if \c aSegment is out of bounds
+    @throws CPRangeException if <code>aSegment</code> is out of bounds
 */
 - (float)widthForSegment:(unsigned)aSegment
 {
@@ -236,7 +248,7 @@ CPSegmentSwitchTrackingMomentary = 2;
     Sets the image for the specified segment.
     @param anImage the image for the segment
     @param aSegment the segment to set the image on
-    @throws CPRangeException if \c aSegment is out of bounds
+    @throws CPRangeException if <code>aSegment</code> is out of bounds
 */
 - (void)setImage:(CPImage)anImage forSegment:(unsigned)aSegment
 {
@@ -250,7 +262,7 @@ CPSegmentSwitchTrackingMomentary = 2;
 /*!
     Returns the image for the specified segment
     @param aSegment the segment to obtain the image for
-    @throws CPRangeException if \c aSegment is out of bounds
+    @throws CPRangeException if <code>aSegment</code> is out of bounds
 */
 - (CPImage)imageForSegment:(unsigned)aSegment
 {
@@ -261,7 +273,7 @@ CPSegmentSwitchTrackingMomentary = 2;
     Sets the label for the specified segment
     @param aLabel the label for the segment
     @param aSegment the segment to label
-    @throws CPRangeException if \c aSegment is out of bounds
+    @throws CPRangeException if <code>aSegment</code> is out of bounds
 */
 - (void)setLabel:(CPString)aLabel forSegment:(unsigned)aSegment
 {
@@ -275,7 +287,7 @@ CPSegmentSwitchTrackingMomentary = 2;
 /*!
     Returns the label for the specified segment
     @param the segment to obtain the label for
-    @throws CPRangeException if \c aSegment is out of bounds
+    @throws CPRangeException if <code>aSegment</code> is out of bounds
 */
 - (CPString)labelForSegment:(unsigned)aSegment
 {
@@ -286,7 +298,7 @@ CPSegmentSwitchTrackingMomentary = 2;
     Sets the menu for the specified segment
     @param aMenu the menu to set
     @param aSegment the segment to set the menu on
-    @throws CPRangeException if \c aSegment is out of bounds
+    @throws CPRangeException if <code>aSegment</code> is out of bounds
 */
 - (void)setMenu:(CPMenu)aMenu forSegment:(unsigned)aSegment
 {
@@ -296,7 +308,7 @@ CPSegmentSwitchTrackingMomentary = 2;
 /*!
     Returns the menu for the specified segment.
     @param aSegment the segment to obtain the menu for
-    @throws CPRangeException if \c aSegment is out of bounds
+    @throws CPRangeException if <code>aSegment</code> is out of bounds
 */
 - (CPMenu)menuForSegment:(unsigned)aSegment
 {
@@ -306,9 +318,9 @@ CPSegmentSwitchTrackingMomentary = 2;
 /*!
     Sets the selection for the specified segment. If only one segment
     can be selected at a time, any other segment will be deselected.
-    @param isSelected \c YES selects the segment. \c NO deselects it.
+    @param isSelected <code>YES</code> selects the segment. <code>NO</code> deselects it.
     @param aSegment the segment to set the selection for
-    @throws CPRangeException if \c aSegment is out of bounds
+    @throws CPRangeException if <code>aSegment</code> is out of bounds
 */
 - (void)setSelected:(BOOL)isSelected forSegment:(unsigned)aSegment
 {
@@ -346,9 +358,9 @@ CPSegmentSwitchTrackingMomentary = 2;
 }
 
 /*!
-    Returns \c YES if the specified segment is selected.
+    Returns <code>YES</code> if the specified segment is selected.
     @param aSegment the segment to check for selection
-    @throws CPRangeException if \c aSegment is out of bounds
+    @throws CPRangeException if <code>aSegment</code> is out of bounds
 */
 - (BOOL)isSelectedForSegment:(unsigned)aSegment
 {
@@ -357,29 +369,26 @@ CPSegmentSwitchTrackingMomentary = 2;
 
 /*!
     Enables/diables the specified segment.
-    @param isEnabled \c YES enables the segment
+    @param isEnabled <code>YES</code> enables the segment
     @param aSegment the segment to enable/disble
-    @throws CPRangeException if \c aSegment is out of bounds
+    @throws CPRangeException if <code>aSegment</code> is out of bounds
 */
 - (void)setEnabled:(BOOL)isEnabled forSegment:(unsigned)aSegment
 {
-    if (isEnabled)
-        _themeStates[aSegment] &= ~CPThemeStateDisabled;
-    else
-        _themeStates[aSegment] |= CPThemeStateDisabled;
+    _segments[aSegment].enabled = isEnabled;
 
     [self setNeedsLayout];
     [self setNeedsDisplay:YES];
 }
 
 /*!
-    Returns \c YES if the specified segment is enabled.
+    Returns <code>YES</code> if the specified segment is enabled.
     @param aSegment the segment to check
-    @throws CPRangeException if \c aSegment is out of bounds
+    @throws CPRangeException if <code>aSegment</code> is out of bounds
 */
 - (BOOL)isEnabledForSegment:(unsigned)aSegment
 {
-    return !(_themeStates[aSegment] & CPThemeStateDisabled)
+    return _segments[aSegment].enabled;
 }
 
 /*!
@@ -405,7 +414,7 @@ CPSegmentSwitchTrackingMomentary = 2;
 /*!
     Draws the specified segment bezel
     @param aSegment the segment to draw the bezel for
-    @param shouldHighlight \c YES highlights the bezel
+    @param shouldHighlight <code>YES</code> highlights the bezel
 */
 - (void)drawSegmentBezel:(int)aSegment highlight:(BOOL)shouldHighlight
 {
@@ -430,16 +439,6 @@ CPSegmentSwitchTrackingMomentary = 2;
     return [self _leftOffsetForSegment:segment - 1] + [self widthForSegment:segment - 1] + thickness;
 }
 
-- (unsigned)_indexOfLastSegment
-{
-    var lastSegmentIndex = [_segments count] - 1;
-
-    if (lastSegmentIndex < 0)
-        lastSegmentIndex = 0;
-
-    return lastSegmentIndex;
-}
-
 - (CGRect)rectForEphemeralSubviewNamed:(CPString)aName
 {
     var height = [self currentValueForThemeAttribute:@"default-height"],
@@ -453,28 +452,25 @@ CPSegmentSwitchTrackingMomentary = 2;
     }
     else if (aName === "right-segment-bezel")
     {
-        return CPRectMake(CGRectGetWidth([self bounds]) - contentInset.right,
-                            bezelInset.top,
-                            contentInset.right,
-                            height);
+        return CGRectMake(CGRectGetMaxX(bounds) - contentInset.right - bezelInset.right, bezelInset.top, contentInset.right, height);
     }
-    else if (aName.indexOf("segment-bezel") === 0)
+    else if (aName.substring(0, "segment-bezel".length) == "segment-bezel")
     {
         var segment = parseInt(aName.substring("segment-bezel-".length), 10),
             frame = CGRectCreateCopy(_segments[segment].frame);
 
-        if (segment === 0)
+        if (segment == 0)
         {
             frame.origin.x += contentInset.left;
             frame.size.width -= contentInset.left;
         }
 
-        if (segment === _segments.length - 1)
-            frame.size.width = CGRectGetWidth([self bounds]) - contentInset.right - frame.origin.x;
+        if (segment == _segments.length - 1)
+            frame.size.width -= contentInset.right;
 
         return frame;
     }
-    else if (aName.indexOf("divider-bezel") === 0)
+    else if (aName.substring(0, "divider-bezel".length) == "divider-bezel")
     {
         var segment = parseInt(aName.substring("divider-bezel-".length), 10),
             width = [self widthForSegment:segment],
@@ -483,7 +479,7 @@ CPSegmentSwitchTrackingMomentary = 2;
 
         return CGRectMake(left + width, bezelInset.top, thickness, height);
     }
-    else if (aName.indexOf("segment-content") === 0)
+    else if (aName.substring(0, "segment-content".length) == "segment-content")
     {
         var segment = parseInt(aName.substring("segment-content-".length), 10);
 
@@ -503,15 +499,8 @@ CPSegmentSwitchTrackingMomentary = 2;
 
 - (void)layoutSubviews
 {
-    if (_segments.length <= 0)
-        return;
-
-    var themeState = _themeStates[0];
-
-    themeState |= _themeState & CPThemeStateDisabled;
-
     var leftCapColor = [self valueForThemeAttribute:@"left-segment-bezel-color" 
-                                            inState:themeState];
+                                            inState:_themeStates[0]];
 
     var leftBezelView = [self layoutEphemeralSubviewNamed:@"left-segment-bezel"
                                                positioned:CPWindowBelow
@@ -519,12 +508,8 @@ CPSegmentSwitchTrackingMomentary = 2;
 
     [leftBezelView setBackgroundColor:leftCapColor];
 
-    var themeState = _themeStates[_themeStates.length - 1];
-
-    themeState |= _themeState & CPThemeStateDisabled;
-
     var rightCapColor = [self valueForThemeAttribute:@"right-segment-bezel-color" 
-                                             inState:themeState];
+                                             inState:_themeStates[_themeStates.length - 1]];
 
     var rightBezelView = [self layoutEphemeralSubviewNamed:@"right-segment-bezel"
                                                positioned:CPWindowBelow
@@ -597,7 +582,7 @@ CPSegmentSwitchTrackingMomentary = 2;
 /*!
     Draws the specified segment
     @param aSegment the segment to draw
-    @param shouldHighlight \c YES highlights the bezel
+    @param shouldHighlight <code>YES</code> highlights the bezel
 */
 - (void)drawSegment:(int)aSegment highlight:(BOOL)shouldHighlight
 {
@@ -700,16 +685,7 @@ CPSegmentSwitchTrackingMomentary = 2;
     while (count--)
         if (CGRectContainsPoint(_segments[count].frame, aPoint))
             return count;
-
-    if (_segments.length)
-    {
-        var adjustedLastFrame = CGRectCreateCopy(_segments[_segments.length - 1].frame);
-        adjustedLastFrame.size.width = CGRectGetWidth([self bounds]) - adjustedLastFrame.origin.x;
-
-        if (CGRectContainsPoint(adjustedLastFrame, aPoint))
-            return _segments.length - 1;
-    }
-
+    
     return -1;
 }
 
@@ -740,7 +716,7 @@ CPSegmentSwitchTrackingMomentary = 2;
         if (_trackingSegment == -1)
             return;
 
-        if (_trackingSegment === [self testSegment:location])
+        if (CGRectContainsPoint(_segments[_trackingSegment].frame, location))
         {
             if (_trackingMode == CPSegmentSwitchTrackingSelectAny)
             {
@@ -771,13 +747,10 @@ CPSegmentSwitchTrackingMomentary = 2;
     
     if (type == CPLeftMouseDown)
     {
-        var trackingSegment = [self testSegment:location];
-        if (trackingSegment > -1 && [self isEnabledForSegment:trackingSegment])
-        {
-            _trackingHighlighted = YES;
-            _trackingSegment = trackingSegment;
-            [self drawSegmentBezel:_trackingSegment highlight:YES];
-        }
+        _trackingHighlighted = YES;
+        _trackingSegment = [self testSegment:location];
+        
+        [self drawSegmentBezel:_trackingSegment highlight:YES];
     }
     
     else if (type == CPLeftMouseDragged)
@@ -785,11 +758,12 @@ CPSegmentSwitchTrackingMomentary = 2;
         if (_trackingSegment == -1)
             return;
 
-        var highlighted = [self testSegment:location] === _trackingSegment;
+        var highlighted = CGRectContainsPoint(_segments[_trackingSegment].frame, location);
+        
         if (highlighted != _trackingHighlighted)
         {
             _trackingHighlighted = highlighted;
-
+            
             [self drawSegmentBezel:_trackingSegment highlight:_trackingHighlighted];
         }
     }

AppKit/CPSlider.j

@@ -49,7 +49,7 @@ CPCircularSlider    = 1;
 
 + (id)themeAttributes
 {
-    return [CPDictionary dictionaryWithObjects:[[CPNull null], _CGSizeMakeZero(), 0.0, [CPNull null]]
+    return [CPDictionary dictionaryWithObjects:[nil, _CGSizeMakeZero(), 0.0, nil]
                                        forKeys:[@"knob-color", @"knob-size", @"track-width", @"track-color"]];
 }
 
@@ -83,10 +83,6 @@ CPCircularSlider    = 1;
     
     if (doubleValue < _minValue)
         [self setDoubleValue:_minValue];
-
-    // The relative position may have (did) change.
-    [self setNeedsLayout];
-    [self setNeedsDisplay:YES];
 }
 
 - (float)minValue
@@ -105,10 +101,6 @@ CPCircularSlider    = 1;
     
     if (doubleValue > _maxValue)
         [self setDoubleValue:_maxValue];
-
-    // The relative position may have (did) change.
-    [self setNeedsLayout];
-    [self setNeedsDisplay:YES];
 }
 
 - (float)maxValue

AppKit/CPSliderColorPicker.j

@@ -45,16 +45,14 @@
     CPTextField _saturationLabel;
     CPTextField _brightnessLabel;
     CPTextField _hexLabel;
-
-#if PLATFORM(DOM)
+    
     DOMElement  _redValue;
     DOMElement  _greenValue;
     DOMElement  _blueValue;
     DOMElement  _hueValue;
     DOMElement  _saturationValue;
     DOMElement  _brightnessValue;
-    DOMElement  _hexValue;
-#endif
+    DOMElement  _hexValue;    
 }
 
 - (id)initWithPickerMask:(int)mask colorPanel:(CPColorPanel)owningColorPanel 
@@ -83,8 +81,7 @@
     [_redSlider setTarget: self];
     [_redSlider setAction: @selector(sliderChanged:)];
     [_redSlider setAutoresizingMask: CPViewWidthSizable];
-
-#if PLATFORM(DOM)
+    
     var updateFunction = function(aDOMEvent) 
     { 
         if(isNaN(this.value))
@@ -150,7 +147,6 @@
     
     redValue._DOMElement.appendChild(_redValue);
     [_contentView addSubview: redValue];
-#endif
 
     _greenLabel = [[CPTextField alloc] initWithFrame: CPRectMake(0, 58, 15, 20)];
     [_greenLabel setStringValue: "G"];
@@ -163,7 +159,6 @@
     [_greenSlider setAction: @selector(sliderChanged:)];
     [_greenSlider setAutoresizingMask: CPViewWidthSizable];
 
-#if PLATFORM(DOM)
     //green value input box
     var greenValue = [[CPView alloc] initWithFrame: CPRectMake(aFrame.size.width - 45, 58, 45, 20)];
     [greenValue setAutoresizingMask: CPViewMinXMargin];
@@ -173,7 +168,6 @@
     
     greenValue._DOMElement.appendChild(_greenValue);
     [_contentView addSubview: greenValue];
-#endif
 
     _blueLabel = [[CPTextField alloc] initWithFrame: CPRectMake(0, 81, 15, 20)];
     [_blueLabel setStringValue: "B"];
@@ -186,7 +180,6 @@
     [_blueSlider setAction: @selector(sliderChanged:)];
     [_blueSlider setAutoresizingMask: CPViewWidthSizable];
 
-#if PLATFORM(DOM)
     //blue value input box
     var blueValue = [[CPView alloc] initWithFrame: CPRectMake(aFrame.size.width - 45, 81, 45, 20)];
     [blueValue setAutoresizingMask: CPViewMinXMargin];
@@ -196,7 +189,7 @@
 
     blueValue._DOMElement.appendChild(_blueValue);
     [_contentView addSubview: blueValue];
-#endif
+
     _hsbLabel = [[CPTextField alloc] initWithFrame: CPRectMake(0, 120, 190, 20)];
     [_hsbLabel setStringValue: "Hue, Saturation, Brightness"];
     [_hsbLabel setTextColor:[CPColor blackColor]];
@@ -212,7 +205,6 @@
     [_hueSlider setAction: @selector(sliderChanged:)];
     [_hueSlider setAutoresizingMask: CPViewWidthSizable];
 
-#if PLATFORM(DOM)
     //red value input box
     var hueValue = [[CPView alloc] initWithFrame: CPRectMake(aFrame.size.width - 45, 145, 45, 20)];
     [hueValue setAutoresizingMask: CPViewMinXMargin];
@@ -222,7 +214,7 @@
 
     hueValue._DOMElement.appendChild(_hueValue);
     [_contentView addSubview: hueValue];
-#endif
+    
     _saturationLabel = [[CPTextField alloc] initWithFrame: CPRectMake(0, 168, 15, 20)];
     [_saturationLabel setStringValue: "S"];
     [_saturationLabel setTextColor:[CPColor blackColor]];
@@ -234,7 +226,6 @@
     [_saturationSlider setAction: @selector(sliderChanged:)];
     [_saturationSlider setAutoresizingMask: CPViewWidthSizable];
 
-#if PLATFORM(DOM)
     //green value input box
     var saturationValue = [[CPView alloc] initWithFrame: CPRectMake(aFrame.size.width - 45, 168, 45, 20)];
     [saturationValue setAutoresizingMask: CPViewMinXMargin];
@@ -244,7 +235,7 @@
 
     saturationValue._DOMElement.appendChild(_saturationValue);
     [_contentView addSubview: saturationValue];
-#endif
+
     _brightnessLabel = [[CPTextField alloc] initWithFrame: CPRectMake(0, 191, 15, 20)];
     [_brightnessLabel setStringValue: "B"];
     [_brightnessLabel setTextColor:[CPColor blackColor]];
@@ -256,7 +247,6 @@
     [_brightnessSlider setAction: @selector(sliderChanged:)];
     [_brightnessSlider setAutoresizingMask: CPViewWidthSizable];
 
-#if PLATFORM(DOM)
     //blue value input box
     var brightnessValue = [[CPView alloc] initWithFrame: CPRectMake(aFrame.size.width - 45, 191, 45, 20)];
     [brightnessValue setAutoresizingMask: CPViewMinXMargin];
@@ -266,12 +256,11 @@
 
     brightnessValue._DOMElement.appendChild(_brightnessValue);
     [_contentView addSubview: brightnessValue];
-#endif
+
     _hexLabel = [[CPTextField alloc] initWithFrame: CPRectMake(0, 230, 30, 20)];
     [_hexLabel setStringValue: "Hex"];
     [_hexLabel setTextColor:[CPColor blackColor]];
-
-#if PLATFORM(DOM)
+    
     //hex input box
     _hexValue = _redValue.cloneNode(false);
     _hexValue.style.top = "228px";
@@ -300,8 +289,7 @@
     };
 
     _contentView._DOMElement.appendChild(_hexValue);
-#endif
-
+    
     [_contentView addSubview: _rgbLabel];
     [_contentView addSubview: _redLabel];
     [_contentView addSubview: _greenLabel];
@@ -392,9 +380,7 @@
 
 - (void)updateHex:(CPColor)aColor
 {
-#if PLATFORM(DOM)
     _hexValue.value = [aColor hexString];
-#endif
 }
 
 - (void)updateRGBSliders:(CPColor)aColor
@@ -408,7 +394,6 @@
 
 - (void)updateLabels
 {
-#if PLATFORM(DOM)
     _hueValue.value        = ROUND([_hueSlider floatValue]);      
     _saturationValue.value = ROUND([_saturationSlider floatValue]);
     _brightnessValue.value = ROUND([_brightnessSlider floatValue]);
@@ -416,7 +401,6 @@
     _redValue.value        = ROUND([_redSlider floatValue] * 255);
     _greenValue.value      = ROUND([_greenSlider floatValue] * 255);
     _blueValue.value       = ROUND([_blueSlider floatValue] * 255);
-#endif
 }
 
 - (CPImage)provideNewButtonImage

AppKit/CPSplitView.j

@@ -20,7 +20,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-@import "CPButtonBar.j"
 @import "CPImage.j"
 @import "CPView.j"
 
@@ -44,20 +43,18 @@ var CPSplitViewHorizontalImage = nil,
     id          _delegate;
     BOOL        _isVertical;
     BOOL        _isPaneSplitter;
-
+    
     int         _currentDivider;
     float       _initialOffset;
-
+    
     CPString    _originComponent;
     CPString    _sizeComponent;
-
+    
     CPArray     _DOMDividerElements;
     CPString    _dividerImagePath;
     int         _drawingDivider;
-
+    
     BOOL        _needsResizeSubviews;
-
-    CPArray     _buttonBars;
 }
 
 /*
@@ -78,13 +75,12 @@ var CPSplitViewHorizontalImage = nil,
     if (self = [super initWithFrame:aFrame])
     {
         _currentDivider = CPNotFound;
-
+        
         _DOMDividerElements = [];
-        _buttonBars = [];
-
+        
         [self _setVertical:YES];
     }
-
+    
     return self;
 }
 
@@ -102,13 +98,13 @@ var CPSplitViewHorizontalImage = nil,
 {
     if (![self _setVertical:shouldBeVertical])
         return;
-
+    
     // Just re-adjust evenly.
     var frame = [self frame],
         dividerThickness = [self dividerThickness];
-
+    
     [self _postNotificationWillResize];
-
+    
     var eachSize = ROUND((frame.size[_sizeComponent] - dividerThickness * (_subviews.length - 1)) / _subviews.length),
         index = 0,
         count = _subviews.length;
@@ -119,9 +115,9 @@ var CPSplitViewHorizontalImage = nil,
     else
         for (; index < count; ++index)
             [_subviews[index] setFrame:CGRectMake(0, ROUND((eachSize + dividerThickness) * index), frame.size.width, eachSize)];
-
+    
     [self setNeedsDisplay:YES];
-
+    
     [self _postNotificationDidResize];
 
 }
@@ -129,13 +125,13 @@ var CPSplitViewHorizontalImage = nil,
 - (BOOL)_setVertical:(BOOL)shouldBeVertical
 {
     var changed = (_isVertical != shouldBeVertical);
-
+    
     _isVertical = shouldBeVertical;
-
+    
     _originComponent = [self isVertical] ? "x" : "y";
     _sizeComponent = [self isVertical] ? "width" : "height";
     _dividerImagePath = [self isVertical] ? [CPSplitViewVerticalImage filename] : [CPSplitViewHorizontalImage filename];
-
+    
     return changed;
 }
 
@@ -148,21 +144,20 @@ var CPSplitViewHorizontalImage = nil,
 {
     if (_isPaneSplitter == shouldBePaneSplitter)
         return;
-
+    
     _isPaneSplitter = shouldBePaneSplitter;
 
-    if(_DOMDividerElements[_drawingDivider])
-        [self _setupDOMDivider]
+#if PLATFORM(DOM)
+    _DOMDividerElements = [];
+#endif
 
-    // The divider changes size when pane splitter mode is toggled, so the
-    // subviews need to change size too.
-    _needsResizeSubviews = YES;
     [self setNeedsDisplay:YES];
 }
 
 - (void)didAddSubview:(CPView)aSubview
 {
     _needsResizeSubviews = YES;
+//    [self adjustSubviews];
 }
 
 - (BOOL)isSubviewCollapsed:(CPView)subview
@@ -174,9 +169,9 @@ var CPSplitViewHorizontalImage = nil,
 {
     var frame = [_subviews[aDivider] frame],
         rect = CGRectMakeZero();
-
+    
     rect.size = [self frame].size;
-
+    
     rect.size[_sizeComponent] = [self dividerThickness];
     rect.origin[_originComponent] = frame.origin[_originComponent] + frame.size[_sizeComponent];
 
@@ -186,19 +181,19 @@ var CPSplitViewHorizontalImage = nil,
 - (CGRect)effectiveRectOfDividerAtIndex:(int)aDivider
 {
     var realRect = [self rectOfDividerAtIndex:aDivider];
-
+    
     var padding = 2;
-
+    
     realRect.size[_sizeComponent] += padding * 2;
     realRect.origin[_originComponent] -= padding;
-
+    
     return realRect;
 }
 
 - (void)drawRect:(CGRect)rect
 {
     var count = [_subviews count] - 1;
-
+    
     while ((count--) > 0)
     {
         _drawingDivider = count;
@@ -212,34 +207,29 @@ var CPSplitViewHorizontalImage = nil,
     if (!_DOMDividerElements[_drawingDivider])
     {
         _DOMDividerElements[_drawingDivider] = document.createElement("div");
-
+        _DOMDividerElements[_drawingDivider].style.cursor = "move";
         _DOMDividerElements[_drawingDivider].style.position = "absolute";
         _DOMDividerElements[_drawingDivider].style.backgroundRepeat = "repeat";
-
+        
         CPDOMDisplayServerAppendChild(_DOMElement, _DOMDividerElements[_drawingDivider]);
 
-        [self _setupDOMDivider];
-    }
-
+        if (_isPaneSplitter)
+        {
+            _DOMDividerElements[_drawingDivider].style.backgroundColor = "#A5A5A5";
+            _DOMDividerElements[_drawingDivider].style.backgroundImage = "";
+        }
+        else
+        {
+            _DOMDividerElements[_drawingDivider].style.backgroundColor = "";
+            _DOMDividerElements[_drawingDivider].style.backgroundImage = "url('"+_dividerImagePath+"')";
+        }
+    }    
+        
     CPDOMDisplayServerSetStyleLeftTop(_DOMDividerElements[_drawingDivider], NULL, _CGRectGetMinX(aRect), _CGRectGetMinY(aRect));
     CPDOMDisplayServerSetStyleSize(_DOMDividerElements[_drawingDivider], _CGRectGetWidth(aRect), _CGRectGetHeight(aRect));
 #endif
 }
 
-- (void)_setupDOMDivider
-{
-    if (_isPaneSplitter)
-    {
-        _DOMDividerElements[_drawingDivider].style.backgroundColor = "#A5A5A5";
-        _DOMDividerElements[_drawingDivider].style.backgroundImage = "";
-    }
-    else
-    {
-        _DOMDividerElements[_drawingDivider].style.backgroundColor = "";
-        _DOMDividerElements[_drawingDivider].style.backgroundImage = "url('"+_dividerImagePath+"')";
-    }
-}
-
 - (void)viewWillDraw
 {
     [self _adjustSubviewsWithCalculatedSize];
@@ -249,13 +239,13 @@ var CPSplitViewHorizontalImage = nil,
 {
     if (!_needsResizeSubviews)
         return;
-
+    
     _needsResizeSubviews = NO;
-
+        
     var subviews = [self subviews],
         count = subviews.length,
         oldSize = CGSizeMakeZero();
-
+    
     if ([self isVertical])
     {
         oldSize.width += [self dividerThickness] * (count - 1);
@@ -266,10 +256,10 @@ var CPSplitViewHorizontalImage = nil,
         oldSize.width = CGRectGetWidth([self frame]);
         oldSize.height += [self dividerThickness] * (count - 1);
     }
-
+        
     while (count--)
         oldSize[_sizeComponent] += [subviews[count] frame].size[_sizeComponent];
-
+    
     [self resizeSubviewsWithOldSize:oldSize];
 }
 
@@ -278,41 +268,31 @@ var CPSplitViewHorizontalImage = nil,
     var frame = [_subviews[anIndex] frame],
         startPosition = frame.origin[_originComponent] + frame.size[_sizeComponent],
         effectiveRect = [self effectiveRectOfDividerAtIndex:anIndex],
-        buttonBar = _buttonBars[anIndex],
-        buttonBarRect = null,
         additionalRect = null;
-
-    if (buttonBar != null)
-    {
-        buttonBarRect = [buttonBar resizeControlFrame];
-        buttonBarRect.origin = [self convertPoint:buttonBarRect.origin fromView:buttonBar];
-    }
-
+    
     if ([_delegate respondsToSelector:@selector(splitView:effectiveRect:forDrawnRect:ofDividerAtIndex:)])
         effectiveRect = [_delegate splitView:self effectiveRect:effectiveRect forDrawnRect:effectiveRect ofDividerAtIndex:anIndex];
-
+    
     if ([_delegate respondsToSelector:@selector(splitView:additionalEffectiveRectOfDividerAtIndex:)])
         additionalRect = [_delegate splitView:self additionalEffectiveRectOfDividerAtIndex:anIndex];
 
-    return CGRectContainsPoint(effectiveRect, aPoint) || 
-           (additionalRect && CGRectContainsPoint(additionalRect, aPoint)) ||
-           (buttonBarRect && CGRectContainsPoint(buttonBarRect, aPoint));
+    return CGRectContainsPoint(effectiveRect, aPoint) || (additionalRect && CGRectContainsPoint(additionalRect, aPoint));
 }
 
 - (CPView)hitTest:(CGPoint)aPoint
 {
     if ([self isHidden] || ![self hitTests] || !CGRectContainsPoint([self frame], aPoint))
         return nil;
-
+    
     var point = [self convertPoint:aPoint fromView:[self superview]];
-
+    
     var count = [_subviews count] - 1;
     for (var i = 0; i < count; i++)
     {
         if ([self cursorAtPoint:point hitDividerAtIndex:i])
             return self;
     }
-
+    
     return [super hitTest:aPoint];
 }
 
@@ -323,19 +303,18 @@ var CPSplitViewHorizontalImage = nil,
 - (void)trackDivider:(CPEvent)anEvent
 {
     var type = [anEvent type];
-
+    
     if (type == CPLeftMouseUp)
     {
         if (_currentDivider != CPNotFound)
         {
             _currentDivider = CPNotFound;
-            [self _updateResizeCursor:anEvent];
             [self _postNotificationDidResize];
         }
-
+        
         return;
     }
-
+    
     if (type == CPLeftMouseDown)
     {
         var point = [self convertPoint:[anEvent locationInWindow] fromView:nil];
@@ -352,7 +331,7 @@ var CPSplitViewHorizontalImage = nil,
                 if ([anEvent clickCount] == 2 &&
                     [_delegate respondsToSelector:@selector(splitView:canCollapseSubview:)] &&
                     [_delegate respondsToSelector:@selector(splitView:shouldCollapseSubview:forDoubleClickOnDividerAtIndex:)])
-                {
+                {    
                     var minPosition = [self minPossiblePositionOfDividerAtIndex:i],
                         maxPosition = [self maxPossiblePositionOfDividerAtIndex:i];
 
@@ -380,20 +359,15 @@ var CPSplitViewHorizontalImage = nil,
                 }
             }
         }
-
-        if (_currentDivider === CPNotFound)
-            return;
     }
-
+    
     else if (type == CPLeftMouseDragged && _currentDivider != CPNotFound)
     {
         var point = [self convertPoint:[anEvent locationInWindow] fromView:nil];
-
+        
         [self setPosition:(point[_originComponent] + _initialOffset) ofDividerAtIndex:_currentDivider];
-        // Cursor might change if we reach a resize limit.
-        [self _updateResizeCursor:anEvent];
     }
-
+    
     [CPApp setTarget:self selector:@selector(trackDivider:) forNextEventMatchingMask:CPLeftMouseDraggedMask | CPLeftMouseUpMask untilDate:nil inMode:nil dequeue:YES];
 }
 
@@ -403,81 +377,13 @@ var CPSplitViewHorizontalImage = nil,
     [self trackDivider:anEvent];
 }
 
-- (void)viewDidMoveToWindow
-{
-    // Enable split view resize cursors. Commented out pending CPTrackingArea implementation.
-    //[[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];
-
-    if ([anEvent type] === CPLeftMouseUp && ![[self window] acceptsMouseMovedEvents])
-    {
-        [[CPCursor arrowCursor] set];
-        return;
-    }
-
-    for (var i = 0, count = [_subviews count] - 1; i < count; i++)
-    {
-        // If we are currently tracking, keep the resize cursor active even outside of hit areas.
-        if (_currentDivider === i || (_currentDivider == CPNotFound && [self cursorAtPoint:point hitDividerAtIndex:i]))
-        {
-            var frame = [_subviews[i] frame],
-                startPosition = frame.origin[_originComponent] + frame.size[_sizeComponent],
-                canShrink = [self _realPositionForPosition:startPosition-1 ofDividerAtIndex:i] < startPosition,
-                canGrow = [self _realPositionForPosition:startPosition+1 ofDividerAtIndex:i] > startPosition,
-                cursor = [CPCursor arrowCursor];
-
-            if (_isVertical && canShrink && canGrow)
-                cursor = [CPCursor resizeLeftRightCursor];
-            else if (_isVertical && canShrink)
-                cursor = [CPCursor resizeLeftCursor];
-            else if (_isVertical && canGrow)
-                cursor = [CPCursor resizeRightCursor];
-            else if (canShrink && canGrow)
-                cursor = [CPCursor resizeUpDownCursor];
-            else if (canShrink)
-                cursor = [CPCursor resizeUpCursor];
-            else if (canGrow)
-                cursor = [CPCursor resizeDownCursor];
-
-            [cursor set];
-            return;
-        }
-    }
-
-    [[CPCursor arrowCursor] set];
-}
-
 - (float)maxPossiblePositionOfDividerAtIndex:(int)dividerIndex
 {
     var frame = [_subviews[dividerIndex + 1] frame];
-
+    
     if (dividerIndex + 1 < [_subviews count] - 1)
         return frame.origin[_originComponent] + frame.size[_sizeComponent] - [self dividerThickness];
-    else
+    else    
         return [self frame].size[_sizeComponent] - [self dividerThickness];
 }
 
@@ -486,15 +392,17 @@ var CPSplitViewHorizontalImage = nil,
     if (dividerIndex > 0)
     {
         var frame = [_subviews[dividerIndex - 1] frame];
-
+        
         return frame.origin[_originComponent] + frame.size[_sizeComponent] + [self dividerThickness];
     }
-    else
+    else    
         return 0;
 }
 
-- (int)_realPositionForPosition:(float)position ofDividerAtIndex:(int)dividerIndex
+- (void)setPosition:(float)position ofDividerAtIndex:(int)dividerIndex
 {
+    [self _adjustSubviewsWithCalculatedSize];
+        
     // not sure where this should override other positions?
     if ([_delegate respondsToSelector:@selector(splitView:constrainSplitPosition:ofSubviewAt:)])
         position = [_delegate splitView:self constrainSplitPosition:position ofSubviewAt:dividerIndex];
@@ -503,56 +411,47 @@ var CPSplitViewHorizontalImage = nil,
         proposedMin = [self minPossiblePositionOfDividerAtIndex:dividerIndex],
         actualMax = proposedMax,
         actualMin = proposedMin;
-
+        
     if([_delegate respondsToSelector:@selector(splitView:constrainMinCoordinate:ofSubviewAt:)])
         actualMin = [_delegate splitView:self constrainMinCoordinate:proposedMin ofSubviewAt:dividerIndex];
-
+        
     if([_delegate respondsToSelector:@selector(splitView:constrainMaxCoordinate:ofSubviewAt:)])
         actualMax = [_delegate splitView:self constrainMaxCoordinate:proposedMax ofSubviewAt:dividerIndex];
 
-    var viewA = _subviews[dividerIndex],
-        realPosition = MAX(MIN(position, actualMax), actualMin);
-
+    var frame = [self frame],
+        viewA = _subviews[dividerIndex],
+        frameA = [viewA frame],
+        viewB = _subviews[dividerIndex + 1],
+        frameB = [viewB frame];
+    
+    var realPosition = MAX(MIN(position, actualMax), actualMin);
+    
     if (position <  proposedMin + (actualMin - proposedMin) / 2)
         if ([_delegate respondsToSelector:@selector(splitView:canCollapseSubview:)])
             if ([_delegate splitView:self canCollapseSubview:viewA])
                 realPosition = proposedMin;
-
-    return realPosition;
-}
-
-- (void)setPosition:(float)position ofDividerAtIndex:(int)dividerIndex
-{
-    [self _adjustSubviewsWithCalculatedSize];
-
-    var realPosition = [self _realPositionForPosition:position ofDividerAtIndex:dividerIndex];
-
-    var viewA = _subviews[dividerIndex],
-        frameA = [viewA frame],
-        viewB = _subviews[dividerIndex + 1],
-        frameB = [viewB frame];
-
+    
     frameA.size[_sizeComponent] = realPosition - frameA.origin[_originComponent];
     [_subviews[dividerIndex] setFrame:frameA];
-
+    
     frameB.size[_sizeComponent] = frameB.origin[_originComponent] + frameB.size[_sizeComponent] - realPosition - [self dividerThickness];
     frameB.origin[_originComponent] = realPosition + [self dividerThickness];
     [_subviews[dividerIndex + 1] setFrame:frameB];
-
+    
     [self setNeedsDisplay:YES];
 }
 
 - (void)setFrameSize:(CGSize)aSize
 {
     [self _adjustSubviewsWithCalculatedSize];
-
+        
     [super setFrameSize:aSize];
-
+    
     [self setNeedsDisplay:YES];
 }
 
 - (void)resizeSubviewsWithOldSize:(CPSize)oldSize
-{
+{   
     if ([_delegate respondsToSelector:@selector(splitView:resizeSubviewsWithOldSize:)])
     {
         [_delegate splitView:self resizeSubviewsWithOldSize:oldSize];
@@ -560,7 +459,7 @@ var CPSplitViewHorizontalImage = nil,
     }
 
     [self _postNotificationWillResize];
-
+    
     var index = 0,
         count = [_subviews count],
         bounds = [self bounds],
@@ -589,9 +488,8 @@ var CPSplitViewHorizontalImage = nil,
         totalSizableSpace = 0;
 
     var nonSizableSpace = totalSizableSpace ? bounds.size[_sizeComponent] - totalSizableSpace : 0,
-        remainingFlexibleSpace = bounds.size[_sizeComponent] - oldSize[_sizeComponent],
-        oldDimension = (oldSize[_sizeComponent]- totalDividers*dividerThickness - nonSizableSpace),
-        ratio = oldDimension <= 0 ? 0 : (bounds.size[_sizeComponent] - totalDividers*dividerThickness - nonSizableSpace) / oldDimension;
+        ratio = (bounds.size[_sizeComponent] - totalDividers*dividerThickness - nonSizableSpace) / (oldSize[_sizeComponent]- totalDividers*dividerThickness - nonSizableSpace),
+        remainingFlexibleSpace = bounds.size[_sizeComponent] - oldSize[_sizeComponent];
 
     for (index = 0; index < count; ++index)
     {
@@ -610,8 +508,10 @@ var CPSplitViewHorizontalImage = nil,
             }
             else if (totalSizableSpace && !isSizable)
                 viewFrame.size[_sizeComponent] = [view frame].size[_sizeComponent];
-
-        bounds.origin[_originComponent] += viewFrame.size[_sizeComponent] + dividerThickness;
+            else
+                alert("SHOULD NEVER GET HERE");
+                
+        bounds.origin[_originComponent] += viewFrame.size[_sizeComponent] + dividerThickness;        
 
         [view setFrame:viewFrame];
     }
@@ -625,7 +525,7 @@ var CPSplitViewHorizontalImage = nil,
         [[CPNotificationCenter defaultCenter] removeObserver:_delegate name:CPSplitViewDidResizeSubviewsNotification object:self];
     if ([_delegate respondsToSelector:@selector(splitViewWillResizeSubviews:)])
         [[CPNotificationCenter defaultCenter] removeObserver:_delegate name:CPSplitViewWillResizeSubviewsNotification object:self];
-
+    
    _delegate = delegate;
 
    if ([_delegate respondsToSelector:@selector(splitViewDidResizeSubviews:)])
@@ -640,47 +540,6 @@ var CPSplitViewHorizontalImage = nil,
                                                   object:self];
 }
 
-/*!
-    Set the button bar who's resize control should act as a control for this splitview.
-    Each divider can have at most one button bar assigned to it, and that button bar must be 
-    a subview of one of the split view's subviews.
-
-    Calling this method with nil as the button bar will remove any currently assigned button bar
-    for the divider at that index. Indexes will not be adjusted as new subviews are added, so you
-    should usually call this method after adding all the desired subviews to the split view.
-
-    This method will automatically configure the hasResizeControl and resizeControlIsLeftAligned 
-    parameters of the button bar, and will override any currently set values.
-*/
-- (void)setButtonBar:(CPButtonBar)aButtonBar forDividerAtIndex:(unsigned)dividerIndex
-{
-    if (!aButtonBar)
-    {
-        _buttonBars[dividerIndex] = nil;
-        return;
-    }
-
-    var view = [aButtonBar superview],
-        subview = aButtonBar;
-
-    while (view && view !== self)
-    {
-        subview = view;
-        view = [view superview];
-    }
-
-    if (view !== self)
-        [CPException raise:CPInvalidArgumentException 
-                    reason:@"CPSplitView button bar must be a subview of the split view."];
-
-    var viewIndex = [[self subviews] indexOfObject:subview];
-
-    [aButtonBar setHasResizeControl:YES];
-    [aButtonBar setResizeControlIsLeftAligned:dividerIndex < viewIndex];
-
-    _buttonBars[dividerIndex] = aButtonBar; 
-}
-
 - (void)_postNotificationWillResize
 {
     [[CPNotificationCenter defaultCenter] postNotificationName:CPSplitViewWillResizeSubviewsNotification object:self];
@@ -695,33 +554,30 @@ var CPSplitViewHorizontalImage = nil,
 
 var CPSplitViewDelegateKey          = "CPSplitViewDelegateKey",
     CPSplitViewIsVerticalKey        = "CPSplitViewIsVerticalKey",
-    CPSplitViewIsPaneSplitterKey    = "CPSplitViewIsPaneSplitterKey",
-    CPSplitViewButtonBarsKey        = "CPSplitViewButtonBarsKey";
+    CPSplitViewIsPaneSplitterKey    = "CPSplitViewIsPaneSplitterKey";
 
 @implementation CPSplitView (CPCoding)
 
 /*
-    Initializes the split view by unarchiving data from \c aCoder.
+    Initializes the split view by unarchiving data from <code>aCoder</code>.
     @param aCoder the coder containing the archived CPSplitView.
 */
 - (id)initWithCoder:(CPCoder)aCoder
 {
     self = [super initWithCoder:aCoder];
-
+    
     if (self)
     {
         _currentDivider = CPNotFound;
-
-        _DOMDividerElements = [];
-
-        _buttonBars = [aCoder decodeObjectForKey:CPSplitViewButtonBarsKey] || [];
         
-        _delegate = [aCoder decodeObjectForKey:CPSplitViewDelegateKey];
-
+        _DOMDividerElements = [];
+        
+        _delegate = [aCoder decodeObjectForKey:CPSplitViewDelegateKey];;
+        
         _isPaneSplitter = [aCoder decodeBoolForKey:CPSplitViewIsPaneSplitterKey];
         [self _setVertical:[aCoder decodeBoolForKey:CPSplitViewIsVerticalKey]];
     }
-
+    
     return self;
 }
 
@@ -732,12 +588,9 @@ var CPSplitViewDelegateKey          = "CPSplitViewDelegateKey",
 - (void)encodeWithCoder:(CPCoder)aCoder
 {
     [super encodeWithCoder:aCoder];
-
-    //FIXME how should we handle this?
-    //[aCoder encodeObject:_buttonBars forKey:CPSplitViewButtonBarsKey];
-
+    
     [aCoder encodeConditionalObject:_delegate forKey:CPSplitViewDelegateKey];
-
+    
     [aCoder encodeBool:_isVertical forKey:CPSplitViewIsVerticalKey];
     [aCoder encodeBool:_isPaneSplitter forKey:CPSplitViewIsPaneSplitterKey];
 }

AppKit/CPStringDrawing.j

@@ -22,9 +22,13 @@
 
 @import <Foundation/CPString.j>
 
-@import "CPPlatformString.j"
+#include "CoreGraphics/CGGeometry.h"
+#include "Platform/Platform.h"
 
 
+var CPStringReferenceElement    = nil,
+    CPStringDefaultFont         = nil;
+
 @implementation CPString (CPStringDrawing)
 
 /*!
@@ -42,7 +46,75 @@
 
 - (CGSize)sizeWithFont:(CPFont)aFont inWidth:(float)aWidth
 {
-    return [CPPlatformString sizeOfString:self withFont:aFont forWidth:aWidth];
+#if PLATFORM(DOM)
+    if (!CPStringReferenceElement)
+    {
+        CPStringReferenceElement = document.createElement("span");
+        
+        var style = CPStringReferenceElement.style;
+        
+        style.position = "absolute";
+        style.whiteSpace = "pre";
+        style.visibility = "visible";
+        style.padding = "0px";
+        style.margin = "0px";
+        
+        style.left = "-100000px";
+        style.top = "-100000px";
+        style.zIndex = "10000";
+        style.background = "red";
+        
+        document.getElementsByTagName("body")[0].appendChild(CPStringReferenceElement);
+    }
+
+    if (!aFont)
+    {
+        if (!CPStringDefaultFont)
+            CPStringDefaultFont = [CPFont systemFontOfSize:12.0];
+        
+        aFont = CPStringDefaultFont;
+    }
+
+    var style = CPStringReferenceElement.style;
+    
+    if (aWidth === NULL)
+    {
+        style.width = "";
+        style.whiteSpace = "pre";
+    }
+    
+    else
+    {
+        style.width = ROUND(aWidth) + "px";
+        
+        if (document.attachEvent)
+            style.wordWrap = "break-word";
+        
+        else
+        {
+            style.whiteSpace = "-o-pre-wrap";
+            style.whiteSpace = "-pre-wrap";
+            style.whiteSpace = "-moz-pre-wrap";
+            style.whiteSpace = "pre-wrap";
+        }
+    }
+
+    style.font = [aFont cssString];
+
+    if (CPFeatureIsCompatible(CPJavascriptInnerTextFeature))
+        CPStringReferenceElement.innerText = self;
+    
+    else if (CPFeatureIsCompatible(CPJavascriptTextContentFeature))
+        CPStringReferenceElement.textContent = self;
+
+    return _CGSizeMake(CPStringReferenceElement.clientWidth, CPStringReferenceElement.clientHeight);
+#endif
+    return _CGSizeMakeZero();
+}
+
++ (void)_resetSize
+{
+    CPStringReferenceElement = nil;
 }
 
 @end

AppKit/CPTabView.j

@@ -247,8 +247,6 @@ var CPTabViewDidSelectTabViewItemSelector           = 1,
     
     [_labelsView tabView:self didAddTabViewItem:aTabViewItem];
     
-    [aTabViewItem _setTabView:self];
-    
     if ([_tabViewItems count] == 1)
         [self selectFirstTabViewItem:self];
 
@@ -262,13 +260,9 @@ var CPTabViewDidSelectTabViewItemSelector           = 1,
 */
 - (void)removeTabViewItem:(CPTabViewItem)aTabViewItem
 {
-    var index = [self indexOfTabViewItem:aTabViewItem];
-
     [_tabViewItems removeObjectIdenticalTo:aTabViewItem];
-    
-    [_labelsView tabView:self didRemoveTabViewItemAtIndex:index];
-    
-    [aTabViewItem _setTabView:nil];
+
+    [_labelsView tabView:self didRemoveTabViewItem:aTabViewItem];
     
     if (_delegateSelectors & CPTabViewDidChangeNumberOfTabViewItemsSelector)
         [_delegate tabViewDidChangeNumberOfTabViewItems:self];
@@ -496,14 +490,6 @@ var CPTabViewDidSelectTabViewItemSelector           = 1,
     return contentRect;
 }
 
-/*!
-    Returns the receiver's delegate.
-*/
-- (id)delegate
-{
-    return _delegate;
-}
-
 /*!
     Sets the delegate for this tab view.
     @param aDelegate the tab view's delegate
@@ -662,9 +648,10 @@ var _CPTabLabelsViewBackgroundColor = nil,
     [self layoutSubviews];
 }
 
-- (void)tabView:(CPTabView)aTabView didRemoveTabViewItemAtIndex:(unsigned)index
+- (void)tabView:(CPTabView)aTabView didRemoveTabViewItem:(CPTabViewItem)aTabViewItem
 {
-    var label = _tabLabels[index];
+    var index = [aTabView indexOfTabViewItem:aTabViewItem],
+        label = _tabLabels[index];
     
     [_tabLabels removeObjectAtIndex:index];
 

AppKit/CPTabViewItem.j

@@ -58,13 +58,6 @@ CPPressedTab    = 2;
     
     CPView      _view;
     CPView      _auxiliaryView;
-    
-    CPTabView   _tabView;
-}
-
-- (id)init
-{
-    return [self initWithIdentifier:@""];
 }
 
 /*!
@@ -170,14 +163,6 @@ CPPressedTab    = 2;
     return _tabView;
 }
 
-/*!
-    @ignore
-*/
-- (void)_setTabView:(CPTabView)aView
-{
-    _tabView = aView;
-}
-
 @end
 
 var CPTabViewItemIdentifierKey  = "CPTabViewItemIdentifierKey",

AppKit/CPTableColumn.j

@@ -3,7 +3,7 @@
  * AppKit
  *
  * Created by Francisco Tolmasky.
- * Copyright 2009, 280 North, Inc.
+ * 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
@@ -20,368 +20,412 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-@import <Foundation/CPDictionary.j>
-@import <Foundation/CPObject.j>
-@import <Foundation/CPSortDescriptor.j>
-@import <Foundation/CPString.j>
+@import <Foundation/Foundation.j>
 
-@import "CPTableHeaderView.j"
 
-#include "CoreGraphics/CGGeometry.h"
+/*
+@ignore
+*/
 
+/*
+    @global
+    @class CPTableColumn
+*/
 CPTableColumnNoResizing         = 0;
-CPTableColumnAutoresizingMask   = 1 << 0;
-CPTableColumnUserResizingMask   = 1 << 1;
+/*
+    @global
+    @class CPTableColumn
+*/
+CPTableColumnAutoresizingMask   = 1;
+/*
+    @global
+    @class CPTableColumn
+*/
+CPTableColumnUserResizingMask   = 2;
 
+#define PurgableInfoMake(aView, aRow) { view:(aView), row:(aRow) }
+#define PurgableInfoView(anInfo) ((anInfo).view)
+#define PurgableInfoRow(anInfo) ((anInfo).row)
+
+/*! 
+    @ingroup appkit
+    @class CPTableColumn
+
+    An CPTableColumn object mainly keeps information about the width of the column, its minimum and maximum width; whether the column can be edited or resized; and the cells used to draw the column header and the data in the column. You can change all these attributes of the column by calling the appropriate methods. Please note that the table column does not hold nor has access to the data to be displayed in the column; this data is maintained in the table view's data source.</p>
+    
+    <p>Each CPTableColumn object is identified by a CPString, called the column identifier. The reason is that, after a column has been added to a table view, the user might move the columns around, so there is a need to identify the columns regardless of its position in the table.
+    
+    @ignore
+*/
 @implementation CPTableColumn : CPObject
 {
-    CPTableView         _tableView;
-    CPView              _headerView;
-    CPView              _dataView;
-    Object              _dataViewData;
-
-    float               _width;
-    float               _minWidth;
-    float               _maxWidth;
-    unsigned            _resizingMask;
-
-    id                  _identifier;
-    BOOL                _isEditable;
-    CPSortDescriptor    _sortDescriptorPrototype;
-    BOOL                _isHidden;
-    CPString            _headerToolTip;
+    CPString    _identifier;
+    CPView      _headerView;
     
-    BOOL _disableResizingPosting @accessors(property=disableResizingPosting);
+    CPTableView _tableView;
+    
+    float       _width;
+    float       _minWidth;
+    float       _maxWidth;
+    
+    unsigned    _resizingMask;
+
+    CPView      _dataView;                  // default data view for this column
+
+    Object      _dataViewData;              // cache of data view archives (key=data view hash, value=data view archive)
+    Object      _dataViewForView;           // mapping from view instances back to their data view prototype (key=view instance hash, value=data view)
+    Object      _purgableInfosForDataView;  // (key=data view hash, value=)
 }
 
-- (id)init
-{
-    return [self initWithIdentifier:@""];
-}
-
-- (id)initWithIdentifier:(id)anIdentifier
+/*!
+    Initializes the table column with the specified identifier.
+    @param anIdentifier the identifier
+    @return the initialized table column
+*/
+- (id)initWithIdentifier:(CPString)anIdentifier
 {
     self = [super init];
-
+    
     if (self)
     {
-        _dataViewData = { };
-
-        _width = 100.0;
-        _minWidth = 10.0;
-        _maxWidth = 1000000.0;
-        _resizingMask = CPTableColumnAutoresizingMask | CPTableColumnUserResizingMask;
-        _disableResizingPosting = NO;
+        [self _init];
         
-        [self setIdentifier:anIdentifier];
-
-        var header = [[_CPTableColumnHeaderView alloc] initWithFrame:CGRectMakeZero()];
-        [self setHeaderView:header];
+        _identifier = anIdentifier;
         
-        var textDataView = [CPTextField new];
-        [textDataView setLineBreakMode:CPLineBreakByTruncatingTail];
-        [textDataView setValue:[CPColor colorWithHexString:@"333333"] forThemeAttribute:@"text-color"];
-        [textDataView setValue:[CPColor whiteColor] forThemeAttribute:@"text-color" inState:CPThemeStateSelected];
-        [textDataView setValue:[CPFont boldSystemFontOfSize:12] forThemeAttribute:@"font" inState:CPThemeStateSelected];
-        [textDataView setValue:CPCenterVerticalTextAlignment forThemeAttribute:@"vertical-alignment"];
-        [self setDataView:textDataView];
+        _width = 40.0;
+        _minWidth = 8.0;
+        _maxWidth = 1000.0;
+        
+        var dataView = [[CPTextField alloc] initWithFrame:CPRectMakeZero()];
+        [dataView setValue:[CPColor whiteColor] forThemeAttribute:"text-color" inState:CPThemeStateHighlighted];
+        
+        [self setDataView:dataView];
+        
+        _headerView = [[CPTextField alloc] initWithFrame:CPRectMakeZero()];
+        [_headerView setBackgroundColor:[CPColor greenColor]];
     }
-
+    
     return self;
 }
 
+- (void)_init
+{
+    _dataViewData = {};
+    _dataViewForView = {};
+    _purgableInfosForDataView = {};
+}
 
+/*!
+    Sets the table column's identifier
+    @param anIdentifier the new identifier
+*/
+- (void)setIdentifier:(CPString)anIdentifier
+{
+    _identifier = anIdentifier;
+}
+
+/*!
+    Returns the table column's identifier
+*/
+- (CPString)identifier
+{
+    return _identifier;
+}
+
+// Setting the CPTableView
+/*!
+    Sets the table's view. This is called automatically by Cappuccino.
+    @param aTableView the new table view
+*/
 - (void)setTableView:(CPTableView)aTableView
 {
     _tableView = aTableView;
 }
 
+/*!
+    Returns the column's table view.
+*/
 - (CPTableView)tableView
 {
     return _tableView;
 }
 
+// Controlling size
+/*!
+    Sets the column's width.
+    @param aWidth the new column width
+*/
 - (void)setWidth:(float)aWidth
 {
-    aWidth = +aWidth;
-
-    if (_width === aWidth)
-        return;
-
-    var newWidth = MIN(MAX(aWidth, [self minWidth]), [self maxWidth]);
-
-    if (_width === newWidth)
-        return;
-
-    var oldWidth = _width;
-
-    _width = newWidth;
-
-    var tableView = [self tableView];
-
-    if (tableView)
-    {
-        var index = [[tableView tableColumns] indexOfObjectIdenticalTo:self],
-            dirtyTableColumnRangeIndex = tableView._dirtyTableColumnRangeIndex;
-            
-        if (dirtyTableColumnRangeIndex < 0)
-            tableView._dirtyTableColumnRangeIndex = index;
-        else
-            tableView._dirtyTableColumnRangeIndex = MIN(index,  tableView._dirtyTableColumnRangeIndex);
-        
-        var rows = tableView._exposedRows,
-            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 _layoutDataViewsInRows:rows columns:columns];
-        [tableView tile];
-        
-        if (!_disableResizingPosting)
-            [self _postDidResizeNotificationWithOldWidth:oldWidth];
-    }
+    _width = aWidth;
 }
 
+/*!
+    Returns the column's width
+*/
 - (float)width
 {
     return _width;
 }
 
-- (void)setMinWidth:(float)aMinWidth
+/*!
+    Sets column's minimum width.
+    @param aWidth the new minimum column width
+*/
+- (void)setMinWidth:(float)aWidth
 {
-    aMinWidth = +aMinWidth;
-
-    if (_minWidth === aMinWidth)
-        return;
-
-    _minWidth = aMinWidth;
-
-    var width = [self width],
-        newWidth = MAX(width, [self minWidth]);
-
-    if (width !== newWidth)
-        [self setWidth:newWidth];
+    if (_width < (_minWidth = aWidth))
+        [self setWidth:_minWidth];
 }
 
+/*!
+    The column's minimum width
+*/
 - (float)minWidth
 {
     return _minWidth;
 }
 
-- (void)setMaxWidth:(float)aMaxWidth
+/*!
+    Sets the column's maximum width.
+    @param aWidth the new maximum width
+*/
+- (void)setMaxWidth:(float)aWidth
 {
-    aMaxWidth = +aMaxWidth;
-
-    if (_maxWidth === aMaxWidth)
-        return;
-
-    _maxWidth = aMaxWidth;
-
-    var width = [self width],
-        newWidth = MIN(width, [self maxWidth]);
-
-    if (width !== newWidth)
-        [self setWidth:newWidth];
+    if (_width > (_maxmimumWidth = aWidth))
+        [self setWidth:_maxWidth];
 }
 
-- (float)maxWidth
+/*!
+    Sets the resizing mask. The mask is one of:
+<pre>
+CPTableColumnNoResizing;
+CPTableColumnAutoresizingMask;
+CPTableColumnUserResizingMask;
+</pre>
+    @param aMask the new resizing mask 
+*/
+- (void)setResizingMask:(unsigned)aMask
 {
-    return _maxWidth;
-}
-
-- (void)setResizingMask:(unsigned)aResizingMask
-{
-    _resizingMask = aResizingMask;
+    _resizingMask = aMask;
 }
 
+/*!
+    Returns the column's resizing mask. One of:
+<pre>
+CPTableColumnNoResizing;
+CPTableColumnAutoresizingMask;
+CPTableColumnUserResizingMask;
+</pre>
+*/
 - (unsigned)resizingMask
 {
     return _resizingMask;
 }
 
+/*!
+    Resizes the column according to the min, max and set width.
+*/
 - (void)sizeToFit
 {
-    var width = _CGRectGetWidth([_headerView frame]);
-
-    if (width < [self minWidth])
+    var width = CPRectGetWidth([_headerView frame]);
+    
+    if (width < _minWidth)
         [self setMinWidth:width];
-    else if (width > [self maxWidth])
+    else if (width > _maxWidth)
         [self setMaxWidth:width]
 
-    if (_width !== width)
+    if (_width != width)
         [self setWidth:width];
 }
 
-//Setting Component Cells
-- (void)setHeaderView:(CPView)aView
+/*!
+    Sets whether the column in this data is editable.
+    @param aFlag <code>YES</code> means the column data is editable
+*/
+- (void)setEditable:(BOOL)aFlag
 {
-    if (!aView)
-        [CPException raise:CPInvalidArgumentException reason:@"Attempt to set nil header view on " + [self description]];
-
-    _headerView = aView;
-
-    var tableHeaderView = [_tableView headerView];
-
-    [tableHeaderView setNeedsLayout];
-    [tableHeaderView setNeedsDisplay:YES];
-}
-
-- (CPView)headerView
-{
-    return _headerView;
+    _isEditable = aFlag;
 }
 
 /*!
-    This method set's the "prototype" view which will be used to create all table cells in this column.
-    
-    It creates a snapshot of aView, using keyed archiving, which is then copied over and over for each 
-    individual cell that is shown. As a result, changes made after calling this method won't be reflected.
-
-    Example:
-    
-        [tableColumn setDataView:someView]; // snapshot taken
-        [[tableColumn dataView] setSomething:x]; //won't work
-
-    This doesn't work because the snapshot is taken before the new property is applied. Instead, do:
-
-        [someView setSomething:x];
-        [tableColumn setDataView:someView];
-*/
-- (void)setDataView:(CPView)aView
-{
-    if (_dataView === aView)
-        return;
-
-    if (_dataView)
-        _dataViewData[[_dataView UID]] = nil;
-
-    _dataView = aView;
-    _dataViewData[[aView UID]] = [CPKeyedArchiver archivedDataWithRootObject:aView];
-}
-
-- (CPView)dataView
-{
-    return _dataView;
-}
-
-/*
-    Returns the CPView object used by the CPTableView to draw values for the receiver.
-
-    By default, this method just calls dataView. Subclassers can override if they need to
-    potentially use different cells for different rows. Subclasses should expect this method
-    to be invoked with row equal to -1 in cases where no actual row is involved but the table
-    view needs to get some generic cell info.
-*/
-- (id)dataViewForRow:(int)aRowIndex
-{
-    return [self dataView];
-}
-
-- (id)_newDataViewForRow:(int)aRowIndex
-{
-    var dataView = [self dataViewForRow:aRowIndex],
-        dataViewUID = [dataView UID];
-
-    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;
-    
-    return newDataView;
-}
-
-//Setting the Identifier
-
-/*
-    Sets the receiver identifier to anIdentifier.
-*/
-- (void)setIdentifier:(id)anIdentifier
-{
-    _identifier = anIdentifier;
-}
-
-/*
-    Returns the object used by the data source to identify the attribute corresponding to the receiver.
-*/
-- (id)identifier
-{
-    return _identifier;
-}
-
-//Controlling Editability
-
-/*
-    Controls whether the user can edit cells in the receiver by double-clicking them.
-*/
-- (void)setEditable:(BOOL)shouldBeEditable
-{
-    _isEditable = shouldBeEditable;
-}
-
-/*
-    Returns YES if the user can edit cells associated with the receiver by double-clicking the 
-    column in the NSTableView, NO otherwise.
+    Returns <code>YES</code> if the column data is editable.
 */
 - (BOOL)isEditable
 {
     return _isEditable;
 }
 
-//Sorting
-- (void)setSortDescriptorPrototype:(CPSortDescriptor)aSortDescriptor
+//Setting the column header view
+
+/*!
+    Sets the view that draws the column's header.
+    @param aHeaderView the view that will draws the column header
+*/
+
+- (void)setHeaderView:(CPView)aView
 {
-    _sortDescriptorPrototype = aSortDescriptor;
+    _headerView = aView;
 }
 
-- (CPSortDescriptor)sortDescriptorPrototype
+/*!
+    Return the view that draws the column's header
+*/
+- (CPView)headerView
 {
-    return _sortDescriptorPrototype;
+    return _headerView;
 }
 
-//Setting Column Visibility
-
-- (void)setHidden:(BOOL)shouldBeHidden
+/*!
+    Sets the data cell that draws rows in this column.
+*/
+- (void)setDataCell:(CPView <CPCoding>)aView
 {
-    _isHidden = shouldBeHidden;
+    [self setDataView:aView];
 }
 
-- (BOOL)isHidden
-{
-    return _isHidden;
-}
-
-//Setting Tool Tips
-
 /*
-    Sets the tooltip string that is displayed when the cursor pauses over the 
-    header cell of the receiver.
+    Sets the data view that draws rows in this column.
 */
-- (void)setHeaderToolTip:(CPString)aToolTip
+- (void)setDataView:(CPView <CPCoding>)aView
 {
-    _headerToolTip = aToolTip;
+    if (_dataView)
+        _dataViewData[[_dataView hash]] = nil;
+    
+    _dataView = aView;
+    _dataViewData[[aView hash]] = [CPKeyedArchiver archivedDataWithRootObject:aView];
 }
 
-- (CPString)headerToolTip
+/*!
+    Returns the data cell that draws rows in this column
+*/
+- (CPCell)dataCell
 {
-    return _headerToolTip;
+    return _dataView;
 }
 
-- (void)_postDidResizeNotificationWithOldWidth:(float)oldWidth
+/*
+    Returns the data view that draws rows in this column
+*/
+- (CPView)dataView
 {
-    [[CPNotificationCenter defaultCenter]
-    postNotificationName:CPTableViewColumnDidResizeNotification
-                  object:[self tableView]
-                userInfo:[CPDictionary dictionaryWithObjects:[self, oldWidth] forKeys:[@"CPTableColumn", "CPOldWidth"]]];
+    return [self dataCell];
+}
+
+/*!
+    By default returns the value from <code>dataCell</code>. This can
+    be overridden by a subclass to return different cells for different
+    rows.
+    @param aRowIndex the index of the row to obtain the cell for
+*/
+- (CPCell)dataCellForRow:(int)aRowIndex
+{
+    return [self dataView];
+}
+
+- (CPView)dataViewForRow:(int)aRowIndex
+{
+    return [self dataCellForRow:aRowIndex];
+}
+/*
+- (void)_markViewAsPurgable:(CPView)aView
+{
+    var viewHash = [aView hash],
+        dataViewHash = [_dataViewForView[viewHash] hash];
+    
+    if (!_purgableInfosForDataView[dataViewHash])
+        _purgableInfosForDataView[dataViewHash] = [CPDictionary dictionary];
+    
+    [_purgableInfosForDataView[dataViewHash] setObject:aView forKey:viewHash];
+}
+*/
+- (void)_markView:(CPView)aView inRow:(unsigned)aRow asPurgable:(BOOL)isPurgable
+{
+    var viewHash = [aView hash],
+        dataViewHash = [_dataViewForView[viewHash] hash];
+    
+    if (!_purgableInfosForDataView[dataViewHash])
+    {
+        if (!isPurgable)
+            return;
+        
+        _purgableInfosForDataView[dataViewHash] = {};
+    }
+    
+    if (!isPurgable) {
+        if (_purgableInfosForDataView[dataViewHash][viewHash])
+            CPLog.warn("removing unpurgable " + _purgableInfosForDataView[dataViewHash][viewHash]);
+        delete _purgableInfosForDataView[dataViewHash][viewHash];   
+    }
+    else
+        _purgableInfosForDataView[dataViewHash][viewHash] = PurgableInfoMake(aView, aRow);
+}
+
+- (CPView)_newDataViewForRow:(int)aRowIndex avoidingRows:(CPRange)rows
+{
+    var view = [self dataViewForRow:aRowIndex],
+        viewHash = [view hash],
+        purgableInfos = _purgableInfosForDataView[viewHash];
+    
+    if (purgableInfos)
+    {
+        for (var key in purgableInfos)
+        {
+            var info = purgableInfos[key];
+            //if (!CPLocationInRange(PurgableInfoRow(info), rows))
+            //{
+                //CPLog.debug("yes, a purged view is usable, its called: " + PurgableInfoView(info));
+                delete purgableInfos[key];
+                return PurgableInfoView(info);
+            //}
+            //else
+            //    CPLog.warn("avoiding");
+        }
+    }
+    
+    // if we haven't cached an archive of the data view, do it now
+    if (!_dataViewData[viewHash])
+        _dataViewData[viewHash] = [CPKeyedArchiver archivedDataWithRootObject:view];
+
+    // unarchive the data view cache
+    var newView = [CPKeyedUnarchiver unarchiveObjectWithData:_dataViewData[viewHash]];
+    
+    // map the new view's hash to it's data view prototype
+    _dataViewForView[[newView hash]] = view;
+    
+    CPLog.warn("creating cell: %s", newView);
+    
+    return newView;
+}
+
+- (void)_purge
+{
+    for (var viewHash in _purgableInfosForDataView)
+    {
+        var purgableInfos = _purgableInfosForDataView[viewHash];
+
+        for (var key in purgableInfos)
+        {
+            var view = PurgableInfoView(purgableInfos[key]);
+            
+            if (!view)
+                CPLog.info("key="+key+" view=" + view + " purgableInfos[key]="+purgableInfos[key])
+            else if (view._superview) {
+                //CPLog.error("PURGING: (removing)" + view);
+                //[view removeFromSuperview];
+                [view setHidden:YES];
+            } 
+            //else
+            //    CPLog.warn("PURGING: (already removed)" + view);
+            
+            //delete purgableInfos[key];
+        }
+    }
 }
 
 @end
 
+
 var CPTableColumnIdentifierKey   = @"CPTableColumnIdentifierKey",
     CPTableColumnHeaderViewKey   = @"CPTableColumnHeaderViewKey",
     CPTableColumnDataViewKey     = @"CPTableColumnDataViewKey",
@@ -394,23 +438,18 @@ var CPTableColumnIdentifierKey   = @"CPTableColumnIdentifierKey",
 
 - (id)initWithCoder:(CPCoder)aCoder
 {
-    self = [super init];
+    [self _init];
+    
+    _identifier = [aCoder decodeObjectForKey:CPTableColumnIdentifierKey];
 
-    if (self)
-    {
-        _dataViewData = { };
-
-        _width = [aCoder decodeFloatForKey:CPTableColumnWidthKey];
-        _minWidth = [aCoder decodeFloatForKey:CPTableColumnMinWidthKey];
-        _maxWidth = [aCoder decodeFloatForKey:CPTableColumnMaxWidthKey];
-
-        [self setIdentifier:[aCoder decodeObjectForKey:CPTableColumnIdentifierKey]];
-        [self setHeaderView:[aCoder decodeObjectForKey:CPTableColumnHeaderViewKey]];
-        [self setDataView:[aCoder decodeObjectForKey:CPTableColumnDataViewKey]];
-        [self setHeaderView:[aCoder decodeObjectForKey:CPTableColumnHeaderViewKey]];
-
-        _resizingMask  = [aCoder decodeBoolForKey:CPTableColumnResizingMaskKey];
-    }
+    [self setHeaderView:[aCoder decodeObjectForKey:CPTableColumnHeaderViewKey]];
+    [self setDataView:[aCoder decodeObjectForKey:CPTableColumnDataViewKey]];
+    
+    _width = [aCoder decodeFloatForKey:CPTableColumnWidthKey];
+    _minWidth = [aCoder decodeFloatForKey:CPTableColumnMinWidthKey];
+    _maxWidth = [aCoder decodeFloatForKey:CPTableColumnMaxWidthKey];
+    
+    _resizingMask  = [aCoder decodeBoolForKey:CPTableColumnResizingMaskKey];
 
     return self;
 }
@@ -418,49 +457,15 @@ var CPTableColumnIdentifierKey   = @"CPTableColumnIdentifierKey",
 - (void)encodeWithCoder:(CPCoder)aCoder
 {
     [aCoder encodeObject:_identifier forKey:CPTableColumnIdentifierKey];
-
+    
+    [aCoder encodeObject:_headerView forKey:CPTableColumnHeaderViewKey];
+    [aCoder encodeObject:_dataView forKey:CPTableColumnDataViewKey];
+    
     [aCoder encodeObject:_width forKey:CPTableColumnWidthKey];
     [aCoder encodeObject:_minWidth forKey:CPTableColumnMinWidthKey];
     [aCoder encodeObject:_maxWidth forKey:CPTableColumnMaxWidthKey];
-
-    [aCoder encodeObject:_headerView forKey:CPTableColumnHeaderViewKey];
-    [aCoder encodeObject:_dataView forKey:CPTableColumnDataViewKey];
-
+    
     [aCoder encodeObject:_resizingMask forKey:CPTableColumnResizingMaskKey];
 }
 
 @end
-
-@implementation CPTableColumn (NSInCompatibility)
-
-- (void)setHeaderCell:(CPView)aView
-{
-    [CPException raise:CPUnsupportedMethodException
-                reason:@"setHeaderCell: is not supported. -setHeaderCell:aView instead."];
-}
-
-- (CPView)headerCell
-{
-    [CPException raise:CPUnsupportedMethodException
-                reason:@"headCell is not supported. -headerView instead."];
-}
-
-- (void)setDataCell:(CPView)aView
-{
-    [CPException raise:CPUnsupportedMethodException
-                reason:@"setDataCell: is not supported. Use -setHeaderCell:aView instead."];
-}
-
-- (CPView)dataCell
-{
-    [CPException raise:CPUnsupportedMethodException
-                reason:@"dataCell is not supported. Use -dataCell instead."];
-}
-
-- (id)dataCellForRow:(int)row
-{
-    [CPException raise:CPUnsupportedMethodException
-                reason:@"dataCellForRow: is not supported. Use -dataViewForRow:row instead."];
-}
-
-@end

AppKit/CPTableHeaderView.j

@@ -1,499 +0,0 @@
-/*
- * CPTableHeaderView.j
- * AppKit
- *
- * Created by Ross Boucher.
- * 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 "CPTableColumn.j"
-@import "CPTableView.j"
-@import "CPView.j"
- 
-@implementation _CPTableColumnHeaderView : CPView
-{
-    _CPImageAndTextView _textField;
-}
-
-- (void)initWithFrame:(CGRect)frame
-{
-    self = [super initWithFrame:frame];
-    if (self)
-    {   
-        [self _init];
-    }
-    
-    return self;
-}
-
-- (void)_init
-{
-    _textField = [[_CPImageAndTextView alloc] initWithFrame:CGRectMake(5, 1, CGRectGetWidth([self bounds]) - 10, CGRectGetHeight([self bounds]) - 1)];
-    [_textField setAutoresizingMask:CPViewWidthSizable|CPViewHeightSizable];
-    
-    [_textField setLineBreakMode:CPLineBreakByTruncatingTail];
-    [_textField setTextColor: [CPColor colorWithHexString: @"333333"]];
-    [_textField setFont:[CPFont boldSystemFontOfSize:12.0]];
-    [_textField setAlignment:CPLeftTextAlignment];
-    [_textField setVerticalAlignment:CPCenterVerticalTextAlignment];
-    [_textField setTextShadowColor:[CPColor whiteColor]];
-    [_textField setTextShadowOffset:CGSizeMake(0,1)];
-
-    [self addSubview:_textField];
-}
-
-- (void)layoutSubviews
-{
-    var themeState = [self themeState];
-
-    if(themeState & CPThemeStateSelected && themeState & CPThemeStateHighlighted)
-        [self setBackgroundColor:[CPColor colorWithPatternImage:CPAppKitImage("tableview-headerview-highlighted-pressed.png", CGSizeMake(1.0, 22.0))]];
-    else if (themeState & CPThemeStateSelected)
-        [self setBackgroundColor:[CPColor colorWithPatternImage:CPAppKitImage("tableview-headerview-highlighted.png", CGSizeMake(1.0, 22.0))]];
-    else if (themeState & CPThemeStateHighlighted)
-        [self setBackgroundColor:[CPColor colorWithPatternImage:CPAppKitImage("tableview-headerview-pressed.png", CGSizeMake(1.0, 22.0))]];
-    else 
-        [self setBackgroundColor:[CPColor colorWithPatternImage:CPAppKitImage("tableview-headerview.png", CGSizeMake(1.0, 22.0))]];
-}
-
-- (void)setStringValue:(CPString)string
-{
-    [_textField setText:string];
-}
-
-- (CPString)stringValue
-{
-    return [_textField text];
-}
-
-- (void)textField
-{
-    return _textField;
-}
-
-- (void)sizeToFit
-{
-    [_textField sizeToFit];
-}
-
-- (void)setFont:(CPFont)aFont
-{
-    [_textField setFont:aFont];
-}
-
-- (void)setValue:(id)aValue forThemeAttribute:(id)aKey
-{
-    [_textField setValue:aValue forThemeAttribute:aKey];
-}
-
-- (void)_setIndicatorImage:(CPImage)anImage
-{
-	if (anImage)
-	{
-		[_textField setImage:anImage];
-		[_textField setImagePosition:CPImageRight];
-	}
-	else
-	{
-		[_textField setImagePosition:CPNoImage];
-	}
-}
-
-@end
-
-var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringValueKey",
-    _CPTableColumnHeaderViewFontKey = @"_CPTableColumnHeaderViewFontKey",
-    _CPTableColumnHeaderViewImageKey = @"_CPTableColumnHeaderViewImageKey";
-
-@implementation _CPTableColumnHeaderView (CPCoding)
-
-- (id)initWithCoder:(CPCoder)aCoder
-{
-    if (self = [super initWithCoder:aCoder])
-    {
-        [self _init];
-        [self _setIndicatorImage:[aCoder decodeObjectForKey:_CPTableColumnHeaderViewImageKey]];
-        [self setStringValue:[aCoder decodeObjectForKey:_CPTableColumnHeaderViewStringValueKey]];
-        [self setFont:[aCoder decodeObjectForKey:_CPTableColumnHeaderViewFontKey]];
-    }
-
-    return self;
-}
-
-- (void)encodeWithCoder:(CPCoder)aCoder
-{
-    [super encodeWithCoder:aCoder];
-    
-    [aCoder encodeObject:[_textField text] forKey:_CPTableColumnHeaderViewStringValueKey];
-    [aCoder encodeObject:[_textField image] forKey:_CPTableColumnHeaderViewImageKey];
-    [aCoder encodeObject:[_textField font] forKey:_CPTableColumnHeaderViewFontKey];
-}
-
-@end
-
-@implementation CPTableHeaderView : CPView
-{
-    int _resizedColumn @accessors(readonly, property=resizedColumn);
-    int _draggedColumn @accessors(readonly, property=draggedColumn);
-    int _pressedColumn @accessors(readonly, property=pressedColumn);
-    
-    float _draggedDistance @accessors(readonly, property=draggedDistance);
-    float _lastLocation;
-    float _columnOldWidth;
-    
-    CPTableView _tableView @accessors(property=tableView);
-}
-
-- (void)_init
-{
-    _resizedColumn = -1;
-    _draggedColumn = -1;
-    _pressedColumn = -1;
-    _draggedDistance = 0.0;
-    _lastLocation = nil;
-    _columnOldWidth = nil;
-
-    [self setBackgroundColor:[CPColor colorWithPatternImage:CPAppKitImage("tableview-headerview.png", CGSizeMake(1.0, 22.0))]];
-}
-
-- (id)initWithFrame:(CGRect)aFrame
-{
-    self = [super initWithFrame:aFrame];
-
-    if (self)
-        [self _init];
-
-    return self;
-}
-
-- (int)columnAtPoint:(CGPoint)aPoint
-{
-    return [_tableView columnAtPoint:CGPointMake(aPoint.x, 0)];
-}
-
-- (CGRect)headerRectOfColumn:(int)aColumnIndex
-{
-    var tableColumns = [_tableView tableColumns];
-
-    if (aColumnIndex < 0 || aColumnIndex > [tableColumns count])
-        [CPException raise:"invalid" reason:"tried to get headerRectOfColumn: on invalid column"];
-
-    // UPDATE COLUMN RANGES ?
-        
-    var tableRange = _tableView._tableColumnRanges[aColumnIndex],
-        bounds = [self bounds];
-
-    var rMinX = ROUND(tableRange.location);
-    bounds.origin.x = rMinX;
-    bounds.size.width = FLOOR(tableRange.length + tableRange.location - rMinX);
-    
-    return bounds;
-}
-
-- (CGRect)_cursorRectForColumn:(int)column
-{
-    if (column == -1 || !([_tableView._tableColumns[column] resizingMask] & CPTableColumnUserResizingMask))
-        return CGRectMakeZero();
-
-    var rect = [self headerRectOfColumn:column];
-
-    rect.origin.x = CGRectGetMaxX(rect) - 5;
-    rect.size.width = 20;
-
-    return rect;    
-}
-
-- (void)_setPressedColumn:(CPInteger)column
-{
-    if (_pressedColumn != -1)
-    {
-        var headerView = [_tableView._tableColumns[_pressedColumn] headerView];
-        [headerView unsetThemeState:CPThemeStateHighlighted];
-    }    
-    
-    if (column != -1)
-    {
-        var headerView = [_tableView._tableColumns[column] headerView];
-        [headerView setThemeState:CPThemeStateHighlighted];
-    }
-    
-    _pressedColumn = column;
-}
-
-- (void)mouseDown:(CPEvent)theEvent
-{
-    var mouseLocation = [self convertPoint:[theEvent locationInWindow] fromView:nil],
-        clickedColumn = [self columnAtPoint:mouseLocation];    
-    
-    // should we send column -1 ?
-    [_tableView _sendDelegateDidMouseDownInHeader:clickedColumn];
-    
-    var resizeLocation = CGPointMake(mouseLocation.x - 5, mouseLocation.y),
-        resizedColumn = [self columnAtPoint:resizeLocation];
-    
-    if (resizedColumn == -1)
-        return;
-
-    // 2 different tracking methods: one for resizing/stop-resizing, another one for selection/reordering
-    if ([_tableView allowsColumnResizing]
-        && CGRectContainsPoint([self _cursorRectForColumn:resizedColumn], mouseLocation))
-    {
-        _resizedColumn = resizedColumn;
-        [_tableView._tableColumns[_resizedColumn] setDisableResizingPosting:YES];
-        [_tableView setDisableAutomaticResizing:YES];
-        [self trackResizeWithEvent:theEvent];
-    }
-    else
-    {
-        [self _setPressedColumn:clickedColumn];
-        [self trackMouseWithEvent:theEvent];
-    }    
-}
-
-- (void)trackMouseWithEvent:(CPEvent)theEvent
-{
-    var type = [theEvent type];
-    
-    if (type == CPLeftMouseUp)
-    {
-        var location = [self convertPoint:[theEvent locationInWindow] fromView:nil],
-            clickedColumn = [self columnAtPoint:location];
-
-        [self _setPressedColumn:-1];
-        
-        if (clickedColumn != -1)
-            [_tableView _didClickTableColumn:clickedColumn modifierFlags:[theEvent modifierFlags]];
-        
-        return;
-    }
-
-    [CPApp setTarget:self selector:@selector(trackMouseWithEvent:) forNextEventMatchingMask:CPLeftMouseDraggedMask | CPLeftMouseUpMask | CPLeftMouseDownMask untilDate:nil inMode:nil dequeue:YES];
-}
-
-- (void)trackResizeWithEvent:(CPEvent)anEvent
-{
-    var location = [self convertPoint:[anEvent locationInWindow] fromView:nil],
-        tableColumn = [[_tableView tableColumns] objectAtIndex:_resizedColumn],
-        type = [anEvent type];
-
-    if (_lastLocation == nil)
-        _lastLocation = location;
-
-    if (_columnOldWidth == nil)
-        _columnOldWidth = [tableColumn width];
-
-    if (type === CPLeftMouseUp)
-    {   
-        [self _updateResizeCursor:anEvent];
-                
-        [tableColumn _postDidResizeNotificationWithOldWidth:_columnOldWidth];
-        [tableColumn setDisableResizingPosting:NO];        
-        [_tableView setDisableAutomaticResizing:NO];
-
-        _resizedColumn = -1;
-        _lastLocation = nil;
-        _columnOldWidth = nil;
-
-        return;
-    }            
-    else if (type === CPLeftMouseDragged)
-    {
-        var newWidth = [tableColumn width] + location.x - _lastLocation.x;
-        
-        if (newWidth < [tableColumn minWidth])
-            [[CPCursor resizeRightCursor] set];
-        else if (newWidth > [tableColumn maxWidth])
-            [[CPCursor resizeLeftCursor] set];
-        else
-        {
-            _tableView._lastColumnShouldSnap = NO;
-            [tableColumn setWidth:newWidth];
-            // FIXME: there has to be a better way to do this...
-            // We should refactor the auto resizing crap.
-            // We need to figure out the exact cocoa behavior here though. 
-            _lastLocation = location;
-
-            [[CPCursor resizeLeftRightCursor] set];
-            [self setNeedsLayout];
-            [self setNeedsDisplay:YES];
-        }
-    }
-
-    [CPApp setTarget:self selector:@selector(trackResizeWithEvent:) forNextEventMatchingMask:CPLeftMouseDraggedMask | CPLeftMouseUpMask untilDate:nil inMode:nil dequeue:YES];
-}
-
-- (void)_updateResizeCursor:(CPEvent)theEvent
-{
-    // never get stuck in resize cursor mode (FIXME take out when we turn on tracking rects)
-    if (![_tableView allowsColumnResizing] || ([theEvent type] === CPLeftMouseUp && ![[self window] acceptsMouseMovedEvents]))
-    {
-        [[CPCursor arrowCursor] set];
-        return;
-    }
-
-    var mouseLocation = [self convertPoint:[theEvent locationInWindow] fromView:nil],    
-        mouseOverLocation = CGPointMake(mouseLocation.x - 5, mouseLocation.y),
-        overColumn = [self columnAtPoint:mouseOverLocation];
-    
-    if (overColumn >= 0 && CGRectContainsPoint([self _cursorRectForColumn:overColumn], mouseLocation))
-    {
-        var tableColumn = [[_tableView tableColumns] objectAtIndex:overColumn],
-            width = [tableColumn width];
-            
-        if (width == [tableColumn minWidth])
-            [[CPCursor resizeRightCursor] set];
-        else if (width == [tableColumn maxWidth])
-            [[CPCursor resizeLeftCursor] set];
-        else
-            [[CPCursor resizeLeftRightCursor] set];
-    }
-    else
-        [[CPCursor arrowCursor] set];
-}
-
-- (void)viewDidMoveToWindow
-{
-    //if ([_tableView allowsColumnResizing])
-    //    [[self window] setAcceptsMouseMovedEvents:YES];
-}
-
-- (void)mouseEntered:(CPEvent)theEvent
-{   
-    [self _updateResizeCursor:theEvent];
-}
-
-- (void)mouseMoved:(CPEvent)theEvent
-{
-    [self _updateResizeCursor:theEvent];
-}
-
-- (void)mouseExited:(CPEvent)theEvent
-{
-    // FIXME: we should use CPCursor push/pop (if previous currentCursor != arrow).
-    [[CPCursor arrowCursor] set];
-}
-
-- (void)layoutSubviews
-{
-    var tableColumns = [_tableView tableColumns],
-        count = [tableColumns count];    
-    
-    for (var i = 0; i < count; i++) 
-    {
-        var column = [tableColumns objectAtIndex:i],
-            headerView = [column headerView];
-        
-        var frame = [self headerRectOfColumn:i];
-        frame.size.height -= 0.5;
-        if (i > 0) 
-        {
-            frame.origin.x += 0.5;
-            frame.size.width -= 1;
-        }
-        
-        [headerView setFrame:frame];
-        
-        if([headerView superview] != self)
-            [self addSubview:headerView];
-    }
-}
-
-- (void)drawRect:(CGRect)aRect
-{
-    if (!_tableView)
-        return;
-
-    var context = [[CPGraphicsContext currentContext] graphicsPort],
-        exposedColumnIndexes = [_tableView columnIndexesInRect:aRect],
-        columnsArray = [],
-        tableColumns = [_tableView tableColumns],
-        exposedTableColumns = _tableView._exposedColumns,
-        firstIndex = [exposedTableColumns firstIndex],
-        exposedRange = CPMakeRange(firstIndex, [exposedTableColumns lastIndex] - firstIndex + 1);
-
-    CGContextSetLineWidth(context, 1);
-    CGContextSetStrokeColor(context, [_tableView gridColor]);
-
-    [exposedColumnIndexes getIndexes:columnsArray maxCount:-1 inIndexRange:exposedRange];
-
-    var columnArrayIndex = 0,
-        columnArrayCount = columnsArray.length,
-        columnMaxX;
-        
-    CGContextBeginPath(context);
-    for(; columnArrayIndex < columnArrayCount; columnArrayIndex++)
-    {
-        // grab each column rect and add vertical lines
-        var columnIndex = columnsArray[columnArrayIndex],
-            columnToStroke = [self headerRectOfColumn:columnIndex];
-            
-        columnMaxX = CGRectGetMaxX(columnToStroke);
-        
-        CGContextMoveToPoint(context, ROUND(columnMaxX) + 0.5, ROUND(CGRectGetMinY(columnToStroke)));
-        CGContextAddLineToPoint(context, ROUND(columnMaxX) + 0.5, ROUND(CGRectGetMaxY(columnToStroke)));
-    }
-    
-    CGContextClosePath(context);
-    CGContextStrokePath(context);
-        
-/*
-    var maxY = CGRectGetMaxY([self bounds]);
-    // draw normal gradient for remaining space
-    if (supportsCanvasGradient)
-    {
-        aRect.origin.x = columnMaxX - 0.5;
-        aRect.size.width -= columnMaxX;
-        CGContextBeginPath(context);
-        CGContextAddRect(context, CGRectMake(columnMaxX + 1, 0, CGRectGetMaxX([self bounds]) - columnMaxX, CGRectGetHeight([self bounds])));
-        CGContextClosePath(context);    
-        CGContextDrawLinearGradient(context, [_CPTableColumnHeaderView headerGradient], CGPointMake(0,0), CGPointMake(0, maxY - 1),0);
-    }   
-   
-    // Draw bottom line
-    CGContextBeginPath(context);    
-    CGContextMoveToPoint(context, 0, maxY - 0.5);
-    CGContextAddLineToPoint(context, CGRectGetMaxX([self bounds]), maxY - 0.5);
-    CGContextClosePath(context);
-    CGContextStrokePath(context);
-*/   
-}
-
-@end
-
-var CPTableHeaderViewTableViewKey = @"CPTableHeaderViewTableViewKey";
-
-@implementation CPTableHeaderView (CPCoding)
-
-- (id)initWithCoder:(CPCoder)aCoder
-{
-    if (self = [super initWithCoder:aCoder])
-    {
-        [self _init];
-        _tableView = [aCoder decodeObjectForKey:CPTableHeaderViewTableViewKey];
-    }
-
-    return self;
-}
-
-- (void)encodeWithCoder:(CPCoder)aCoder
-{
-    [super encodeWithCoder:aCoder];
-    [aCoder encodeObject:_tableView forKey:CPTableHeaderViewTableViewKey];
-}
-
-@end
-

AppKit/CPTextField.j

@@ -24,17 +24,56 @@
 @import "CPControl.j"
 @import "CPStringDrawing.j"
 @import "CPCompatibility.j"
-@import "_CPImageAndTextView.j"
 
 #include "CoreGraphics/CGGeometry.h"
 #include "Platform/Platform.h"
 #include "Platform/DOM/CPDOMDisplayServer.h"
 
-CPTextFieldSquareBezel          = 0;    /*! A textfield bezel with a squared corners. */
-CPTextFieldRoundedBezel         = 1;    /*! A textfield bezel with rounded corners. */
 
-CPTextFieldDidFocusNotification = @"CPTextFieldDidFocusNotification";
-CPTextFieldDidBlurNotification  = @"CPTextFieldDidBlurNotification";
+/*
+    @global
+    @group CPLineBreakMode
+*/
+CPLineBreakByWordWrapping       = 0;
+/*
+    @global
+    @group CPLineBreakMode
+*/
+CPLineBreakByCharWrapping       = 1;
+/*
+    @global
+    @group CPLineBreakMode
+*/
+CPLineBreakByClipping           = 2;
+/*
+    @global
+    @group CPLineBreakMode
+*/
+CPLineBreakByTruncatingHead     = 3;
+/*
+    @global
+    @group CPLineBreakMode
+*/
+CPLineBreakByTruncatingTail     = 4;
+/*
+    @global
+    @group CPLineBreakMode
+*/
+CPLineBreakByTruncatingMiddle   = 5;
+
+/*
+    A textfield bezel with a squared corners.
+	@global
+	@group CPTextFieldBezelStyle
+*/
+CPTextFieldSquareBezel          = 0;
+/*
+    A textfield bezel with rounded corners.
+	@global
+	@group CPTextFieldBezelStyle
+*/
+CPTextFieldRoundedBezel         = 1;
+
 
 #if PLATFORM(DOM)
 
@@ -48,7 +87,11 @@ var CPTextFieldDOMInputElement = nil,
     CPTextFieldInputIsActive = NO,
     CPTextFieldCachedSelectStartFunction = nil,
     CPTextFieldCachedDragFunction = nil,
-    CPTextFieldBlurFunction = nil;
+    
+    CPTextFieldBlurFunction = nil,
+    CPTextFieldKeyUpFunction = nil,
+    CPTextFieldKeyPressFunction = nil,
+    CPTextFieldKeyDownFunction = nil;
     
 #endif
 
@@ -57,7 +100,7 @@ var CPSecureTextFieldCharacter = "\u2022";
 @implementation CPString (CPTextFieldAdditions)
 
 /*!
-    Returns the string (\c self).
+    Returns the string (<code>self</code>).
 */
 - (CPString)string
 {
@@ -75,8 +118,6 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 */
 @implementation CPTextField : CPControl
 {
-    BOOL                    _isEditing;
-
     BOOL                    _isEditable;
     BOOL                    _isSelectable;
     BOOL                    _isSecure;
@@ -162,7 +203,7 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 
 + (id)themeAttributes
 {
-    return [CPDictionary dictionaryWithObjects:[_CGInsetMakeZero(), _CGInsetMake(2.0, 2.0, 2.0, 2.0), [CPNull null]]
+    return [CPDictionary dictionaryWithObjects:[_CGInsetMakeZero(), _CGInsetMake(2.0, 2.0, 2.0, 2.0), nil]
                                        forKeys:[@"bezel-inset", @"content-inset", @"bezel-color"]];
 }
 
@@ -198,13 +239,80 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
             return true;
         }
 
+        CPTextFieldKeyDownFunction = function(anEvent)
+        {
+            CPTextFieldTextDidChangeValue = [CPTextFieldInputOwner stringValue];
+
+            CPTextFieldKeyPressFunction(anEvent);
+
+            return true;
+        }
+
+        CPTextFieldKeyPressFunction = function(aDOMEvent)
+        {
+            aDOMEvent = aDOMEvent || window.event;
+
+            if (aDOMEvent.keyCode == CPReturnKeyCode || aDOMEvent.keyCode == CPTabKeyCode) 
+            {
+                if (aDOMEvent.preventDefault)
+                    aDOMEvent.preventDefault(); 
+                if (aDOMEvent.stopPropagation)
+                    aDOMEvent.stopPropagation();
+                aDOMEvent.cancelBubble = true;
+
+                var owner = CPTextFieldInputOwner;
+
+                if (aDOMEvent && aDOMEvent.keyCode == CPReturnKeyCode)
+                {
+                    [owner sendAction:[owner action] to:[owner target]];    
+                    [[owner window] makeFirstResponder:nil];
+                }
+                else if (aDOMEvent && aDOMEvent.keyCode == CPTabKeyCode)
+                {
+                    if (!aDOMEvent.shiftKey)
+                        [[owner window] selectNextKeyView:owner];
+                    else
+                        [[owner window] selectPreviousKeyView:owner];
+                }
+            }    
+
+            [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
+        }
+
+        CPTextFieldKeyUpFunction = function()
+        {
+            [CPTextFieldInputOwner setStringValue:CPTextFieldDOMInputElement.value];
+
+            if ([CPTextFieldInputOwner stringValue] !== CPTextFieldTextDidChangeValue)
+            {
+                CPTextFieldTextDidChangeValue = [CPTextFieldInputOwner stringValue];
+                [CPTextFieldInputOwner textDidChange:[CPNotification notificationWithName:CPControlTextDidChangeNotification object:CPTextFieldInputOwner userInfo:nil]];
+            }
+
+            [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
+        }
+
         CPTextFieldHandleBlur = function(anEvent)
         {            
+            var owner = CPTextFieldInputOwner;
             CPTextFieldInputOwner = nil;
 
             [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
         }
 
+        if (document.attachEvent)
+        {
+            CPTextFieldDOMInputElement.attachEvent("on" + CPDOMEventKeyUp, CPTextFieldKeyUpFunction);
+            CPTextFieldDOMInputElement.attachEvent("on" + CPDOMEventKeyDown, CPTextFieldKeyDownFunction);
+            CPTextFieldDOMInputElement.attachEvent("on" + CPDOMEventKeyPress, CPTextFieldKeyPressFunction);
+        }
+        else
+        {
+            CPTextFieldDOMInputElement.addEventListener(CPDOMEventKeyUp, CPTextFieldKeyUpFunction, NO);
+            CPTextFieldDOMInputElement.addEventListener(CPDOMEventKeyDown, CPTextFieldKeyDownFunction, NO);
+            CPTextFieldDOMInputElement.addEventListener(CPDOMEventKeyPress, CPTextFieldKeyPressFunction, NO);
+        }
+
         //FIXME make this not onblur
         CPTextFieldDOMInputElement.onblur = CPTextFieldBlurFunction;
         
@@ -235,6 +343,10 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
             CPTextFieldDOMPasswordInputElement.style.outline = "none";
             CPTextFieldDOMPasswordInputElement.type = "password";
 
+            CPTextFieldDOMPasswordInputElement.attachEvent("on" + CPDOMEventKeyUp, CPTextFieldKeyUpFunction);
+            CPTextFieldDOMPasswordInputElement.attachEvent("on" + CPDOMEventKeyDown, CPTextFieldKeyDownFunction);
+            CPTextFieldDOMPasswordInputElement.attachEvent("on" + CPDOMEventKeyPress, CPTextFieldKeyPressFunction);
+
             CPTextFieldDOMPasswordInputElement.onblur = CPTextFieldBlurFunction;
         }
         
@@ -277,7 +389,7 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 }
 
 /*!
-    Returns \c YES if the textfield is currently editable by the user.
+    Returns <code>YES</code> if the textfield is currently editable by the user.
 */
 - (BOOL)isEditable
 {
@@ -286,7 +398,7 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 
 /*!
     Sets whether the field's text is selectable by the user.
-    @param aFlag \c YES makes the text selectable
+    @param aFlag <code>YES</code> makes the text selectable
 */
 - (void)setSelectable:(BOOL)aFlag
 {
@@ -294,7 +406,7 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 }
 
 /*!
-    Returns \c YES if the field's text is selectable by the user.
+    Returns <code>YES</code> if the field's text is selectable by the user.
 */
 - (BOOL)isSelectable
 {
@@ -303,7 +415,7 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 
 /*!
     Sets whether the field's text is secure.
-    @param aFlag \c YES makes the text secure
+    @param aFlag <code>YES</code> makes the text secure
 */
 - (void)setSecure:(BOOL)aFlag
 {
@@ -311,7 +423,7 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 }
 
 /*!
-    Returns \c YES if the field's text is secure (password entry).
+    Returns <code>YES</code> if the field's text is secure (password entry).
 */
 - (BOOL)isSecure
 {
@@ -321,7 +433,7 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 // Setting the Bezel Style
 /*!
     Sets whether the textfield will have a bezeled border.
-    @param shouldBeBezeled \c YES means the textfield will draw a bezeled border
+    @param shouldBeBezeled <code>YES</code> means the textfield will draw a bezeled border
 */
 - (void)setBezeled:(BOOL)shouldBeBezeled
 {
@@ -332,7 +444,7 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 }
 
 /*!
-    Returns \c YES if the textfield draws a bezeled border.
+    Returns <code>YES</code> if the textfield draws a bezeled border.
 */
 - (BOOL)isBezeled
 {
@@ -366,7 +478,7 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 
 /*!
     Sets whether the textfield will have a border drawn.
-    @param shouldBeBordered \c YES makes the textfield draw a border
+    @param shouldBeBordered <code>YES</code> makes the textfield draw a border
 */
 - (void)setBordered:(BOOL)shouldBeBordered
 {
@@ -377,7 +489,7 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 }
 
 /*!
-    Returns \c YES if the textfield has a border.
+    Returns <code>YES</code> if the textfield has a border.
 */
 - (BOOL)isBordered
 {
@@ -386,7 +498,7 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 
 /*!
     Sets whether the textfield will have a background drawn.
-    @param shouldDrawBackground \c YES makes the textfield draw a background
+    @param shouldDrawBackground <code>YES</code> makes the textfield draw a background
 */
 - (void)setDrawsBackground:(BOOL)shouldDrawBackground
 {
@@ -400,7 +512,7 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 }
 
 /*!
-    Returns \c YES if the textfield draws a background.
+    Returns <code>YES</code> if the textfield draws a background.
 */
 - (BOOL)drawsBackground
 {
@@ -439,10 +551,8 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 /* @ignore */
 - (BOOL)becomeFirstResponder
 {
-#if PLATFORM(DOM)
     if (CPTextFieldInputOwner && [CPTextFieldInputOwner window] !== [self window])
         [[CPTextFieldInputOwner window] makeFirstResponder:nil];
-#endif
 
     [self setThemeState:CPThemeStateEditing];
 
@@ -450,8 +560,6 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 
     [self setNeedsLayout];
 
-    _isEditing = NO;
-
 #if PLATFORM(DOM)
 
     var string = [self stringValue],
@@ -462,15 +570,6 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
     element.style.font = [[self currentValueForThemeAttribute:@"font"] cssString];
     element.style.zIndex = 1000;
 
-    switch ([self alignment])
-    {
-        case CPCenterTextAlignment: element.style.textAlign = "center";
-                                    break;
-        case CPRightTextAlignment:  element.style.textAlign = "right";
-                                    break;
-        default:                    element.style.textAlign = "left";
-    }
-
     var contentRect = [self contentRectForBounds:[self bounds]];
 
     element.style.top = _CGRectGetMinY(contentRect) + "px";
@@ -482,25 +581,26 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 
     window.setTimeout(function() 
     { 
-        element.focus();
-        [self textDidFocus:[CPNotification notificationWithName:CPTextFieldDidFocusNotification object:self userInfo:nil]];
+        element.focus(); 
         CPTextFieldInputOwner = self;
     }, 0.0);
  
-    element.value = [self stringValue];
-
-    [[[self window] platformWindow] _propagateCurrentDOMEvent:YES];
+    //post CPControlTextDidBeginEditingNotification
+    [self textDidBeginEditing:[CPNotification notificationWithName:CPControlTextDidBeginEditingNotification object:self userInfo:nil]];
+    
+    [[CPDOMWindowBridge sharedDOMWindowBridge] _propagateCurrentDOMEvent:YES];
     
     CPTextFieldInputIsActive = YES;
 
     if (document.attachEvent)
     {
-        CPTextFieldCachedSelectStartFunction = [[self window] platformWindow]._DOMBodyElement.onselectstart;
-        CPTextFieldCachedDragFunction = [[self window] platformWindow]._DOMBodyElement.ondrag;
+        CPTextFieldCachedSelectStartFunction = document.body.onselectstart;
+        CPTextFieldCachedDragFunction = document.body.ondrag;
         
-        [[self window] platformWindow]._DOMBodyElement.ondrag = function () {};
-        [[self window] platformWindow]._DOMBodyElement.onselectstart = function () {};
+        document.body.ondrag = function () {};
+        document.body.onselectstart = function () {};
     }
+    
 #endif
 
     return YES;
@@ -540,32 +640,15 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
         CPTextFieldCachedSelectStartFunction = nil;
         CPTextFieldCachedDragFunction = nil;
         
-        [[self window] platformWindow]._DOMBodyElement.ondrag = CPTextFieldCachedDragFunction;
-        [[self window] platformWindow]._DOMBodyElement.onselectstart = CPTextFieldCachedSelectStartFunction;
+        document.body.ondrag = CPTextFieldCachedDragFunction
+        document.body.onselectstart = CPTextFieldCachedSelectStartFunction
     }
     
 #endif
 
     //post CPControlTextDidEndEditingNotification
-    if (_isEditing)
-    {
-        _isEditing = NO;
-        [self textDidEndEditing:[CPNotification notificationWithName:CPControlTextDidEndEditingNotification object:self userInfo:nil]];
+    [self textDidEndEditing:[CPNotification notificationWithName:CPControlTextDidBeginEditingNotification object:self userInfo:nil]];
 
-        if ([self sendsActionOnEndEditing])
-            [self sendAction:[self action] to:[self target]];
-    }
-
-    [self textDidBlur:[CPNotification notificationWithName:CPTextFieldDidBlurNotification object:self userInfo:nil]];
-
-    return YES;
-}
-
-/*!
-    Text fields require panels to become key window, so this returns \c YES.
-*/
-- (BOOL)needsPanelToBecomeKey
-{
     return YES;
 }
 
@@ -578,89 +661,6 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
         return [[self nextResponder] mouseDown:anEvent];
 }
 
-- (void)mouseUp:(CPEvent)anEvent
-{
-    if (![self isEditable] || ![self isEnabled])
-        [[self nextResponder] mouseUp:anEvent];
-}
-
-- (void)mouseDragged:(CPEvent)anEvent
-{
-    if (![self isEditable] || ![self isEnabled])
-        [[self nextResponder] mouseDragged:anEvent];
-}
-
-- (void)keyUp:(CPEvent)anEvent
-{
-    var oldValue = [self stringValue];
-    [self _setStringValue:[self _inputElement].value];
-
-    if (oldValue !== [self stringValue])
-    {
-        if (!_isEditing)
-        {
-            _isEditing = YES;
-            [self textDidBeginEditing:[CPNotification notificationWithName:CPControlTextDidBeginEditingNotification object:self userInfo:nil]];
-        }
-
-        [self textDidChange:[CPNotification notificationWithName:CPControlTextDidChangeNotification object:self userInfo:nil]];
-    }
-
-    [[[self window] platformWindow] _propagateCurrentDOMEvent:YES];
-}
-
-- (void)keyDown:(CPEvent)anEvent
-{
-    if ([anEvent keyCode] === CPReturnKeyCode)
-    {
-        if (_isEditing)
-        {
-            _isEditing = NO;
-            [self textDidEndEditing:[CPNotification notificationWithName:CPControlTextDidEndEditingNotification object:self userInfo:nil]];
-        }
-
-        [self sendAction:[self action] to:[self target]];
-        [self selectText:nil];
-
-        [[[self window] platformWindow] _propagateCurrentDOMEvent:NO];
-    }
-    else if ([anEvent keyCode] === CPTabKeyCode)
-    {
-        if ([anEvent modifierFlags] & CPShiftKeyMask)
-            [[self window] selectPreviousKeyView:self];
-        else
-            [[self window] selectNextKeyView:self];
-
-        if ([[[self window] firstResponder] respondsToSelector:@selector(selectText:)])
-            [[[self window] firstResponder] selectText:self];
-
-        [[[self window] platformWindow] _propagateCurrentDOMEvent:NO];
-    }
-    else
-        [[[self window] platformWindow] _propagateCurrentDOMEvent:YES];
-
-    [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
-}
-
-
-- (void)textDidBlur:(CPNotification)note
-{
-    //this looks to prevent false propagation of notifications for other objects
-    if([note object] != self)
-        return;
-
-    [[CPNotificationCenter defaultCenter] postNotification:note];
-}
-
-- (void)textDidFocus:(CPNotification)note
-{
-    //this looks to prevent false propagation of notifications for other objects
-    if([note object] != self)
-        return;
-
-    [[CPNotificationCenter defaultCenter] postNotification:note];
-}
-
 /*!
     Returns the string the text field.
 */
@@ -672,23 +672,9 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 /*
     @ignore
 */
-- (void)_setStringValue:(id)aValue
-{
-    [self willChangeValueForKey:@"objectValue"];
-    [super setObjectValue:String(aValue)];
-    [self _updatePlaceholderState];
-    [self didChangeValueForKey:@"objectValue"];
-}
-
 - (void)setObjectValue:(id)aValue
 {
     [super setObjectValue:aValue];
-	
-#if PLATFORM(DOM)
-
-    if (CPTextFieldInputOwner === self || [[self window] firstResponder] === self)
-        [self _inputElement].value = aValue;
-#endif
 
     [self _updatePlaceholderState];
 }
@@ -697,7 +683,7 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 {
     var string = [self stringValue];
 
-    if ((!string || string.length === 0) && ![self hasThemeState:CPThemeStateEditing])
+    if ((!string || [string length] === 0) && ![self hasThemeState:CPThemeStateEditing])
         [self setThemeState:CPTextFieldStatePlaceholder];
     else
         [self unsetThemeState:CPTextFieldStatePlaceholder];
@@ -777,151 +763,11 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 #if PLATFORM(DOM)
     var element = [self _inputElement];
     
-    if (([self isEditable] || [self isSelectable]))
-    {
-        if ([[self window] firstResponder] === self)
-            window.setTimeout(function() { element.select(); }, 0);
-        else
-        {
-            [[self window] makeFirstResponder:self];
-            window.setTimeout(function() {[self selectText:sender];}, 0);
-        }
-    }
+    if (element.parentNode == _DOMElement && ([self isEditable] || [self isSelectable]))
+        element.select();
 #endif
 }
 
-- (void)copy:(id)sender
-{
-    if (![CPPlatform isBrowser])
-    {
-        var selectedRange = [self selectedRange];
-
-        if (selectedRange.length < 1)
-            return;
-
-        var pasteboard = [CPPasteboard generalPasteboard],
-            stringValue = [self stringValue],
-            stringForPasting = [stringValue substringWithRange:selectedRange];
-
-        [pasteboard declareTypes:[CPStringPboardType] owner:nil];
-        [pasteboard setString:stringForPasting forType:CPStringPboardType];
-    }
-}
-
-- (void)cut:(id)sender
-{
-    if (![CPPlatform isBrowser])
-    {
-        [self copy:sender];
-        [self deleteBackward:sender];
-    }
-}
-
-- (void)paste:(id)sender
-{
-    if (![CPPlatform isBrowser])
-    {
-        var pasteboard = [CPPasteboard generalPasteboard];
-
-        if (![[pasteboard types] containsObject:CPStringPboardType])
-            return;
-
-        [self deleteBackward:sender];
-
-        var selectedRange = [self selectedRange],
-            stringValue = [self stringValue],
-            pasteString = [pasteboard stringForType:CPStringPboardType],
-            newValue = [stringValue stringByReplacingCharactersInRange:selectedRange withString:pasteString];
-
-        [self setStringValue:newValue];
-        [self setSelectedRange:CPMakeRange(selectedRange.location+pasteString.length, 0)];
-    }
-}
-
-- (CPRange)selectedRange
-{
-    if ([[self window] firstResponder] !== self)
-        return CPMakeRange(0, 0);
-
-    // we wrap this in try catch because firefox will throw an exception in certain instances
-    try 
-    {
-        var inputElement = [self _inputElement],
-            selectionStart = inputElement.selectionStart,
-            selectionEnd = inputElement.selectionEnd;
-
-        if ([selectionStart isKindOfClass:CPNumber])
-            return CPMakeRange(selectionStart, selectionEnd - selectionStart);    
-
-        // browsers which don't support selectionStart/selectionEnd (aka IE).
-        var theDocument = inputElement.ownerDocument || inputElement.document,
-            selectionRange = theDocument.selection.createRange(),
-            range = inputElement.createTextRange();
-
-        if (range.inRange(selectionRange))
-        {
-            range.setEndPoint('EndToStart', selectionRange);
-            return CPMakeRange(range.text.length, selectionRange.text.length);
-        }
-    } 
-    catch (e) 
-    {
-        // fall through to the return
-    }
-
-    return CGMakeRange(0, 0);
-}
-
-- (void)setSelectedRange:(CPRange)aRange
-{
-    if (![[self window] firstResponder] === self)
-        return;
-
-    var inputElement = [self _inputElement];
-
-    try 
-    {
-        if ([inputElement.selectionStart isKindOfClass:CPNumber])
-        {
-            inputElement.selectionStart = aRange.location;
-            inputElement.selectionEnd = CPMaxRange(aRange);
-        }
-        else
-        {
-            // browsers which don't support selectionStart/selectionEnd (aka IE).
-            var theDocument = inputElement.ownerDocument || inputElement.document,
-                existingRange = theDocument.selection.createRange(),
-                range = inputElement.createTextRange();
-    
-            if (range.inRange(existingRange))
-            {
-                range.collapse(true);
-                range.move('character', aRange.location);
-                range.moveEnd('character', aRange.length);
-                range.select();
-            }
-        }
-    }
-    catch (e)
-    {
-    }
-}
-
-- (void)selectAll:(id)sender
-{
-    [self selectText:sender];
-}
-
-- (void)deleteBackward:(id)sender
-{
-    var selectedRange = [self selectedRange],
-        stringValue = [self stringValue],
-        newValue = [stringValue stringByReplacingCharactersInRange:selectedRange withString:""];
-
-    [self setStringValue:newValue];
-    [self setSelectedRange:CPMakeRange(selectedRange.location, 0)];
-}
-
 #pragma mark Setting the Delegate
 
 - (void)setDelegate:(id)aDelegate
@@ -934,8 +780,6 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
         [defaultCenter removeObserver:_delegate name:CPControlTextDidBeginEditingNotification object:self];
         [defaultCenter removeObserver:_delegate name:CPControlTextDidChangeNotification object:self];
         [defaultCenter removeObserver:_delegate name:CPControlTextDidEndEditingNotification object:self];
-        [defaultCenter removeObserver:_delegate name:CPTextFieldDidFocusNotification object:self];
-        [defaultCenter removeObserver:_delegate name:CPTextFieldDidBlurNotification object:self];
     }
     
     _delegate = aDelegate;
@@ -962,19 +806,6 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
                    name:CPControlTextDidEndEditingNotification
                  object:self];
 
-    if ([_delegate respondsToSelector:@selector(controlTextDidFocus:)])
-        [defaultCenter
-            addObserver:_delegate
-               selector:@selector(controlTextDidFocus:)
-                   name:CPTextFieldDidFocusNotification
-                 object:self];
-
-    if ([_delegate respondsToSelector:@selector(controlTextDidBlur:)])
-        [defaultCenter
-            addObserver:_delegate
-               selector:@selector(controlTextDidBlur:)
-                   name:CPTextFieldDidBlurNotification
-                 object:self];
 }
 
 - (id)delegate
@@ -1038,8 +869,6 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
         var view = [[_CPImageAndTextView alloc] initWithFrame:_CGRectMakeZero()];
         //[view setImagePosition:CPNoImage];
         
-        [view setHitTests:NO];
-        
         return view;
     }
     
@@ -1095,7 +924,13 @@ var secureStringForString = function(aString)
     if (!aString)
         return "";
 
-    return Array(aString.length+1).join(CPSecureTextFieldCharacter);
+    var secureString = "",
+        length = aString.length;
+
+    while (length--)
+        secureString += CPSecureTextFieldCharacter;
+
+    return secureString;
 }
 
 

AppKit/CPTheme.j

@@ -22,7 +22,7 @@
 
 @import <Foundation/CPObject.j>
 @import <Foundation/CPString.j>
-@import <Foundation/CPKeyedUnarchiver.j>
+
 
 var CPThemesByName      = { },
     CPThemeDefaultTheme = nil;
@@ -531,7 +531,7 @@ function CPThemeAttributeEncode(aCoder, aThemeAttribute)
 
 function CPThemeAttributeDecode(aCoder, anAttributeName, aDefaultValue, aTheme, aClass)
 {
-    var key = "$a" + anAttributeName;
+    var key =  "$a" + anAttributeName;
 
     if (![aCoder containsValueForKey:key])
         var attribute = [[_CPThemeAttribute alloc] initWithName:anAttributeName defaultValue:aDefaultValue];
@@ -555,34 +555,3 @@ function CPThemeAttributeDecode(aCoder, anAttributeName, aDefaultValue, aTheme,
 
     return attribute;
 }
-
-/* TO AUTO CREATE THESE:
-function bit_count(bits)
-    {
-        var count = 0;
-
-        while (bits)
-        {
-            ++count;
-            bits &= (bits - 1);
-        }
-
-        return count ;
-    }
-
-zeros = "000000000";
-
-function pad(string, digits)
-{
-    return zeros.substr(0, digits - string.length) + string;
-}
-
-var str = ""
-str += '[';
-for (i = 0;i < Math.pow(2,6);++i)
-{
-    str += bit_count(i) + " /*" + pad(i.toString(2),6) + "*" + "/, ";
-}
-print(str+']');
-
-*/

AppKit/CPThemeBlend.j

@@ -43,7 +43,7 @@
     
     if (self)
     {
-        _bundle = [[CPBundle alloc] initWithPath:aURL];
+        _bundle = [[CPBundle alloc] initWithPath:aURL + "/Info.plist"];
     }
     
     return self;
@@ -58,21 +58,27 @@
 
 - (void)bundleDidFinishLoading:(CPBundle)aBundle
 {
-    var themes = [_bundle objectForInfoDictionaryKey:@"CPKeyedThemes"],
-        count = themes.length;
-
+    var paths = [_bundle objectForInfoDictionaryKey:@"CPBundleReplacedFiles"],
+        index = 0,
+        count = paths.length,
+        bundlePath = [_bundle bundlePath];
+    
     while (count--)
     {
-        var path = [aBundle pathForResource:themes[count]],
-            unarchiver = [[_CPThemeKeyedUnarchiver alloc]
-                            initForReadingWithData:[[CPURL URLWithString:path] staticResourceData]
-                            bundle:_bundle];
+        var path = paths[count];
+        
+        if ([path pathExtension] === "keyedtheme")
+        {
+            var unarchiver = [[_CPThemeKeyedUnarchiver alloc]
+                initForReadingWithData:[CPData dataWithString:objj_files[bundlePath + '/' + path].contents]
+                                bundle:_bundle];
 
-        [unarchiver decodeObjectForKey:@"root"];
+            [unarchiver decodeObjectForKey:@"root"];
 
-        [unarchiver finishDecoding];
+            [unarchiver finishDecoding];
+        }
     }
-
+    
     [_loadDelegate blendDidFinishLoading:self];
 }
 

AppKit/CPToolbarItem.j

@@ -26,18 +26,35 @@
 @import <AppKit/CPImage.j>
 @import <AppKit/CPView.j>
 
+
+/*
+    @global
+    @class CPToolbarItem
+*/
 CPToolbarItemVisibilityPriorityStandard = 0;
+/*
+    @global
+    @class CPToolbarItem
+*/
 CPToolbarItemVisibilityPriorityLow      = -1000;
+/*
+    @global
+    @class CPToolbarItem
+*/
 CPToolbarItemVisibilityPriorityHigh     = 1000;
+/*
+    @global
+    @class CPToolbarItem
+*/
 CPToolbarItemVisibilityPriorityUser     = 2000;
 
-CPToolbarSeparatorItemIdentifier        = @"CPToolbarSeparatorItem";
-CPToolbarSpaceItemIdentifier            = @"CPToolbarSpaceItem";
-CPToolbarFlexibleSpaceItemIdentifier    = @"CPToolbarFlexibleSpaceItem";
-CPToolbarShowColorsItemIdentifier       = @"CPToolbarShowColorsItem";
-CPToolbarShowFontsItemIdentifier        = @"CPToolbarShowFontsItem";
-CPToolbarCustomizeToolbarItemIdentifier = @"CPToolbarCustomizeToolbarItem";
-CPToolbarPrintItemIdentifier            = @"CPToolbarPrintItem";
+CPToolbarSeparatorItemIdentifier        = @"CPToolbarSeparatorItemIdentifier";
+CPToolbarSpaceItemIdentifier            = @"CPToolbarSpaceItemIdentifier";
+CPToolbarFlexibleSpaceItemIdentifier    = @"CPToolbarFlexibleSpaceItemIdentifier";
+CPToolbarShowColorsItemIdentifier       = @"CPToolbarShowColorsItemIdentifier";
+CPToolbarShowFontsItemIdentifier        = @"CPToolbarShowFontsItemIdentifier";
+CPToolbarCustomizeToolbarItemIdentifier = @"CPToolbarCustomizeToolbarItemIdentifier";
+CPToolbarPrintItemIdentifier            = @"CPToolbarPrintItemIdentifier";
 
 /*! 
     @ingroup appkit
@@ -67,13 +84,6 @@ CPToolbarPrintItemIdentifier            = @"CPToolbarPrintItem";
     CGSize      _maxSize;    
     
     int         _visibilityPriority;
-
-    BOOL        _autovalidates;
-}
-
-- (id)init
-{
-    return [self initWithItemIdentifier:@""];
 }
 
 // Creating a Toolbar Item
@@ -97,7 +107,6 @@ CPToolbarPrintItemIdentifier            = @"CPToolbarPrintItem";
         _maxSize = CGSizeMakeZero();
      
         _visibilityPriority = CPToolbarItemVisibilityPriorityStandard;
-        _autovalidates = YES;
     }
     
     return self;
@@ -120,12 +129,6 @@ CPToolbarPrintItemIdentifier            = @"CPToolbarPrintItem";
     return _toolbar;
 }
 
-/* @ignore */
-- (void)_setToolbar:(CPToolbar)aToolbar
-{
-    _toolbar = aToolbar;
-}
-
 /*!
     Returns the item's label
 */
@@ -180,7 +183,7 @@ CPToolbarPrintItemIdentifier            = @"CPToolbarPrintItem";
 - (void)setToolTip:(CPString)aToolTip
 {
     if ([_view respondsToSelector:@selector(setToolTip:)])
-        [_view setToolTip:aToolTip];
+        [view setToolTip:aToolTip];
     
     _toolTip = aToolTip;
 }
@@ -220,7 +223,7 @@ CPToolbarPrintItemIdentifier            = @"CPToolbarPrintItem";
 }
 
 /*!
-    Sets the target of the action that is triggered when the user clicks this item. \c nil will cause 
+    Sets the target of the action that is triggered when the user clicks this item. <code>nil</code> will cause 
     the action to be passed on to the first responder.
     @param aTarget the new target
 */
@@ -258,7 +261,7 @@ CPToolbarPrintItemIdentifier            = @"CPToolbarPrintItem";
 }
 
 /*!
-    Returns \c YES if the item is enabled.
+    Returns <code>YES</code> if the item is enabled.
 */
 - (BOOL)isEnabled
 {
@@ -270,7 +273,7 @@ CPToolbarPrintItemIdentifier            = @"CPToolbarPrintItem";
 
 /*!
     Sets whether the item is enabled.
-    @param aFlag \c YES enables the item
+    @param aFlag <code>YES</code> enables the item
 */
 - (void)setEnabled:(BOOL)shouldBeEnabled
 {
@@ -305,8 +308,8 @@ CPToolbarPrintItemIdentifier            = @"CPToolbarPrintItem";
     if (!_image)
         return;
     
-    if (_minSize.width === 0 && _minSize.height === 0 && 
-        _maxSize.width === 0 && _maxSize.height === 0)
+    if (_minSize.width == 0 && _minSize.height == 0 && 
+        _maxSize.width == 0 && _maxSize.height == 0)
     {
         var imageSize = [_image size];
 
@@ -385,9 +388,6 @@ CPToolbarPrintItemIdentifier            = @"CPToolbarPrintItem";
 */
 - (void)setMinSize:(CGSize)aMinSize
 {
-    if(!aMinSize.height || !aMinSize.width)
-        return;
-
     _minSize = CGSizeMakeCopy(aMinSize);
     
     // Try to provide some sanity: Make maxSize >= minSize
@@ -408,9 +408,6 @@ CPToolbarPrintItemIdentifier            = @"CPToolbarPrintItem";
 */
 - (void)setMaxSize:(CGSize)aMaxSize
 {
-    if(!aMaxSize.height || !aMaxSize.width)
-        return;
-        
     _maxSize = CGSizeMakeCopy(aMaxSize);
     
     // Try to provide some sanity: Make minSize <= maxSize
@@ -447,128 +444,6 @@ CPToolbarItemVisibilityPriorityUser
     _visibilityPriority = aVisibilityPriority;
 }
 
-- (void)validate
-{
-    // View items do not do any target-action analysis.
-    if (_view)
-    {
-        if ([target respondsToSelector:@selector(validateToolbarItem:)])
-            [self setEnabled:[target validateToolbarItem:self]];
-
-        return;
-    }
-
-    var action = [self action];
-
-    if (!action)
-        return [self setEnabled:NO];
-
-    var target = [self target];
-
-    if (target && ![target respondsToSelector:action])
-        return [self setEnabled:NO];
-
-    target = [CPApp targetForAction:action to:target from:self];
-
-    if (!target)
-        return [self setEnabled:NO];
-
-    if ([target respondsToSelector:@selector(validateToolbarItem:)])
-        [self setEnabled:[target validateToolbarItem:self]];
-    else
-        [self setEnabled:YES];
-}
-
-- (BOOL)autovalidates
-{
-    return _autovalidates;
-}
-
-- (void)setAutovalidates:(BOOL)shouldAutovalidate
-{
-    _autovalidates = !!shouldAutovalidate;
-}
-
-@end
-
-var CPToolbarItemItemIdentifierKey      = @"CPToolbarItemItemIdentifierKey",
-    CPToolbarItemLabelKey               = @"CPToolbarItemLabelKey",
-    CPToolbarItemPaletteLabelKey        = @"CPToolbarItemPaletteLabelKey",
-    CPToolbarItemToolTipKey             = @"CPToolbarItemToolTipKey",
-    CPToolbarItemTagKey                 = @"CPToolbarItemTagKey",
-    CPToolbarItemTargetKey              = @"CPToolbarItemTargetKey",
-    CPToolbarItemActionKey              = @"CPToolbarItemActionKey",
-    CPToolbarItemEnabledKey             = @"CPToolbarItemEnabledKey",
-    CPToolbarItemImageKey               = @"CPToolbarItemImageKey",
-    CPToolbarItemAlternateImageKey      = @"CPToolbarItemAlternateImageKey",
-    CPToolbarItemViewKey                = @"CPToolbarItemViewKey",
-    CPToolbarItemMinSizeKey             = @"CPToolbarItemMinSizeKey",
-    CPToolbarItemMaxSizeKey             = @"CPToolbarItemMaxSizeKey",
-    CPToolbarItemVisibilityPriorityKey  = @"CPToolbarItemVisibilityPriorityKey",
-    CPToolbarItemAutovalidatesKey       = @"CPToolbarItemAutovalidatesKey";
-
-@implementation CPToolbarItem (CPCoding)
-
-- (id)initWithCoder:(CPCoder)aCoder
-{
-    self = [super init];
-
-    if (self)
-    {
-        _itemIdentifier = [aCoder decodeObjectForKey:CPToolbarItemItemIdentifierKey];
-
-        _minSize = [aCoder decodeSizeForKey:CPToolbarItemMinSizeKey];
-        _maxSize = [aCoder decodeSizeForKey:CPToolbarItemMaxSizeKey];
-
-        [self setLabel:[aCoder decodeObjectForKey:CPToolbarItemLabelKey]];
-        [self setPaletteLabel:[aCoder decodeObjectForKey:CPToolbarItemPaletteLabelKey]];
-        [self setToolTip:[aCoder decodeObjectForKey:CPToolbarItemToolTipKey]];
-
-        [self setTag:[aCoder decodeObjectForKey:CPToolbarItemTagKey]];
-        [self setTarget:[aCoder decodeObjectForKey:CPToolbarItemTargetKey]];
-        [self setAction:CPSelectorFromString([aCoder decodeObjectForKey:CPToolbarItemActionKey])];
-
-        [self setEnabled:[aCoder decodeBoolForKey:CPToolbarItemEnabledKey]];
-
-        [self setImage:[aCoder decodeObjectForKey:CPToolbarItemImageKey]];
-        [self setAlternateImage:[aCoder decodeObjectForKey:CPToolbarItemAlternateImageKey]];
-
-        [self setView:[aCoder decodeObjectForKey:CPToolbarItemViewKey]];
-
-        [self setVisibilityPriority:[aCoder decodeIntForKey:CPToolbarItemVisibilityPriorityKey]];
-        [self setAutovalidates:[aCoder decodeBoolForKey:CPToolbarItemAutovalidatesKey]];
-    }
-
-    return self;
-}
-
-- (void)encodeWithCoder:(CPCoder)aCoder
-{
-    [aCoder encodeObject:_itemIdentifier forKey:CPToolbarItemItemIdentifierKey];
-
-    [aCoder encodeObject:[self label] forKey:CPToolbarItemLabelKey];
-    [aCoder encodeObject:[self paletteLabel] forKey:CPToolbarItemPaletteLabelKey];
-
-    [aCoder encodeObject:[self toolTip] forKey:CPToolbarItemToolTipKey];
-
-    [aCoder encodeObject:[self tag] forKey:CPToolbarItemTagKey];
-    [aCoder encodeObject:[self target] forKey:CPToolbarItemTargetKey];
-    [aCoder encodeObject:[self action] forKey:CPToolbarItemActionKey];
-
-    [aCoder encodeObject:[self isEnabled] forKey:CPToolbarItemEnabledKey];
-
-    [aCoder encodeObject:[self image] forKey:CPToolbarItemImageKey];
-    [aCoder encodeObject:[self alternateImage] forKey:CPToolbarItemAlternateImageKey];
-
-    [aCoder encodeObject:[self view] forKey:CPToolbarItemViewKey];
-
-    [aCoder encodeSize:[self minSize] forKey:CPToolbarItemMinSizeKey];
-    [aCoder encodeSize:[self maxSize] forKey:CPToolbarItemMaxSizeKey];
-
-    [aCoder encodeObject:[self visibilityPriority] forKey:CPToolbarItemVisibilityPriorityKey];
-    [aCoder encodeBool:[self autovalidates] forKey:CPToolbarItemAutovalidatesKey];
-}
-
 @end
 
 @implementation CPToolbarItem (CPCopying)
@@ -576,12 +451,10 @@ var CPToolbarItemItemIdentifierKey      = @"CPToolbarItemItemIdentifierKey",
 - (id)copy
 {
     var copy = [[[self class] alloc] initWithItemIdentifier:_itemIdentifier];
-
+    
     if (_view)
         [copy setView:[CPKeyedUnarchiver unarchiveObjectWithData:[CPKeyedArchiver archivedDataWithRootObject:_view]]];
-
-    [copy _setToolbar:_toolbar];
-
+    
     [copy setLabel:_label];
     [copy setPaletteLabel:_paletteLabel];
     [copy setToolTip:[self toolTip]];
@@ -589,7 +462,7 @@ var CPToolbarItemItemIdentifierKey      = @"CPToolbarItemItemIdentifierKey",
     [copy setTag:[self tag]];
     [copy setTarget:[self target]];
     [copy setAction:[self action]];
-
+    
     [copy setEnabled:[self isEnabled]];
 
     [copy setImage:[self image]];
@@ -597,10 +470,9 @@ var CPToolbarItemItemIdentifierKey      = @"CPToolbarItemItemIdentifierKey",
 
     [copy setMinSize:_minSize];
     [copy setMaxSize:_maxSize];
-
-    [copy setVisibilityPriority:[self visibilityPriority]];
-    [copy setAutovalidates:[self autovalidates]];
-
+    
+    [copy setVisibilityPriority:_visibilityPriority];
+    
     return copy;
 }
 
@@ -608,17 +480,62 @@ var CPToolbarItemItemIdentifierKey      = @"CPToolbarItemItemIdentifierKey",
 
 // Standard toolbar identifiers
 
+var _CPToolbarSeparatorItemView = nil,
+    _CPToolbarSpaceItemView     = nil;
+
 @implementation CPToolbarItem (Standard)
 
++ (CPView)_separatorItemView
+{
+    if (!_CPToolbarSeparatorItemView)
+    {
+        _CPToolbarSeparatorItemView = [[CPView alloc] initWithFrame:CGRectMake(0.0, 0.0, 2.0, 32.0)];
+        
+        sizes = {};
+        sizes[@"CPToolbarItemSeparator"] = [CGSizeMake(2.0, 26.0), CGSizeMake(2.0, 1.0), CGSizeMake(2.0, 26.0)];
+        [_CPToolbarSeparatorItemView setBackgroundColor:_CPControlThreePartImagePattern(YES, sizes, @"CPToolbarItem", @"Separator")];
+    }
+
+    return _CPToolbarSeparatorItemView;
+}
+
++ (CPView)_spaceItemView
+{
+    if (!_CPToolbarSpaceItemView)
+        _CPToolbarSpaceItemView = [[CPView alloc] initWithFrame:CGRectMakeZero()];
+    
+    return _CPToolbarSpaceItemView;
+}
+
 /* @ignore */
 + (CPToolbarItem)_standardItemWithItemIdentifier:(CPString)anItemIdentifier
 {
+    var item = [[CPToolbarItem alloc] initWithItemIdentifier:anItemIdentifier];                                                        
+
     switch (anItemIdentifier)
     {
-        case CPToolbarSeparatorItemIdentifier:          return [_CPToolbarSeparatorItem new];
-        case CPToolbarSpaceItemIdentifier:              return [_CPToolbarSpaceItem new];
-        case CPToolbarFlexibleSpaceItemIdentifier:      return [_CPToolbarFlexibleSpaceItem new];
-        case CPToolbarShowColorsItemIdentifier:         return [_CPToolbarShowColorsItem new];
+        case CPToolbarSeparatorItemIdentifier:          [item setView:[self _separatorItemView]];
+                                                        
+                                                        [item setMinSize:CGSizeMake(2.0, 0.0)];
+                                                        [item setMaxSize:CGSizeMake(2.0, 100000.0)];
+                                                        
+                                                        return item;
+
+        case CPToolbarSpaceItemIdentifier:              [item setView:[self _spaceItemView]];
+                                                        
+                                                        [item setMinSize:CGSizeMake(32.0, 32.0)];
+                                                        [item setMaxSize:CGSizeMake(32.0, 32.0)];
+                                                        
+                                                        return item;
+                                                        
+        case CPToolbarFlexibleSpaceItemIdentifier:      [item setView:[self _spaceItemView]];
+        
+                                                        [item setMinSize:CGSizeMake(32.0, 32.0)];
+                                                        [item setMaxSize:CGSizeMake(10000.0, 32.0)];
+                                                        
+                                                        return item;
+                                                        
+        case CPToolbarShowColorsItemIdentifier:         return nil;
         case CPToolbarShowFontsItemIdentifier:          return nil;
         case CPToolbarCustomizeToolbarItemIdentifier:   return nil;
         case CPToolbarPrintItemIdentifier:              return nil;
@@ -628,9 +545,3 @@ var CPToolbarItemItemIdentifierKey      = @"CPToolbarItemItemIdentifierKey",
 }
 
 @end
-
-@import "_CPToolbarFlexibleSpaceItem.j"
-@import "_CPToolbarShowColorsItem.j"
-@import "_CPToolbarSeparatorItem.j"
-@import "_CPToolbarSpaceItem.j"
-

AppKit/CPTreeNode.j

@@ -1,119 +0,0 @@
-
-@import <Foundation/CPObject.j>
-
-
-@implementation CPTreeNode : CPObject
-{
-    id              _representedObject @accessors(readonly, property=representedObject);
-    
-    CPTreeNode      _parentNode @accessors(readonly, property=parentNode);
-    CPMutableArray  _childNodes;
-}
-
-+ (id)treeNodeWithRepresentedObject:(id)anObject
-{
-    return [[self alloc] initWithRepresentedObject:anObject];
-}
-
-- (id)initWithRepresentedObject:(id)anObject
-{
-    self = [super init];
-
-    if (self)
-    {
-        _representedObject = anObject;
-        _childNodes = [];
-    }
-
-    return self;
-}
-
-- (BOOL)isLeaf
-{
-    return [_childNodes count] <= 0;
-}
-
-- (CPArray)childNodes
-{
-    return [_childNodes copy];
-}
-
-- (CPMutableArray)mutableChildNodes
-{
-    return [self mutableArrayValueForKey:@"childNodes"];
-}
-
-- (void)insertObject:(id)aTreeNode inChildNodesAtIndex:(CPInteger)anIndex
-{
-    [[aTreeNode._parentNode mutableChildNodes] removeObjectIdenticalTo:aTreeNode];
-
-    aTreeNode._parentNode = self;
-
-    [_childNodes insertObject:aTreeNode atIndex:anIndex];
-}
-
-- (void)removeObjectFromChildNodesAtIndex:(CPInteger)anIndex
-{
-    [_childNodes objectAtIndex:anIndex]._parentNode = nil;
-
-    [_childNodes removeObjectAtIndex:anIndex];
-}
-
-- (void)replaceObjectFromChildNodesAtIndex:(CPInteger)anIndex withObject:(id)aTreeNode
-{
-    var oldTreeNode = [_childNodes objectAtIndex:anIndex];
-
-    oldTreeNode._parentNode = nil;
-    aTreeNode._parentNode = self;
-
-    [_childNodes replaceObjectAtIndex:anIndex withObject:aTreeNode];
-}
-
-- (id)objectInChildNodesAtIndex:(CPInteger)anIndex
-{
-    return _childNodes[anIndex];
-}
-
-- (void)sortWithSortDescriptors:(CPArray)sortDescriptors recursively:(BOOL)shouldSortRecursively
-{
-    [_childNodes sortUsingDescriptors:sortDescriptors];
-
-    if (!shouldSortRecursively)
-        return;
-
-    var count = [_childNodes count];
-
-    while (count--)
-        [_childNodes[count] sortWithSortDescriptors:sortDescriptors recursively:YES];
-}
-
-@end
-
-var CPTreeNodeRepresentedObjectKey  = @"CPTreeNodeRepresentedObjectKey",
-    CPTreeNodeParentNodeKey         = @"CPTreeNodeParentNodeKey",
-    CPTreeNodeChildNodesKey         = @"CPTreeNodeChildNodesKey";
-
-@implementation CPTreeNode (CPCoding)
-
-- (id)initWithCoder:(CPCoder)aCoder
-{
-    self = [super init];
-
-    if (self)
-    {
-        _representedObject = [aCoder decodeObjectForKey:CPTreeNodeRepresentedObjectKey];
-        _parentNode = [aCoder decodeObjectForKey:CPTreeNodeParentNodeKey];
-        _childNodes = [aCoder decodeObjectForKey:CPTreeNodeChildNodesKey];
-    }
-
-    return self;
-}
-
-- (void)encodeWithCoder:(CPCoder)aCoder
-{
-    [aCoder encodeObject:_representedObject forKey:CPTreeNodeRepresentedObjectKey];
-    [aCoder encodeConditionalObject:_parentNode forKey:CPTreeNodeParentNodeKey];
-    [aCoder encodeObject:_childNodes forKey:CPTreeNodeChildNodesKey];
-}
-
-@end

AppKit/CPViewAnimation.j

@@ -1,179 +0,0 @@
-/*
- * CPFlashView.j
- * AppKit
- *
- * Created by Klaas Pieter Annema on September 3, 2009.
- * Copyright 2009, Sofa BV
- *
- * 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 <AppKit/CPAnimation.j>
-
-CPViewAnimationTargetKey = @"CPViewAnimationTarget";
-CPViewAnimationStartFrameKey = @"CPViewAnimationStartFrame";
-CPViewAnimationEndFrameKey = @"CPViewAnimationEndFrame";
-CPViewAnimationEffectKey = @"CPViewAnimationEffect";
-
-CPViewAnimationFadeInEffect = @"CPViewAnimationFadeIn";
-CPViewAnimationFadeOutEffect = @"CPViewAnimationFadeOut";
-
-@implementation CPViewAnimation : CPAnimation
-{
-    CPArray _viewAnimations;
-}
-
-- (id)initWithViewAnimations:(CPArray)viewAnimations
-{
-    if (self = [super initWithDuration:0.5 animationCurve:CPAnimationLinear])
-    {
-        [self setViewAnimations:viewAnimations];
-    }
-
-    return self;
-}
-
-- (void)startAnimation
-{
-    var animationIndex = [_viewAnimations count];
-    while (animationIndex--)
-    {
-        var dictionary = [_viewAnimations objectAtIndex:animationIndex],
-            view = [self _targetView:dictionary],
-            startFrame = [self _startFrame:dictionary];
-
-        [view setFrame:startFrame];
-
-        var effect = [self _effect:dictionary];
-        if (effect === CPViewAnimationFadeInEffect)
-        {
-            [view setAlphaValue:0.0];
-            [view setHidden:NO];
-        }
-        else if (effect === CPViewAnimationFadeOutEffect)
-            [view setAlphaValue:1.0];
-    }
-
-    [super startAnimation];
-}
-
-- (void)setCurrentProgress:(NSAnimationProgress)progress
-{
-    [super setCurrentProgress:progress];
-
-    var animationIndex = [_viewAnimations count];
-    while (animationIndex--)
-    {
-        var dictionary = [_viewAnimations objectAtIndex:animationIndex],
-            view = [self _targetView:dictionary]
-            startFrame = [self _startFrame:dictionary]
-            endFrame = [self _endFrame:dictionary]
-            differenceFrame = CPRectMakeZero();
-
-        differenceFrame.origin.x = endFrame.origin.x - startFrame.origin.x;
-        differenceFrame.origin.y = endFrame.origin.y - startFrame.origin.y;
-        differenceFrame.size.width = endFrame.size.width - startFrame.size.width;
-        differenceFrame.size.height = endFrame.size.height - startFrame.size.height;
-
-        var intermediateFrame = CPRectMakeZero();
-        intermediateFrame.origin.x = startFrame.origin.x + differenceFrame.origin.x * progress;
-        intermediateFrame.origin.y = startFrame.origin.y + differenceFrame.origin.y * progress;
-        intermediateFrame.size.width = startFrame.size.width + differenceFrame.size.width * progress;
-        intermediateFrame.size.height = startFrame.size.height + differenceFrame.size.height * progress;
-
-        [view setFrame:intermediateFrame];
-
-        // Update the view's alpha value
-        var effect = [self _effect:dictionary];
-        if (effect === CPViewAnimationFadeInEffect)
-            [view setAlphaValue:1.0 * progress];
-        else if (effect === CPViewAnimationFadeOutEffect)
-            [view setAlphaValue:1.0 + ( 0.0 - 1.0 ) * progress];
-
-        if (progress === 1.0)
-            [view setHidden:CPRectIsNull(endFrame) || [view alphaValue] === 0.0];
-    }
-}
-
-- (void)stopAnimation
-{
-    var animationIndex = [_viewAnimations count];
-    while (animationIndex--)
-    {
-        var dictionary = [_viewAnimations objectAtIndex:animationIndex],
-            view = [self _targetView:dictionary],
-            endFrame = [self _endFrame:dictionary];
-
-        [view setFrame:endFrame];
-
-        var effect = [self _effect:dictionary];
-        if (effect === CPViewAnimationFadeInEffect)
-            [view setAlphaValue:1.0];
-        else if (effect === CPViewAnimationFadeOutEffect)
-            [view setAlphaValue:0.0];
-
-        [view setHidden:CPRectIsNull(endFrame) || [view alphaValue] === 0.0];
-    }
-
-    [super stopAnimation];
-}
-
-- (id)_targetView:(CPDictionary)dictionary
-{
-    var targetView = [dictionary valueForKey:CPViewAnimationTargetKey];
-    if (!targetView)
-        [CPException raise:CPInternalInconsistencyException reason:[CPString stringWithFormat:@"view animation: %@ does not have a target view", [dictionary description]]];
-
-    return targetView;
-}
-
-- (CPRect)_startFrame:(CPDictionary)dictionary
-{
-    var startFrame = [dictionary valueForKey:CPViewAnimationStartFrameKey];
-    if (!startFrame)
-        return [[self _targetView:dictionary] frame];
-
-    return startFrame;
-}
-
-- (CPRect)_endFrame:(CPDictionary)dictionary
-{
-    var endFrame = [dictionary valueForKey:CPViewAnimationEndFrameKey];
-    if (!endFrame)
-        return [[self _targetView:dictionary] frame];
-
-    return endFrame;
-}
-
-- (CPString)_effect:(CPDictionary)dictionary
-{
-    return [dictionary valueForKey:CPViewAnimationEffectKey];
-}
-
-- (CPArray)viewAnimations
-{
-    return _viewAnimations;
-}
-
-- (void)setViewAnimations:(CPArray)viewAnimations
-{
-    if (viewAnimations != _viewAnimations)
-    {
-        [self stopAnimation];
-        _viewAnimations = [viewAnimations copy];
-    }
-}
-
-@end

AppKit/CPViewController.j

@@ -1,243 +0,0 @@
-/*
- * CPViewController.j
- * AppKit
- *
- * Created by Nicholas Small and 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 <AppKit/CPResponder.j>
-
-var CPViewControllerCachedCibs;
-
-/*! @class CPViewController
-    The CPViewController class provides the fundamental view-management controller for Cappuccino applications.
-    The basic view controller class supports the presentation of an associated view in addition to basic support
-    for managing modal views and, in the future, animations. Subclasses such as CPNavigationController and
-    CPTabBarController provide additional behavior for managing complex hierarchies of view controllers and views.
-
-    You use each instance of CPViewController to manage a single view (and hierarchy). For a simple view controller,
-    this entails managing the view hierarchy responsible for presenting your application content.
-    A typical view hierarchy consists of a root viewŃa reference to which is available in the view property of this classŃ
-    and one or more subviews presenting the actual content. In the case of navigation and tab bar controllers, the view
-    controller manages not only the high-level view hierarchy (which provides the navigation controls) but also one
-    or more additional view controllers that handle the presentation of the application content.
-
-    Unlike UIViewController in Cocoa Touch, a CPViewController does not represent an entire screen of content. You
-    will add your root view to an existing view or window's content view. You can manage many view controllers
-    on screen at once. CPViewController is also the preferred way of working with Cibs.
-
-    Subclasses can override -loadView to create their custom view hierarchy, or specify a cib name to be loaded automatically.
-    It has methods that are called when a view appears or disappears.
-    This class is also a good place for delegate & datasource methods, and other controller stuff.
-*/
-@implementation CPViewController : CPResponder
-{
-    CPView          _view;
-
-    id              _representedObject @accessors(property=representedObject);
-    CPString        _title @accessors(property=title);
-
-    CPString        _cibName @accessors(property=cibName, readonly);
-    CPBundle        _cibBundle @accessors(property=cibBundle, readonly);
-    CPDictionary    _cibExternalNameTable @accessors(property=cibExternalNameTable, readonly);
-}
-
-+ (void)initialize
-{
-    if (self === CPViewController)
-        CPViewControllerCachedCibs = [CPDictionary dictionary];
-}
-
-/*!
-    Convenience initializer calls -initWithCibName:bundle: with nil for both parameters.
-*/
-- (id)init
-{
-    return [self initWithCibName:nil bundle:nil];
-}
-
-- (id)initWithCibName:(CPString)aCibNameOrNil bundle:(CPBundle)aCibBundleOrNil
-{
-    return [self initWithCibName:aCibNameOrNil bundle:aCibBundleOrNil externalNameTable:nil];
-}
-
-- (id)initWithCibName:(CPString)aCibNameOrNil bundle:(CPBundle)aCibBundleOrNil owner:(id)anOwner
-{
-    return [self initWithCibName:aCibNameOrNil bundle:aCibBundleOrNil externalNameTable:[CPDictionary dictionaryWithObject:anOwner forKey:CPCibOwner]];
-}
-
-/*!
-    The designated initializer. If you subclass CPViewController, you must call the super implementation of this method, even if you aren't using a Cib.
-    In the specified Cib, the File's Owner proxy should have its class set to your view controller subclass, with the view outlet connected to the main view.
-    If you pass in a nil Cib name, then you must either call -setView: before -view is invoked, or override -loadView to set up your views.
-
-    @param cibNameOrNil The path to the cib to load for the root view or nil to programmatically create views.
-    @param cibBundleOrNil The bundle that the cib is located in or nil for the main bundle.
-*/
-- (id)initWithCibName:(CPString)aCibNameOrNil bundle:(CPBundle)aCibBundleOrNil externalNameTable:(CPDictionary)anExternalNameTable
-{
-    self = [super init];
-
-    if (self)
-    {
-        // Don't load the cib until someone actually requests the view. The user may just be intending to use setView:.
-        _cibName = aCibNameOrNil;
-        _cibBundle = aCibBundleOrNil || [CPBundle mainBundle];
-        _cibExternalNameTable = anExternalNameTable || [CPDictionary dictionaryWithObject:self forKey:CPCibOwner];
-    }
-
-    return self;
-}
-
-/*!
-    Programmatically creates the view that the controller manages.
-    You should never call this method directly. The view controller calls this method when the view property is requested but is nil.
-
-    If you create your views manually, you must override this method and use it to create your view and assign it to the view property.
-    The default implementation for programmatic views is to create a plain view. You can invoke super to utilize this view.
-
-    If you use Interface Builder to create your views and initialize the view controllerŃthat is, you initialize the view using the
-    initWithCibName:bundle: methodŃthen you must not override this method. The consequences risk shattering the space-time continuum.
-
-    Note: The cib loading system is currently asynchronous.
-*/
-- (void)loadView
-{
-    if (_view)
-        return;
-    
-    // check if a cib is already cached for the current _cibName
-    var cib = [CPViewControllerCachedCibs objectForKey:_cibName];
-
-    if (!cib)
-    {
-        // if the cib isn't cached yet : fetch it and cache it
-        cib = [[CPCib alloc] initWithContentsOfURL:[_cibBundle pathForResource:_cibName + @".cib"]];
-        [CPViewControllerCachedCibs setObject:cib forKey:_cibName];
-    }
-
-    [cib instantiateCibWithExternalNameTable:_cibExternalNameTable];
-}
-
-/*!
-    Returns the view that the controller manages.
-    If this property is nil, the controller sends loadView to itself to create the view that it manages.
-    Subclasses should override the loadView method to create any custom views. The default value is nil.
-*/
-- (CPView)view
-{
-    if (!_view)
-    {
-        var cibOwner = [_cibExternalNameTable objectForKey:CPCibOwner];
-
-        if ([cibOwner respondsToSelector:@selector(viewControllerWillLoadCib:)])
-            [cibOwner viewControllerWillLoadCib:self];
-
-        [self loadView];
-
-        if (_view === nil && [cibOwner isKindOfClass:[CPDocument class]])
-            [self setView:[cibOwner valueForKey:@"view"]];
-
-        if (!_view) 
-        {
-            var reason = [CPString stringWithFormat:@"View for %@ could not be loaded from Cib or no view specified. Override loadView to load the view manually.", self];
-
-            [CPException raise:CPInternalInconsistencyException reason:reason];
-        }
-
-        if ([cibOwner respondsToSelector:@selector(viewControllerDidLoadCib:)])
-            [cibOwner viewControllerDidLoadCib:self];
-
-        [self viewDidLoad];
-    }
-
-    return _view;
-}
-
-
-/*!
-    This method is called after the view controller has loaded its associated views into memory. 
-    This method is called regardless of whether the views were stored in a nib file or created programmatically in the loadView method. 
-    This method is most commonly used to perform additional initialization steps on views that are loaded from nib files.
-*/
-- (void)viewDidLoad
-{
-    
-}
-
-
-/*!
-    Manually sets the view that the controller manages.
-    Setting to nil will cause -loadView to be called on all subsequent calls of -view.
-
-    @param aView The view this controller should represent.
-*/
-- (void)setView:(CPView)aView
-{
-    _view = aView;
-}
-
-@end
-
-
-var CPViewControllerViewKey     = @"CPViewControllerViewKey",
-    CPViewControllerTitleKey    = @"CPViewControllerTitleKey",
-    CPViewControllerCibNameKey  = @"CPViewControllerCibNameKey",
-    CPViewControllerBundleKey   = @"CPViewControllerBundleKey";
-
-@implementation CPViewController (CPCoding)
-
-/*!
-    Initializes the view controller by unarchiving data from a coder.
-    @param aCoder the coder from which the data will be unarchived
-    @return the initialized view controller
-*/
-- (id)initWithCoder:(CPCoder)aCoder
-{
-    self = [super initWithCoder:aCoder];
-
-    if (self)
-    {
-        _view = [aCoder decodeObjectForKey:CPViewControllerViewKey];
-        _title = [aCoder decodeObjectForKey:CPViewControllerTitleKey];
-        _cibName = [aCoder decodeObjectForKey:CPViewControllerCibNameKey];
-
-        var bundlePath = [aCoder decodeObjectForKey:CPViewControllerBundleKey];
-        _cibBundle = bundlePath ? [CPBundle bundleWithPath:bundlePath] : [CPBundle mainBundle];
-
-        _cibExternalNameTable = [CPDictionary dictionaryWithObject:self forKey:CPCibOwner];
-    }
-
-    return self;
-}
-
-/*!
-    Archives the view controller to the provided coder.
-    @param aCoder the coder to which the view controller should be archived
-*/
-- (void)encodeWithCoder:(CPCoder)aCoder
-{
-    [super encodeWithCoder:aCoder];
-
-    [aCoder encodeObject:_view forKey:CPViewControllerViewKey];
-    [aCoder encodeObject:_title forKey:CPViewControllerTitleKey];
-    [aCoder encodeObject:_cibName forKey:CPViewControllerCibNameKey];
-    [aCoder encodeObject:[_cibBundle bundlePath] forKey:CPViewControllerBundleKey];
-}
-
-@end

AppKit/CPWebView.j

@@ -150,10 +150,8 @@ CPWebViewScrollNative                           = 2;
 	
 	
     _frameView = [[CPView alloc] initWithFrame:[self bounds]];
-    [_frameView setAutoresizingMask:CPViewWidthSizable|CPViewHeightSizable];
 
     _scrollView = [[CPScrollView alloc] initWithFrame:[self bounds]];
-    [_scrollView setAutohidesScrollers:YES];
     [_scrollView setAutoresizingMask:CPViewWidthSizable|CPViewHeightSizable];
     [_scrollView setDocumentView:_frameView];
 	
@@ -168,6 +166,7 @@ CPWebViewScrollNative                           = 2;
 - (void)setFrameSize:(CPSize)aSize
 {   
     [super setFrameSize:aSize];
+    
     [self _resizeWebFrame];
 }
 
@@ -181,7 +180,7 @@ CPWebViewScrollNative                           = 2;
         }
         else
         {
-            [_frameView setFrameSize:[_scrollView contentSize]];
+            [_frameView setFrameSize:[_scrollView bounds].size];
             
             // try to get the document size so we can correctly set the frame
             var win = null;

AppKit/CPWindow/_CPBorderlessBridgeWindowView.j

@@ -38,11 +38,6 @@ var _CPToolbarViewBackgroundColor = nil;
     return _CPToolbarViewBackgroundColor;
 }
 
-- (void)setShowsResizeIndicator:(BOOL)shouldShowResizeIndicator
-{
-    // We don't ever want to show the resize indicator.
-}
-
 - (void)tile
 {
     [super tile];

AppKit/CPWindow/_CPDocModalWindowView.j

@@ -1,50 +0,0 @@
-
-@import "_CPWindowView.j"
-
-var _CPStandardWindowViewBodyBackgroundColor = nil;
-
-@implementation _CPDocModalWindowView : _CPWindowView
-{
-    CPView _bodyView;
-}
-
-+ (CPColor)bodyBackgroundColor
-{
-    if (!_CPStandardWindowViewBodyBackgroundColor)
-        _CPStandardWindowViewBodyBackgroundColor = [CPColor colorWithWhite:0.96 alpha:0.9];
-        
-    return _CPStandardWindowViewBodyBackgroundColor;    
-}
-
-- (id)initWithFrame:(CPRect)aFrame styleMask:(unsigned)aStyleMask
-{
-    self = [super initWithFrame:aFrame styleMask:aStyleMask];
-    
-    if (self)
-    {
-        var theClass = [self class],
-              bounds = [self bounds];
-        
-       _bodyView = [[CPView alloc] initWithFrame:CGRectMake(0.0, 0.0, CGRectGetWidth(bounds), CGRectGetHeight(bounds))];
-        
-        [_bodyView setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
-        [_bodyView setBackgroundColor:[theClass bodyBackgroundColor]];
-        [_bodyView setHitTests:NO];
-        
-        [self addSubview:_bodyView];
-     }
-
-    return self;    
-}
-
-- (CGRect)contentRectForFrameRect:(CGRect)aFrameRect
-{
-    return aFrameRect;
-}
-
-- (CGRect)frameRectForContentRect:(CGRect)aContentRect
-{
-    return aContentRect;
-}
-
-@end

AppKit/CPWindow/_CPHUDWindowView.j

@@ -48,7 +48,7 @@ var HUD_TITLEBAR_HEIGHT             = 26.0;
             [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPWindow/HUD/CPWindowHUDBackground2.png"] size:CPSizeMake(6.0, 78.0)],
             
             [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPWindow/HUD/CPWindowHUDBackground3.png"] size:CPSizeMake(6.0, 1.0)],
-            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPWindow/HUD/CPWindowHUDBackground4.png"] size:CPSizeMake(5.0, 5.0)],
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPWindow/HUD/CPWindowHUDBackground4.png"] size:CPSizeMake(1.0, 1.0)],
             [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPWindow/HUD/CPWindowHUDBackground5.png"] size:CPSizeMake(6.0, 1.0)],
             
             [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPWindow/HUD/CPWindowHUDBackground6.png"] size:CPSizeMake(6.0, 6.0)],

AppKit/CPWindow/_CPStandardWindowView.j

@@ -56,7 +56,7 @@ var _CPTexturedWindowHeadGradientColor  = nil,
 + (CPColor)solidColor
 {
     if (!_CPTexturedWindowHeadSolidColor)
-        _CPTexturedWindowHeadSolidColor = [CPColor colorWithCalibratedRed:195.0 / 255.0 green:195.0 / 255.0 blue:195.0 / 255.0 alpha:1.0];
+        _CPTexturedWindowHeadSolidColor = [CPColor colorWithCalibratedRed:182.0 / 255.0 green:182.0 / 255.0 blue:182.0 / 255.0 alpha:1.0];
     
     return _CPTexturedWindowHeadSolidColor;
 }
@@ -94,15 +94,11 @@ var _CPTexturedWindowHeadGradientColor  = nil,
 
 @end
 
-var _CPStandardWindowViewBodyBackgroundColor                = nil,
-    _CPStandardWindowViewDividerBackgroundColor             = nil,
-    _CPStandardWindowViewTitleBackgroundColor               = nil,
-    _CPStandardWindowViewCloseButtonImage                   = nil,
-    _CPStandardWindowViewCloseButtonHighlightedImage        = nil,
-    _CPStandardWindowViewCloseButtonUnsavedImage            = nil,
-    _CPStandardWindowViewCloseButtonUnsavedHighlightedImage = nil,
-    _CPStandardWindowViewMinimizeButtonImage                = nil,
-    _CPStandardWindowViewMinimizeButtonHighlightedImage     = nil;
+var _CPStandardWindowViewBodyBackgroundColor            = nil,
+    _CPStandardWindowViewDividerBackgroundColor         = nil,
+    _CPStandardWindowViewTitleBackgroundColor           = nil,
+    _CPStandardWindowViewCloseButtonImage               = nil,
+    _CPStandardWindowViewCloseButtonHighlightedImage    = nil;
 
 var STANDARD_GRADIENT_HEIGHT                    = 41.0;
     STANDARD_TITLEBAR_HEIGHT                    = 25.0;
@@ -116,9 +112,6 @@ var STANDARD_GRADIENT_HEIGHT                    = 41.0;
     
     CPTextField                 _titleField;
     CPButton                    _closeButton;
-    CPButton                    _minimizeButton;
-
-    BOOL                        _isDocumentEdited;
 }
 
 + (CPColor)bodyBackgroundColor
@@ -237,7 +230,7 @@ var STANDARD_GRADIENT_HEIGHT                    = 41.0;
         [_bodyView setHitTests:NO];
         
         [self addSubview:_bodyView];
-
+                
         [self setResizeIndicatorOffset:CGSizeMake(2.0, 2.0)];
         
         _titleField = [[CPTextField alloc] initWithFrame:CGRectMakeZero()];
@@ -263,44 +256,24 @@ var STANDARD_GRADIENT_HEIGHT                    = 41.0;
             if (!_CPStandardWindowViewCloseButtonImage)
             {
                 var bundle = [CPBundle bundleForClass:[CPWindow class]];
-
+            
                 _CPStandardWindowViewCloseButtonImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPWindow/Standard/CPWindowStandardCloseButton.png"] size:CGSizeMake(16.0, 16.0)];
                 _CPStandardWindowViewCloseButtonHighlightedImage  = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPWindow/Standard/CPWindowStandardCloseButtonHighlighted.png"] size:CGSizeMake(16.0, 16.0)];
-                _CPStandardWindowViewCloseButtonUnsavedImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPWindow/Standard/CPWindowStandardCloseButtonUnsaved.png"] size:CGSizeMake(16.0, 16.0)];
-                _CPStandardWindowViewCloseButtonUnsavedHighlightedImage  = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPWindow/Standard/CPWindowStandardCloseButtonUnsavedHighlighted.png"] size:CGSizeMake(16.0, 16.0)];
             }
-
+            
             _closeButton = [[CPButton alloc] initWithFrame:CGRectMake(8.0, 7.0, 16.0, 16.0)];
-
+            
             [_closeButton setBordered:NO];
-            [self _updateCloseButton];
-
+            
+            [_closeButton setImage:_CPStandardWindowViewCloseButtonImage];
+            [_closeButton setAlternateImage:_CPStandardWindowViewCloseButtonHighlightedImage];
+            
             [self addSubview:_closeButton];
         }
-
-        if (_styleMask & CPMiniaturizableWindowMask && ![CPPlatform isBrowser])
-        {
-            if (!_CPStandardWindowViewMinimizeButtonImage)
-            {
-                var bundle = [CPBundle bundleForClass:[CPWindow class]];
-
-                _CPStandardWindowViewMinimizeButtonImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPWindow/Standard/CPWindowStandardMinimizeButton.png"] size:CGSizeMake(16.0, 16.0)];
-                _CPStandardWindowViewMinimizeButtonHighlightedImage  = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPWindow/Standard/CPWindowStandardMinimizeButtonHighlighted.png"] size:CGSizeMake(16.0, 16.0)];
-            }
-
-            _minimizeButton = [[CPButton alloc] initWithFrame:CGRectMake(27.0, 7.0, 16.0, 16.0)];
-
-            [_minimizeButton setBordered:NO];
-
-            [_minimizeButton setImage:_CPStandardWindowViewMinimizeButtonImage];
-            [_minimizeButton setAlternateImage:_CPStandardWindowViewMinimizeButtonHighlightedImage];
-
-            [self addSubview:_minimizeButton];
-        }
-
+        
         [self tile];
     }
-
+    
     return self;
 }
 
@@ -308,9 +281,6 @@ var STANDARD_GRADIENT_HEIGHT                    = 41.0;
 {
     [_closeButton setTarget:[self window]];
     [_closeButton setAction:@selector(performClose:)];
-
-    [_minimizeButton setTarget:[self window]];
-    [_minimizeButton setAction:@selector(performMiniaturize:)];
 }
 
 - (CGSize)toolbarOffset
@@ -333,14 +303,7 @@ var STANDARD_GRADIENT_HEIGHT                    = 41.0;
 
     [_bodyView setFrame:CGRectMake(0.0, dividerMaxY, width, CGRectGetHeight(bounds) - dividerMaxY)];
 
-    var leftOffset = 8;
-
-    if (_closeButton)
-        leftOffset += 19.0;
-    if (_minimizeButton)
-        leftOffset += 19.0;
-
-    [_titleField setFrame:CGRectMake(leftOffset, 5.0, width - leftOffset*2.0, CGRectGetHeight([_titleField frame]))];
+    [_titleField setFrame:CGRectMake(10.0, 3.0, width - 20.0, CGRectGetHeight([_titleField frame]))];
 
     [[theWindow contentView] setFrameOrigin:CGPointMake(0.0, CGRectGetMaxY([_dividerView frame]))];
 }
@@ -371,27 +334,6 @@ var STANDARD_GRADIENT_HEIGHT                    = 41.0;
     }
 }
 */
-
-- (void)_updateCloseButton
-{
-    if (_isDocumentEdited)
-    {
-        [_closeButton setImage:_CPStandardWindowViewCloseButtonUnsavedImage];
-        [_closeButton setAlternateImage:_CPStandardWindowViewCloseButtonUnsavedHighlightedImage];
-    }
-    else
-    {
-        [_closeButton setImage:_CPStandardWindowViewCloseButtonImage];
-        [_closeButton setAlternateImage:_CPStandardWindowViewCloseButtonHighlightedImage];
-    }
-}
-
-- (void)setDocumentEdited:(BOOL)isEdited
-{
-    _isDocumentEdited = isEdited;
-    [self _updateCloseButton];
-}
-
 - (void)setTitle:(CPString)aTitle
 {
     [_titleField setStringValue:aTitle];

AppKit/CPWindow/_CPWindowView.j

@@ -37,7 +37,6 @@ var _CPWindowViewResizeIndicatorImage = nil;
     
     CPView      _toolbarView;
 //    BOOL        _isAnimatingToolbar;
-
     
     CGRect      _resizeFrame;
     CGPoint     _mouseDraggedPoint;
@@ -82,15 +81,13 @@ var _CPWindowViewResizeIndicatorImage = nil;
         _styleMask = aStyleMask;
         _resizeIndicatorOffset = CGSizeMake(0.0, 0.0);
         _toolbarOffset = CGSizeMake(0.0, 0.0);
+        
+        [self setShowsResizeIndicator:!(_styleMask & CPBorderlessBridgeWindowMask) && (_styleMask & CPResizableWindowMask)];
     }
     
     return self;
 }
 
-- (void)setDocumentEdited:(BOOL)isEdited
-{
-}
-
 - (void)setTitle:(CPString)aTitle
 {
 }
@@ -103,7 +100,7 @@ var _CPWindowViewResizeIndicatorImage = nil;
 - (void)mouseDown:(CPEvent)anEvent
 {
     var theWindow = [self window];
-
+    
     if ((_styleMask & CPResizableWindowMask) && _resizeIndicator)
     {
         // FIXME: This should be better
@@ -138,38 +135,22 @@ var _CPWindowViewResizeIndicatorImage = nil;
     }
     
     else if (type === CPLeftMouseDragged)
-    {	
-    	var newSize = CGSizeMake(CGRectGetWidth(_resizeFrame) + location.x - CGRectGetMinX(_resizeFrame), CGRectGetHeight(_resizeFrame) + location.y - CGRectGetMinY(_resizeFrame));
-        
-        if (theWindow._isSheet && theWindow._parentView && (theWindow._frame.size.width !== newSize.width))
-    	[theWindow._parentView _setAttachedSheetFrameOrigin];
-		
-		[theWindow setFrameSize:newSize];
-    }
+        [theWindow setFrameSize:CGSizeMake(CGRectGetWidth(_resizeFrame) + location.x - CGRectGetMinX(_resizeFrame), CGRectGetHeight(_resizeFrame) + location.y - CGRectGetMinY(_resizeFrame))];
     
     [CPApp setTarget:self selector:@selector(trackResizeWithEvent:) forNextEventMatchingMask:CPLeftMouseDraggedMask | CPLeftMouseUpMask untilDate:nil inMode:nil dequeue:YES];
 }
 
 - (CGPoint)_pointWithinScreenFrame:(CGPoint)aPoint
 {
-    // FIXME: this is WRONG, all of this is WRONG
-    if (![CPPlatform isBrowser])
-        return aPoint;
-
     var visibleFrame = _cachedScreenFrame;
 
     if (!visibleFrame)
-        visibleFrame = [[CPPlatformWindow primaryPlatformWindow] visibleFrame];
+        visibleFrame = [[CPDOMWindowBridge sharedDOMWindowBridge] visibleFrame];
 
-    var minPointY = 0;
-    
-    if([CPMenu menuBarVisible])
-        minPointY = [[CPApp mainMenu] menuBarHeight];
-    
     var restrictedPoint = CGPointMake(0, 0);
 
     restrictedPoint.x = MIN(MAX(aPoint.x, -_frame.size.width + 4.0), CGRectGetMaxX(visibleFrame) - 4.0);
-    restrictedPoint.y = MIN(MAX(aPoint.y, minPointY), CGRectGetMaxY(visibleFrame) - 8.0);
+    restrictedPoint.y = MIN(MAX(aPoint.y, 0.0), CGRectGetMaxY(visibleFrame) - 8.0);
 
     return restrictedPoint;
 }
@@ -177,24 +158,22 @@ var _CPWindowViewResizeIndicatorImage = nil;
 - (void)trackMoveWithEvent:(CPEvent)anEvent
 {
     var type = [anEvent type];
-
+        
     if (type === CPLeftMouseUp)
     {
         _cachedScreenFrame = nil;
         return;
     }
-
     else if (type === CPLeftMouseDown)
     {
-        _mouseDraggedPoint = [[self window] convertBaseToGlobal:[anEvent locationInWindow]];
-        _cachedScreenFrame = [[CPPlatformWindow primaryPlatformWindow] visibleFrame];
+        _mouseDraggedPoint = [[self window] convertBaseToBridge:[anEvent locationInWindow]];
+        _cachedScreenFrame = [[CPDOMWindowBridge sharedDOMWindowBridge] visibleFrame];
     }
-
     else if (type === CPLeftMouseDragged)
     {
         var theWindow = [self window],
             frame = [theWindow frame],
-            location = [theWindow convertBaseToGlobal:[anEvent locationInWindow]],
+            location = [theWindow convertBaseToBridge:[anEvent locationInWindow]],
             origin = [self _pointWithinScreenFrame:CGPointMake(_CGRectGetMinX(frame) + (location.x - _mouseDraggedPoint.x), 
                                                                _CGRectGetMinY(frame) + (location.y - _mouseDraggedPoint.y))];
 
@@ -217,18 +196,18 @@ var _CPWindowViewResizeIndicatorImage = nil;
         
         [_resizeIndicator setImage:_CPWindowViewResizeIndicatorImage];
         [_resizeIndicator setAutoresizingMask:CPViewMinXMargin | CPViewMinYMargin];
-
+        
         [self addSubview:_resizeIndicator];
     }
     else
     {
         [_resizeIndicator removeFromSuperview];
-
+        
         _resizeIndicator = nil;
     }
 }
 
-- (BOOL)showsResizeIndicator
+- (CPImage)showsResizeIndicator
 {
     return _resizeIndicator !== nil;
 }
@@ -326,8 +305,11 @@ var _CPWindowViewResizeIndicatorImage = nil;
         if (toolbarView)
         {
             [toolbarView removeFromSuperview];
-            [toolbarView FIXME_setIsHUD:_styleMask & CPHUDBackgroundWindowMask];
-
+            [toolbarView setLabelColor:[self toolbarLabelColor]];
+            
+            if ([self respondsToSelector:@selector(toolbarLabelShadowColor)])
+                [toolbarView setLabelShadowColor:[self toolbarLabelShadowColor]];
+               
             [self addSubview:toolbarView];
         }
         
@@ -340,7 +322,7 @@ var _CPWindowViewResizeIndicatorImage = nil;
     {
         var contentRect = [self convertRect:[[theWindow contentView] frame] toView:nil];
 
-        contentRect.origin = [theWindow convertBaseToGlobal:contentRect.origin];
+        contentRect.origin = [theWindow convertBaseToBridge:contentRect.origin];
 
         [self setAutoresizesSubviews:NO];
         [theWindow setFrame:[theWindow frameRectForContentRect:contentRect]];

AppKit/CPWindowController.j

@@ -41,24 +41,10 @@
 */
 @implementation CPWindowController : CPResponder
 {
-    CPWindow            _window;
-
-    CPArray             _documents;
-    CPDocument          _document;
-    BOOL                _shouldCloseDocument;
-    BOOL                _supportsMultipleDocuments;
-
-    id                  _cibOwner;
-    CPString            _windowCibName;
-    CPString            _windowCibPath;
-
-    CPViewController    _viewController;
-    CPView              _viewControllerContainerView;
-}
-
-- (id)init
-{
-    return [self initWithWindow:nil];
+    id          _owner;
+    CPWindow    _window;
+    CPDocument  _document;
+    CPString    _windowCibName;
 }
 
 /*!
@@ -69,17 +55,14 @@
 - (id)initWithWindow:(CPWindow)aWindow
 {
     self = [super init];
-
+    
     if (self)
     {
         [self setWindow:aWindow];
-        [self setShouldCloseDocument:NO];
-
+    
         [self setNextResponder:CPApp];
-
-        _documents = [];
     }
-
+    
     return self;
 }
 
@@ -101,27 +84,16 @@
 */
 - (id)initWithWindowCibName:(CPString)aWindowCibName owner:(id)anOwner
 {
-    self = [self initWithWindow:nil];
-
+    self = [super init];
+    
     if (self)
     {
-        _cibOwner = anOwner;
+        _owner = anOwner;
         _windowCibName = aWindowCibName;
+        
+        [self setNextResponder:CPApp];
     }
-
-    return self;
-}
-
-- (id)initWithWindowCibPath:(CPString)aWindowCibPath owner:(id)anOwner
-{
-    self = [self initWithWindow:nil];
-
-    if (self)
-    {
-        _cibOwner = anOwner;
-        _windowCibPath = aWindowCibPath;
-    }
-
+    
     return self;
 }
 
@@ -130,33 +102,34 @@
 */
 - (void)loadWindow
 {
-    if (_window)
-        return;
-
-    [[CPBundle bundleForClass:[_cibOwner class]] loadCibFile:[self windowCibPath] externalNameTable:[CPDictionary dictionaryWithObject:_cibOwner forKey:CPCibOwner]];
+    [self windowWillLoad];
+    //FIXME: ACTUALLY LOAD WINDOW!!!
+    [self setWindow:CPApp._keyWindow = [[CPWindow alloc] initWithContentRect:CPRectMakeZero() styleMask:CPBorderlessBridgeWindowMask|CPTitledWindowMask|CPClosableWindowMask|CPResizableWindowMask]];
+    
+    [self windowDidLoad];
 }
 
 /*!
     Shows the window.
     @param aSender the object requesting the show
 */
-- (@action)showWindow:(id)aSender
+- (CFAction)showWindow:(id)aSender
 {
     var theWindow = [self window];
 
-    if ([theWindow respondsToSelector:@selector(becomesKeyOnlyIfNeeded)] && [theWindow becomesKeyOnlyIfNeeded])
+	if ([theWindow respondsToSelector:@selector(becomesKeyOnlyIfNeeded)] && [theWindow becomesKeyOnlyIfNeeded])
         [theWindow orderFront:aSender];
     else
         [theWindow makeKeyAndOrderFront:aSender];
 }
 
 /*!
-    Returns \c YES if the window has been loaded. Specifically,
+    Returns <code>YES</code> if the window has been loaded. Specifically,
     if loadWindow has been called.
 */
 - (BOOL)isWindowLoaded
 {
-    return _window !== nil;
+    return _window;
 }
 
 /*!
@@ -165,28 +138,7 @@
 - (CPWindow)window
 {
     if (!_window)
-    {
-        [self windowWillLoad];
-        [_document windowControllerWillLoadCib:self];
-
-        [self loadWindow];
-
-        if (_window === nil && [_cibOwner isKindOfClass:[CPDocument class]])
-            [self setWindow:[_cibOwner valueForKey:@"window"]];
-        
-        if (!_window) 
-        {
-            var reason = [CPString stringWithFormat:@"Window for %@ could not be loaded from Cib or no window specified. \
-                                                        Override loadWindow to load the window manually.", self];
-
-            [CPException raise:CPInternalInconsistencyException reason:reason];
-        }
-
-        [self windowDidLoad];
-        [_document windowControllerDidLoadCib:self];
-
-        [self synchronizeWindowTitleWithDocumentName];
-    }
+         [self loadWindow];
 
     return _window;
 }
@@ -197,10 +149,8 @@
 */
 - (void)setWindow:(CPWindow)aWindow
 {
-    [_window setWindowController:nil];
-
     _window = aWindow;
-
+    
     [_window setWindowController:self];
     [_window setNextResponder:self];
 }
@@ -210,6 +160,9 @@
 */
 - (void)windowDidLoad
 {
+    [_document windowControllerDidLoadNib:self];
+    
+    [self synchronizeWindowTitleWithDocumentName];
 }
 
 /*!
@@ -217,6 +170,7 @@
 */
 - (void)windowWillLoad
 {
+    [_document windowControllerWillLoadNib:self];
 }
 
 /*!
@@ -225,20 +179,17 @@
 */
 - (void)setDocument:(CPDocument)aDocument
 {
-    if (_document === aDocument)
+    if (_document == aDocument)
         return;
-
+    
     var defaultCenter = [CPNotificationCenter defaultCenter];
-
+    
     if (_document)
     {
-        if (![self supportsMultipleDocuments])
-            [self removeDocument:_document];
-        
         [defaultCenter removeObserver:self
                                  name:CPDocumentWillSaveNotification
                                object:_document];
-
+                               
         [defaultCenter removeObserver:self
                                  name:CPDocumentDidSaveNotification
                                object:_document];
@@ -247,18 +198,16 @@
                                  name:CPDocumentDidFailToSaveNotification
                                object:_document];
     }
-
+    
     _document = aDocument;
-
+    
     if (_document)
     {
-        [self addDocument:_document];
-
         [defaultCenter addObserver:self
                           selector:@selector(_documentWillSave:)
                               name:CPDocumentWillSaveNotification
                             object:_document];
-
+                            
         [defaultCenter addObserver:self
                           selector:@selector(_documentDidSave:)
                               name:CPDocumentDidSaveNotification
@@ -268,94 +217,13 @@
                           selector:@selector(_documentDidFailToSave:)
                               name:CPDocumentDidFailToSaveNotification
                             object:_document];
-
+                            
         [self setDocumentEdited:[_document isDocumentEdited]];
-    }
-
-    var viewController = [_document viewControllerForWindowController:self];
-
-    if (viewController)
-        [self setViewController:viewController];
-
+    }    
+    
     [self synchronizeWindowTitleWithDocumentName];
 }
 
-- (void)setSupportsMultipleDocuments:(BOOL)shouldSupportMultipleDocuments
-{
-    _supportsMultipleDocuments = shouldSupportMultipleDocuments;
-}
-
-- (BOOL)supportsMultipleDocuments
-{
-    return _supportsMultipleDocuments;
-}
-
-- (void)addDocument:(CPDocument)aDocument
-{
-    if (aDocument && ![_documents containsObject:aDocument])
-        [_documents addObject:aDocument];
-}
-
-- (void)removeDocument:(CPDocument)aDocument
-{
-    var index = [_documents indexOfObjectIdenticalTo:aDocument];
-
-    if (index === CPNotFound)
-        return;
-
-    [_documents removeObjectAtIndex:index];
-
-    if (_document === aDocument && [_documents count])
-        [self setDocument:[_documents objectAtIndex:MIN(index, [_documents count] - 1)]];
-}
-
-- (void)removeDocumentAndCloseIfNecessary:(CPDocument)aDocument
-{
-    [self removeDocument:aDocument];
-
-    if (![_documents count])
-        [self close];
-}
-
-- (CPArray)documents
-{
-    return _documents;
-}
-
-- (void)setViewControllerContainerView:(CPView)aView
-{
-    _viewControllerContainerView = aView;
-}
-
-- (void)viewControllerContainerView
-{
-    return _viewControllerContainerView;
-}
-
-- (void)setViewController:(CPViewController)aViewController
-{
-    var containerView = [self viewControllerContainerView] || [[self window] contentView],
-        view = [_viewController view],
-        frame = view ? [view frame] : [containerView bounds];
-
-    [view removeFromSuperview];
-
-    _viewController = aViewController;
-
-    view = [_viewController view];
-
-    if (view)
-    {
-        [view setFrame:frame];
-        [containerView addSubview:view];
-    }
-}
-
-- (CPViewController)viewController
-{
-    return _viewController;
-}
-
 /* @ignore */
 - (void)_documentWillSave:(CPNotification)aNotification
 {
@@ -384,49 +252,13 @@
 
 /*!
     Sets whether the document has unsaved changes. The window can use this as a hint to 
-    @param isEdited \c YES means the document has unsaved changes.
+    @param isEdited <code>YES</code> means the document has unsaved changes.
 */
 - (void)setDocumentEdited:(BOOL)isEdited
 {
     [[self window] setDocumentEdited:isEdited];
 }
 
-- (void)close
-{
-    [[self window] close];
-}
-
-- (void)setShouldCloseDocument:(BOOL)shouldCloseDocument
-{
-    _shouldCloseDocument = shouldCloseDocument;
-}
-
-- (BOOL)shouldCloseDocument
-{
-    return _shouldCloseDocument;
-}
-
-- (id)owner
-{
-    return _cibOwner;
-}
-
-- (CPString)windowCibName
-{
-    if (_windowCibName)
-        return _windowCibName;
-
-    return [[_windowCibPath lastPathComponent] stringByDeletingPathExtension];
-}
-
-- (CPString)windowCibPath
-{
-    if (_windowCibPath)
-        return _windowCibPath;
-
-    return [[CPBundle bundleForClass:[_cibOwner class]] pathForResource:_windowCibName + @".cib"];
-}
-
 // Setting and Getting Window Attributes
 
 /*!
@@ -436,7 +268,7 @@
 {
     if (!_document || !_window)
         return;
-
+    
     // [_window setRepresentedFilename:];
     [_window setTitle:[self windowTitleForDocumentDisplayName:[_document displayName]]];
 }

AppKit/Cib/CPCib.j

@@ -30,14 +30,12 @@
 @import "_CPCibCustomView.j"
 @import "_CPCibKeyedUnarchiver.j"
 @import "_CPCibObjectData.j"
-@import "_CPCibProxyObject.j"
 @import "_CPCibWindowTemplate.j"
 
 
 CPCibOwner              = @"CPCibOwner",
 CPCibTopLevelObjects    = @"CPCibTopLevelObjects",
-CPCibReplacementClasses = @"CPCibReplacementClasses",
-CPCibExternalObjects    = @"CPCibExternalObjects";
+CPCibReplacementClasses = @"CPCibReplacementClasses";
     
 var CPCibObjectDataKey  = @"CPCibObjectDataKey";
 
@@ -60,7 +58,7 @@ var CPCibObjectDataKey  = @"CPCibObjectDataKey";
 
     if (self)
     {
-        _data = [CPURLConnection sendSynchronousRequest:[CPURLRequest requestWithURL:aURL] returningResponse:nil];
+        _data = [CPURLConnection sendSynchronousRequest:[CPURLRequest requestWithURL:aURL] returningResponse:nil error:nil];
         _awakenCustomResources = YES;
     }
 
@@ -83,25 +81,11 @@ var CPCibObjectDataKey  = @"CPCibObjectDataKey";
     return self;
 }
 
-- (id)initWithCibNamed:(CPString)aName bundle:(CPBundle)aBundle
-{
-    if (![aName hasSuffix:@".cib"])
-        aName = [aName stringByAppendingString:@".cib"];
-    
-    // If aBundle is nil, use mainBundle, but ONLY for searching for the nib, not for resources later.
-    self = [self initWithContentsOfURL:[aBundle || [CPBundle mainBundle] pathForResource:aName]];
-
-    if (self)
-        _bundle = aBundle;
-
-    return self;
-}
-
 - (id)initWithCibNamed:(CPString)aName bundle:(CPBundle)aBundle loadDelegate:(id)aLoadDelegate
 {
     if (![aName hasSuffix:@".cib"])
         aName = [aName stringByAppendingString:@".cib"];
-
+    
     // If aBundle is nil, use mainBundle, but ONLY for searching for the nib, not for resources later.
     self = [self initWithContentsOfURL:[aBundle || [CPBundle mainBundle] pathForResource:aName] loadDelegate:aLoadDelegate];
 
@@ -141,8 +125,6 @@ var CPCibObjectDataKey  = @"CPCibObjectDataKey";
             [unarchiver setClass:[replacementClasses objectForKey:key] forClassName:key];
     }
 
-    [unarchiver setExternalObjectsForProxyIdentifiers:[anExternalNameTable objectForKey:CPCibExternalObjects]];
-
     var objectData = [unarchiver decodeObjectForKey:CPCibObjectDataKey];
 
     if (!objectData || ![objectData isKindOfClass:[_CPCibObjectData class]])
@@ -154,6 +136,14 @@ var CPCibObjectDataKey  = @"CPCibObjectDataKey";
     [objectData establishConnectionsWithOwner:owner topLevelObjects:topLevelObjects];
     [objectData awakeWithOwner:owner topLevelObjects:topLevelObjects];
 
+    var menu;
+
+    if ((menu = [objectData mainMenu]) != nil)
+    {
+         [CPApp setMainMenu:menu];
+         [CPMenu setMenuBarVisible:YES];
+    }
+
     // Display Visible Windows.
     [objectData displayVisibleWindows];
 
@@ -171,17 +161,12 @@ var CPCibObjectDataKey  = @"CPCibObjectDataKey";
 
 - (void)connection:(CPURLConnection)aConnection didReceiveData:(CPString)data
 {
-    // FIXME: Why aren't we getting connection:didFailWithError:
-    if (!data)
-        return [self connection:aConnection didFailWithError:nil];
-
-    _data = [CPData dataWithRawString:data];
+    _data = [CPData dataWithString:data];
 }
 
 - (void)connection:(CPURLConnection)aConnection didFailWithError:(CPError)anError
 {
-    if ([_loadDelegate respondsToSelector:@selector(cibDidFailToLoad:)])
-        [_loadDelegate cibDidFailToLoad:self];
+    alert("cib: connection failed.");
 
     _loadDelegate = nil;
 }

AppKit/Cib/CPCibConnector.j

@@ -1,88 +0,0 @@
-/*
- * CPCibConnector.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
- */
-
-@import <Foundation/CPObject.j>
-@import <Foundation/CPKeyValueCoding.j>
-
-
-var _CPCibConnectorSourceKey        = @"_CPCibConnectorSourceKey",
-    _CPCibConnectorDestinationKey   = @"_CPCibConnectorDestinationKey",
-    _CPCibConnectorLabelKey         = @"_CPCibConnectorLabelKey";
-
-@implementation CPCibConnector : CPObject
-{
-    id          _source @accessors(property=source);
-    id          _destination @accessors(property=destination);
-    CPString    _label @accessors(property=label);
-}
-
-- (void)replaceObject:(id)anObject withObject:(id)anotherObject
-{
-    if (_source === anObject)
-        _source = anotherObject;
-
-    if (_destination === anObject)
-        _destination = anotherObject;
-}
-
-- (void)replaceObjects:(Object)replacementObjects
-{
-    var replacement = replacementObjects[[_source UID]];
-
-    if (replacement !== undefined)
-        _source = replacement;
-
-    replacement = replacementObjects[[_destination UID]];
-
-    if (replacement !== undefined)
-        _destination = replacement;
-}
-
-@end
-
-@implementation CPCibConnector (CPCoding)
-
-- (id)initWithCoder:(CPCoder)aCoder
-{
-    self = [super init];
-    
-    if (self)
-    {
-        _source = [aCoder decodeObjectForKey:_CPCibConnectorSourceKey];
-        _destination = [aCoder decodeObjectForKey:_CPCibConnectorDestinationKey];
-        _label = [aCoder decodeObjectForKey:_CPCibConnectorLabelKey];
-    }
-    
-    return self;
-}
-
-- (void)encodeWithCoder:(CPCoder)aCoder
-{
-    [aCoder encodeObject:_source forKey:_CPCibConnectorSourceKey];
-    [aCoder encodeObject:_destination forKey:_CPCibConnectorDestinationKey];
-    [aCoder encodeObject:_label forKey:_CPCibConnectorLabelKey];
-}
-
-@end
-
-// For backwards compatibility.
-@implementation _CPCibConnector : CPCibConnector { } @end

AppKit/Cib/CPCibControlConnector.j

@@ -1,76 +0,0 @@
-/*
- * CPCibControlConnector.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
- */
-
-@import "CPCibConnector.j"
-
-
-@implementation CPCibControlConnector : CPCibConnector
-{
-}
-
-- (void)establishConnection
-{
-    var selectorName = _label,
-        selectorNameLength = [selectorName length];
-
-    if (selectorNameLength && selectorName.charAt(selectorNameLength - 1) !== ':')
-        selectorName += ':';
-
-    var selector = CPSelectorFromString(selectorName);
-
-    // Not having a selector is a fatal error.
-    if (!selector)
-        [CPException
-            raise:CPInvalidArgumentException
-           reason:@"-[" + [self className] + ' ' + _cmd + @"] selector "  + selectorName + @" does not exist."];
-
-    // If the destination doesn't respond to this selector, warn but don't die.
-    if (_destination && ![_destination respondsToSelector:selector])
-    {
-        CPLog.warn(@"Could not connect the action " + selector + @" to target of class " + [_destination className]);
-
-        return;
-    }
-
-    // Not being able to set the action is a fatal error.
-    if ([_source respondsToSelector:@selector(setAction:)])
-        objj_msgSend(_source, @selector(setAction:), selector);
-
-    else
-        [CPException
-            raise:CPInvalidArgumentException
-           reason:@"-[" + [self className] + ' ' + _cmd + @"] " + [_source description] + " does not respond to setAction:"];
-
-    // Not being able to set the target is a fatal error.
-    if ([_source respondsToSelector:@selector(setTarget:)])
-        objj_msgSend(_source, @selector(setTarget:), _destination);
-
-    else
-        [CPException
-            raise:CPInvalidArgumentException
-           reason:@"-[" + [self className] + ' ' + _cmd + @"] " + [_source description] + " does not respond to setTarget:"];
-}
-
-@end
-
-@implementation _CPCibControlConnector : CPCibControlConnector { } @end
-

AppKit/Cib/CPCibLoading.j

@@ -27,6 +27,8 @@
 
 var CPCibOwner = @"CPCibOwner";
 
+var LoadInfoForCib = {};
+
 @implementation CPObject (CPCibLoading)
 
 - (void)awakeFromCib
@@ -37,43 +39,16 @@ var CPCibOwner = @"CPCibOwner";
 
 @implementation CPBundle (CPCibLoading)
 
-+ (void)loadCibFile:(CPString)anAbsolutePath externalNameTable:(CPDictionary)aNameTable
-{
-    [[[CPCib alloc] initWithContentsOfURL:anAbsolutePath] instantiateCibWithExternalNameTable:aNameTable];
-}
-
-+ (void)loadCibNamed:(CPString)aName owner:(id)anOwner
-{
-    if (![aName hasSuffix:@".cib"])
-        aName = [aName stringByAppendingString:@".cib"];
-
-    // Path is based solely on anOwner:
-    var bundle = anOwner ? [CPBundle bundleForClass:[anOwner class]] : [CPBundle mainBundle],
-        path = [bundle pathForResource:aName];
-
-    [self loadCibFile:path externalNameTable:[CPDictionary dictionaryWithObject:anOwner forKey:CPCibOwner]];
-}
-
-- (void)loadCibFile:(CPString)aFileName externalNameTable:(CPDictionary)aNameTable
-{
-    [[[CPCib alloc] initWithContentsOfURL:aFileName] instantiateCibWithExternalNameTable:aNameTable];
-}
-
 + (void)loadCibFile:(CPString)anAbsolutePath externalNameTable:(CPDictionary)aNameTable loadDelegate:aDelegate
 {
-    [[CPCib alloc]
-    initWithContentsOfURL:anAbsolutePath
-             loadDelegate:[[_CPCibLoadDelegate alloc]
-                initWithLoadDelegate:aDelegate
-                   externalNameTable:aNameTable]];
+    var cib = [[CPCib alloc] initWithContentsOfURL:anAbsolutePath loadDelegate:self];
+
+    LoadInfoForCib[[cib hash]] = { loadDelegate:aDelegate, externalNameTable:aNameTable };
 }
 
 + (void)loadCibNamed:(CPString)aName owner:(id)anOwner loadDelegate:(id)aDelegate
 {
-    if (![aName hasSuffix:@".cib"])
-        aName = [aName stringByAppendingString:@".cib"];
-
-    // Path is based solely on anOwner:
+    // Path is based solely on anOwner:    
     var bundle = anOwner ? [CPBundle bundleForClass:[anOwner class]] : [CPBundle mainBundle],
         path = [bundle pathForResource:aName];
     
@@ -82,45 +57,20 @@ var CPCibOwner = @"CPCibOwner";
 
 - (void)loadCibFile:(CPString)aFileName externalNameTable:(CPDictionary)aNameTable loadDelegate:(id)aDelegate
 {
-    [[CPCib alloc]
-        initWithCibNamed:aFileName
-                  bundle:self
-            loadDelegate:[[_CPCibLoadDelegate alloc]
-                initWithLoadDelegate:aDelegate
-                   externalNameTable:aNameTable]];
-}
-
-@end
-
-@implementation _CPCibLoadDelegate : CPObject
-{
-    id              _loadDelegate;
-    CPDictionary    _externalNameTable;
-}
-
-- (id)initWithLoadDelegate:(id)aLoadDelegate externalNameTable:(id)anExternalNameTable
-{
-    self = [self init];
-
-    if (self)
-    {
-        _loadDelegate = aLoadDelegate;
-        _externalNameTable = anExternalNameTable;
-    }
-
-    return self;
-}
-
-- (void)cibDidFinishLoading:(CPCib)aCib
-{
-    [aCib instantiateCibWithExternalNameTable:_externalNameTable];
-
-    [_loadDelegate cibDidFinishLoading:aCib];
-}
-
-- (void)cibDidFailToLoad:(CPCib)aCib
-{
-    [_loadDelegate cibDidFailToLoad:aCib];
+    var cib = [[CPCib alloc] initWithCibNamed:aFileName bundle:self loadDelegate:[self class]];
+
+    LoadInfoForCib[[cib hash]] = { loadDelegate:aDelegate, externalNameTable:aNameTable };
+}
+
++ (void)cibDidFinishLoading:(CPCib)aCib
+{
+    var loadInfo = LoadInfoForCib[[aCib hash]];
+    
+    delete LoadInfoForCib[[aCib hash]];
+    
+    [aCib instantiateCibWithExternalNameTable:loadInfo.externalNameTable];
+    
+    [loadInfo.loadDelegate cibDidFinishLoading:aCib];
 }
 
 @end

AppKit/Cib/CPCibOutletConnector.j

@@ -1,48 +0,0 @@
-/*
- * CPCibOutletConnector.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
- */
-
-@import "CPCibConnector.j"
-
-
-@implementation CPCibOutletConnector : CPCibConnector
-{
-}
-
-- (void)establishConnection
-{
-    try
-    {
-        [_source setValue:_destination forKey:_label];
-    }
-    catch (anException)
-    {
-        if ([anException name] === CPUndefinedKeyException)
-            CPLog.warn(@"Could not connect the outlet " + _label + @" of target of class " + [_source className]);
-
-        else
-            throw anException;
-    }
-}
-
-@end
-
-@implementation _CPCibOutletConnector : CPCibOutletConnector { } @end

AppKit/Cib/_CPCibConnector.j

@@ -0,0 +1,103 @@
+
+@import <Foundation/CPObject.j>
+@import <Foundation/CPKeyValueCoding.j>
+
+
+var _CPCibConnectorSourceKey        = @"_CPCibConnectorSourceKey",
+    _CPCibConnectorDestinationKey   = @"_CPCibConnectorDestinationKey",
+    _CPCibConnectorLabelKey         = @"_CPCibConnectorLabelKey";
+
+@implementation _CPCibConnector : CPObject
+{
+    id          _source;
+    id          _destination;
+    CPString    _label;
+}
+
+- (void)replaceObjects:(JSObject)replacementObjects
+{
+    var replacement = replacementObjects[[_source hash]];
+
+    if (replacement !== undefined)
+        _source = replacement;
+
+    replacement = replacementObjects[[_destination hash]];
+
+    if (replacement !== undefined)
+        _destination = replacement;
+}
+
+@end
+
+@implementation _CPCibConnector (CPCoding)
+
+- (id)initWithCoder:(CPCoder)aCoder
+{
+    self = [super init];
+    
+    if (self)
+    {
+        _source = [aCoder decodeObjectForKey:_CPCibConnectorSourceKey];
+        _destination = [aCoder decodeObjectForKey:_CPCibConnectorDestinationKey];
+        _label = [aCoder decodeObjectForKey:_CPCibConnectorLabelKey];
+    }
+    
+    return self;
+}
+
+- (void)encodeWithCoder:(CPCoder)aCoder
+{
+    [aCoder encodeObject:_source forKey:_CPCibConnectorSourceKey];
+    [aCoder encodeObject:_destination forKey:_CPCibConnectorDestinationKey];
+    [aCoder encodeObject:_label forKey:_CPCibConnectorLabelKey];
+}
+
+@end
+
+@implementation _CPCibControlConnector : _CPCibConnector
+{
+}
+
+- (void)establishConnection
+{
+    var selectorName = _label;
+    
+    if (![selectorName hasSuffix:@":"])
+        selectorName += ':';
+
+    var selector = CPSelectorFromString(selectorName);
+
+    if (!selector)
+        [CPException
+            raise:CPInvalidArgumentException
+           reason:@"-[" + [self className] + ' ' + _cmd + @"] selector "  + selectorName + @" does not exist."];
+
+    if ([_source respondsToSelector:@selector(setAction:)])
+        objj_msgSend(_source, @selector(setAction:), selector);
+    
+    else
+        [CPException
+            raise:CPInvalidArgumentException
+           reason:@"-[" + [self className] + ' ' + _cmd + @"] " + [_source description] + " does not respond to setAction:"];
+
+    if ([_source respondsToSelector:@selector(setTarget:)])
+        objj_msgSend(_source, @selector(setTarget:), _destination);
+
+    else
+        [CPException
+            raise:CPInvalidArgumentException
+           reason:@"-[" + [self className] + ' ' + _cmd + @"] " + [_source description] + " does not respond to setTarget:"];
+}
+
+@end
+
+@implementation _CPCibOutletConnector : _CPCibConnector
+{
+}
+
+- (void)establishConnection
+{
+    [_source setValue:_destination forKey:_label];
+}
+
+@end

AppKit/Cib/_CPCibCustomObject.j

@@ -14,11 +14,6 @@ var _CPCibCustomObjectClassName = @"_CPCibCustomObjectClassName";
     return _className;
 }
 
-- (void)setCustomClassName:(CPString)aClassName
-{
-    _className = aClassName;
-}
-
 - (CPString)description
 {
     return [super description] + " (" + [self customClassName] + ')';
@@ -47,21 +42,10 @@ var _CPCibCustomObjectClassName = @"_CPCibCustomObjectClassName";
 {
     var theClass = CPClassFromString(_className);
 
-    // Hey this is us!
-    if (theClass === [self class])
-    {
-        _className = @"CPObject";
-
-        return self;
-    }
-
+#if DEBUG    
     if (!theClass)
-    {
-#if DEBUG
         CPLog("Unknown class \"" + _className + "\" in cib file");
 #endif
-        theClass = [CPObject class];
-    }
 
     if (theClass === [CPApplication class])
         return [CPApplication sharedApplication];

AppKit/Cib/_CPCibCustomResource.j

@@ -83,7 +83,7 @@ var _CPCibCustomResourceClassNameKey    = @"_CPCibCustomResourceClassNameKey",
     if ([aCoder respondsToSelector:@selector(bundle)] && 
         (![aCoder respondsToSelector:@selector(awakenCustomResources)] || [aCoder awakenCustomResources]))
         if (_className === @"CPImage")
-            return [[CPImage alloc] initWithContentsOfFile:[[aCoder bundle] pathForResource:_resourceName] size:_properties.valueForKey(@"size")];
+            return [[CPImage alloc] initWithContentsOfFile:[[aCoder bundle] pathForResource:_resourceName] size:[_properties objectForKey:@"size"]];
 
     return self;
 }

AppKit/Cib/_CPCibCustomView.j

@@ -35,17 +35,6 @@
     return _className;
 }
 
-- (void)setCustomClassName:(CPString)aClassName
-{
-    if (_className === aClassName)
-        return;
-
-    _className = aClassName;
-
-    [self setNeedsDisplay:YES];
-    [self setNeedsLayout];
-}
-
 @end
 
 var _CPCibCustomViewClassNameKey    = @"_CPCibCustomViewClassNameKey";
@@ -58,26 +47,33 @@ var _CPCibCustomViewClassNameKey    = @"_CPCibCustomViewClassNameKey";
 
     if (self)
         _className = [aCoder decodeObjectForKey:_CPCibCustomViewClassNameKey];
-
+    
     return self;
 }
 
 - (void)encodeWithCoder:(CPCoder)aCoder
 {
     [super encodeWithCoder:aCoder];
-
+    
     [aCoder encodeObject:_className forKey:_CPCibCustomViewClassNameKey];
 }
 
-- (CPString)customClassName
+- (void)drawRect:(CGRect)aRect
 {
-    return _className;
+    var bounds = [self bounds],
+        context = [[CPGraphicsContext currentContext] graphicsPort];
+
+    CGContextSetLineWidth(context, 1.0);
+    CGContextSetStrokeColor(context, [CPColor colorWithCalibratedRed:169.0 / 255.0 green:173.0 / 255.0 blue:178.0 / 255.0 alpha:1.0]);
+    CGContextStrokeRect(context, CGRectInset(CGRectIntegral(bounds), 0.5, 0.5));
+    CGContextSetFillColor(context, [CPColor colorWithCalibratedRed:224.0 / 255.0 green:236.0 / 255.0 blue:250.0 / 255.0 alpha:1.0]);
+    CGContextFillRect(context, CGRectInset(bounds, 2.0, 2.0));
 }
 
 - (id)_cibInstantiate
 {
     var theClass = CPClassFromString(_className);
-
+    
     // If we don't have this class, just use CPView.
     // FIXME: Should we instead throw an exception?
     if (!theClass)
@@ -87,7 +83,7 @@ var _CPCibCustomViewClassNameKey    = @"_CPCibCustomViewClassNameKey";
 #endif        
         theClass = [CPView class];
     }
-
+    
     // Hey this is us!
     if (theClass === [self class])
     {
@@ -103,7 +99,9 @@ var _CPCibCustomViewClassNameKey    = @"_CPCibCustomViewClassNameKey";
         [view setBounds:[self bounds]];
         
         // Since the object replacement logic hasn't had a chance to kick in yet, we need to do it manually:
-        var subviews = [self subviews],
+        
+        // we need to copy subviews since each time we add a subview to a different view its removed from the original subviews array
+        var subviews = [[self subviews] copy],
             index = 0,
             count = subviews.length;
         
@@ -112,7 +110,7 @@ var _CPCibCustomViewClassNameKey    = @"_CPCibCustomViewClassNameKey";
 
         [view setAutoresizingMask:[self autoresizingMask]];
         [view setAutoresizesSubviews:[self autoresizesSubviews]];
-
+    
         [view setHitTests:[self hitTests]];
         [view setHidden:[self isHidden]];
         [view setAlphaValue:[self alphaValue]];
@@ -121,7 +119,7 @@ var _CPCibCustomViewClassNameKey    = @"_CPCibCustomViewClassNameKey";
 
         [view setBackgroundColor:[self backgroundColor]];
     }
-
+    
     return view;
 }
 

AppKit/Cib/_CPCibKeyedUnarchiver.j

@@ -4,9 +4,8 @@
 
 @implementation _CPCibKeyedUnarchiver : CPKeyedUnarchiver
 {
-    CPBundle        _bundle;
-    BOOL            _awakenCustomResources;
-    CPDictionary    _externalObjectsForProxyIdentifiers;
+    CPBundle    _bundle;
+    BOOL        _awakenCustomResources;
 }
 
 - (id)initForReadingWithData:(CPData)data bundle:(CPBundle)aBundle awakenCustomResources:(BOOL)shouldAwakenCustomResources
@@ -34,16 +33,6 @@
     return _awakenCustomResources;
 }
 
-- (void)setExternalObjectsForProxyIdentifiers:(CPDictionary)externalObjectsForProxyIdentifiers
-{
-    _externalObjectsForProxyIdentifiers = externalObjectsForProxyIdentifiers;
-}
-
-- (id)externalObjectForProxyIdentifier:(CPString)anIdentifier
-{
-    return [_externalObjectsForProxyIdentifiers objectForKey:anIdentifier];
-}
-
 - (void)replaceObjectAtUID:(int)aUID withObject:(id)anObject
 {
     _objects[aUID] = anObject;

AppKit/Cib/_CPCibObjectData.j

@@ -25,9 +25,7 @@
 @import <Foundation/CPString.j>
 
 @import "CPCib.j"
-@import "CPCibConnector.j"
-@import "CPCibControlConnector.j"
-@import "CPCibOutletConnector.j"
+@import "_CPCibConnector.j"
 
 
 @implementation _CPCibObjectData : CPObject
@@ -100,13 +98,28 @@
     return self;
 }
 
+- (CPMenu)mainMenu
+{
+    var index = [_namesValues indexOfObjectIdenticalTo:"MainMenu"];
+
+    if (index === CPNotFound)
+    {
+        index = [_namesValues indexOfObjectIdenticalTo:"Main Menu"];
+
+        if (index === CPNotFound)
+            return nil;
+    }
+
+    return _namesKeys[index];
+}
+
 - (void)displayVisibleWindows
 {
     var object = nil,
         objectEnumerator = [_visibleWindows objectEnumerator];
 
     while (object = [objectEnumerator nextObject])
-        [_replacementObjects[[object UID]] makeKeyAndOrderFront:self];
+        [_replacementObjects[[object hash]] makeKeyAndOrderFront:self];
 }
 
 @end
@@ -229,7 +242,7 @@ var _CPCibObjectDataNamesKeysKey                = @"_CPCibObjectDataNamesKeysKey
 
             if (instantiatedObject !== object)
             {
-                _replacementObjects[[object UID]] = instantiatedObject;
+                _replacementObjects[[object hash]] = instantiatedObject;
 
                 if ([instantiatedObject isKindOfClass:[CPView class]])
                 {
@@ -253,7 +266,7 @@ var _CPCibObjectDataNamesKeysKey                = @"_CPCibObjectDataNamesKeysKey
 
 - (void)establishConnectionsWithOwner:(id)anOwner topLevelObjects:(CPMutableArray)topLevelObjects
 {
-    _replacementObjects[[_fileOwner UID]] = anOwner;
+    _replacementObjects[[_fileOwner hash]] = anOwner;
 
     var index = 0,
         count = _connections.length;
@@ -274,7 +287,7 @@ var _CPCibObjectDataNamesKeysKey                = @"_CPCibObjectDataNamesKeysKey
     while (count--)
     {
         var object = _objectsKeys[count],
-            instantiatedObject = _replacementObjects[[object UID]];
+            instantiatedObject = _replacementObjects[[object hash]];
 
         if (instantiatedObject)
             object = instantiatedObject;

AppKit/Cib/_CPCibProxyObject.j

@@ -1,33 +0,0 @@
-
-@import <Foundation/CPObject.j>
-
-
-@implementation _CPCibProxyObject : CPObject
-{
-    CPString _identifier;
-}
-@end
-
-var _CPCibProxyObjectIdentifierKey  = @"CPIdentifier";
-
-@implementation _CPCibProxyObject (CPCoding)
-
-- (id)initWithCoder:(CPCoder)aCoder
-{
-    self = [super init];
-
-    if (self)
-        _identifier = [aCoder decodeObjectForKey:_CPCibProxyObjectIdentifierKey];
-
-    if ([aCoder respondsToSelector:@selector(externalObjectForProxyIdentifier:)])
-        return [aCoder externalObjectForProxyIdentifier:_identifier];
-
-    return self;
-}
-
-- (void)encodeWithCoder:(CPCoder)aCoder
-{
-    [aCoder encodeObject:_identifier forKey:_CPCibProxyObjectIdentifierKey];
-}
-
-@end

AppKit/Cib/_CPCibWindowTemplate.j

@@ -2,19 +2,18 @@
 @import <Foundation/CPObject.j>
 
 
-var _CPCibWindowTemplateMinSizeKey                  = @"_CPCibWindowTemplateMinSizeKey",
-    _CPCibWindowTemplateMaxSizeKey                  = @"_CPCibWindowTemplateMaxSizeKey",
+var _CPCibWindowTemplateMinSizeKey              = @"_CPCibWindowTemplateMinSizeKey",
+    _CPCibWindowTemplateMaxSizeKey              = @"_CPCibWindowTemplateMaxSizeKey",
     
-    _CPCibWindowTemplateViewClassKey                = @"_CPCibWindowTemplateViewClassKey",
-    _CPCibWindowTemplateWindowClassKey              = @"_CPCibWindowTemplateWindowClassKey",
+    _CPCibWindowTemplateViewClassKey            = @"_CPCibWindowTemplateViewClassKey",
+    _CPCibWindowTemplateWindowClassKey          = @"_CPCibWindowTemplateWindowClassKey",
     
-    _CPCibWindowTemplateWindowRectKey               = @"_CPCibWindowTemplateWindowRectKey",
-    _CPCibWindowTemplateWindowStyleMaskKey          = @"_CPCibWindowTempatStyleMaskKey",
-    _CPCibWindowTemplateWindowTitleKey              = @"_CPCibWindowTemplateWindowTitleKey",
-    _CPCibWindowTemplateWindowViewKey               = @"_CPCibWindowTemplateWindowViewKey",
+    _CPCibWindowTemplateWindowRectKey           = @"_CPCibWindowTemplateWindowRectKey",
+    _CPCibWindowTemplateWindowStyleMaskKey      = @"_CPCibWindowTempatStyleMaskKey",
+    _CPCibWindowTemplateWindowTitleKey          = @"_CPCibWindowTemplateWindowTitleKey",
+    _CPCibWindowTemplateWindowViewKey           = @"_CPCibWindowTemplateWindowViewKey",
 
-    _CPCibWindowTemplateWindowAutorecalculatesKeyViewLoop = @"_CPCibWindowTemplateWindowAutorecalculatesKeyViewLoop";
-    _CPCibWindowTemplateWindowIsFullPlatformWindowKey     = @"_CPCibWindowTemplateWindowIsFullPlatformWindowKey";
+    _CPCibWindowTemplateWindowIsFullBridgeKey   = @"_CPCibWindowTemplateWindowIsFullBridgeKey";
 
 @implementation _CPCibWindowTemplate : CPObject
 {
@@ -31,27 +30,7 @@ var _CPCibWindowTemplateMinSizeKey                  = @"_CPCibWindowTemplateMinS
     CPString    _windowTitle;
     CPView      _windowView;
 
-    BOOL        _windowAutorecalculatesKeyViewLoop;
-    BOOL        _windowIsFullPlatformWindow;
-}
-
-- (id)init
-{
-    self = [super init];
-
-    if (self)
-    {
-        _windowClass = @"CPWindow";
-        _windowRect = CGRectMake(0.0, 0.0, 400.0, 200.0);
-        _windowStyleMask = CPTitledWindowMask | CPClosableWindowMask | CPMiniaturizableWindowMask | CPResizableWindowMask;
-
-        _windowTitle = @"Window";
-        _windowView = [[CPView alloc] initWithFrame:CGRectMake(0.0, 0.0, 400.0, 200.0)];
-
-        _windowIsFullPlatformWindow = NO;
-    }
-
-    return self;
+    BOOL        _windowIsFullBridge;
 }
 
 - (id)initWithCoder:(CPCoder)aCoder
@@ -74,8 +53,7 @@ var _CPCibWindowTemplateMinSizeKey                  = @"_CPCibWindowTemplateMinS
         _windowTitle = [aCoder decodeObjectForKey:_CPCibWindowTemplateWindowTitleKey];
         _windowView = [aCoder decodeObjectForKey:_CPCibWindowTemplateWindowViewKey];
 
-        _windowAutorecalculatesKeyViewLoop = !![aCoder decodeObjectForKey:_CPCibWindowTemplateWindowAutorecalculatesKeyViewLoop];
-        _windowIsFullPlatformWindow = !![aCoder decodeObjectForKey:_CPCibWindowTemplateWindowIsFullPlatformWindowKey];
+        _windowIsFullBridge = [aCoder decodeObjectForKey:_CPCibWindowTemplateWindowIsFullBridgeKey];
     }
     
     return self;
@@ -97,22 +75,7 @@ var _CPCibWindowTemplateMinSizeKey                  = @"_CPCibWindowTemplateMinS
     [aCoder encodeObject:_windowTitle forKey:_CPCibWindowTemplateWindowTitleKey];
     [aCoder encodeObject:_windowView forKey:_CPCibWindowTemplateWindowViewKey];
 
-    if (_windowAutorecalculatesKeyViewLoop)
-        [aCoder encodeObject:_windowAutorecalculatesKeyViewLoop forKey:_CPCibWindowTemplateWindowAutorecalculatesKeyViewLoop];
-
-    if (_windowIsFullPlatformWindow)
-        [aCoder encodeObject:_windowIsFullPlatformWindow forKey:_CPCibWindowTemplateWindowIsFullPlatformWindowKey];
-}
-
-- (CPString)customClassName
-{
-    return _windowClass;
-}
-
-
-- (void)setCustomClassName:(CPString)aClassName
-{
-    _windowClass = aClassName;
+    [aCoder encodeObject:_windowIsFullBridge forKey:_CPCibWindowTemplateWindowIsFullBridgeKey];
 }
 
 - (CPString)windowClass
@@ -134,8 +97,9 @@ var _CPCibWindowTemplateMinSizeKey                  = @"_CPCibWindowTemplateMinS
         [theWindow setMinSize:_minSize];
     if (_maxSize)
         [theWindow setMaxSize:_maxSize];
+    [theWindow setLevel:CPFloatingWindowLevel];
 
-    //[result setHidesOnDeactivate:(_wtFlags&0x80000000)?YES:NO];
+   //[result setHidesOnDeactivate:(_wtFlags&0x80000000)?YES:NO];
     [theWindow setTitle:_windowTitle];
 
     // FIXME: we can't autoresize yet...
@@ -150,8 +114,7 @@ var _CPCibWindowTemplateMinSizeKey                  = @"_CPCibWindowTemplateMinS
        [theWindow setToolbar:_viewClass];
     }
 
-    [theWindow setAutorecalculatesKeyViewLoop:_windowAutorecalculatesKeyViewLoop];
-    [theWindow setFullBridge:_windowIsFullPlatformWindow];
+    [theWindow setFullBridge:_windowIsFullBridge];
 
     return theWindow;
 }

AppKit/CoreAnimation/CAAnimation.j

@@ -54,8 +54,8 @@
 }
 
 /*!
-    Returns \c YES
-    @return \c YES
+    Returns <code>YES</code>
+    @return <code>YES</code>
 */
 - (void)shouldArchiveValueForKey:(CPString)aKey
 {
@@ -63,8 +63,8 @@
 }
 
 /*!
-    Returns \c nil
-    @return \c nil
+    Returns <code>nil</code>
+    @return <code>nil</code>
 */
 + (id)defaultValueForKey:(CPString)aKey
 {
@@ -73,7 +73,7 @@
 
 /*!
     Specifies whether this animation should be removed after it has completed.
-    @param \c YES means the animation should be removed
+    @param <code>YES</code> means the animation should be removed
 */
 - (void)setRemovedOnCompletion:(BOOL)isRemovedOnCompletion
 {
@@ -81,7 +81,7 @@
 }
 
 /*!
-    Returns \c YES if the animation is removed after completion
+    Returns <code>YES</code> if the animation is removed after completion
 */
 - (BOOL)removedOnCompletion
 {
@@ -89,7 +89,7 @@
 }
 
 /*!
-    Returns \c YES if the animation is removed after completion
+    Returns <code>YES</code> if the animation is removed after completion
 */
 - (BOOL)isRemovedOnCompletion
 {
@@ -97,7 +97,7 @@
 }
 
 /*!
-    Returns the animation's timing function. If \c nil, then it has a linear pacing.
+    Returns the animation's timing function. If <code>nil</code>, then it has a linear pacing.
 */
 - (CAMediaTimingFunction)timingFunction
 {

AppKit/CoreAnimation/CALayer.j

@@ -56,12 +56,12 @@ var CALayerRegisteredRunLoopUpdates             = nil;
 
     @delegate -(void)drawLayer:(CALayer)layer inContext:(CGContextRef)ctx;
     If the delegate implements this method, the CALayer will
-    call this in place of its \c -drawInContext:.
+    call this in place of its <code>drawInContext:</code>.
     @param layer the layer to draw for
     @param ctx the context to draw on
 
     @delegate  -(void)displayLayer:(CALayer)layer;
-    The delegate can override the layer's \c -display method
+    The delegate can override the layer's <code>display</code> method
     by implementing this method.
 */
 @implementation CALayer : CPObject
@@ -419,7 +419,7 @@ var CALayerRegisteredRunLoopUpdates             = nil;
 // Providing Layer Content
 /*!
     Returns the CGImage contents of this layer.
-    The default contents are \c nil.
+    The default contents are <code>nil</code>.
 */
 - (CGImage)contents
 {
@@ -547,7 +547,7 @@ var CALayerRegisteredRunLoopUpdates             = nil;
 // Style Attributes
 /*!
     Returns the opacity of the layer. The value is between
-    \c 0.0 (transparent) and \c 1.0 (opaque).
+    <code>0.0</code> (transparent) and <code>1.0</code> (opaque).
 */
 - (float)opacity
 {
@@ -556,7 +556,7 @@ var CALayerRegisteredRunLoopUpdates             = nil;
 
 /*!
     Sets the opacity for the layer.
-    @param anOpacity the new opacity (between \c 0.0 (transparent) and \c 1.0 (opaque)).
+    @param anOpacity the new opacity (between <code>0.0</code> (transparent) and <code>1.0</code> (opaque)).
 */
 - (void)setOpacity:(float)anOpacity
 {
@@ -571,7 +571,7 @@ var CALayerRegisteredRunLoopUpdates             = nil;
 
 /*!
     Sets whether the layer is hidden.
-    @param isHidden \c YES means the layer will be hidden. \c NO means the layer will be visible.
+    @param isHidden <code>YES</code> means the layer will be hidden. <code>NO</code> means the layer will be visible.
 */
 - (void)setHidden:(BOOL)isHidden
 {
@@ -580,7 +580,7 @@ var CALayerRegisteredRunLoopUpdates             = nil;
 }
 
 /*!
-    Returns \c YES if the layer is hidden.
+    Returns <code>YES</code> if the layer is hidden.
 */
 - (BOOL)hidden
 {
@@ -588,7 +588,7 @@ var CALayerRegisteredRunLoopUpdates             = nil;
 }
 
 /*!
-    Returns \c YES if the layer is hidden.
+    Returns <code>YES</code> if the layer is hidden.
 */
 - (BOOL)isHidden
 {
@@ -597,7 +597,7 @@ var CALayerRegisteredRunLoopUpdates             = nil;
 
 /*!
     Sets whether content that goes lies outside the bounds is hidden or visible.
-    @param masksToBounds \c YES hides the excess content. \c NO makes it visible.
+    @param masksToBounds <code>YES</code> hides the excess content. <code>NO</code> makes it visible.
 */
 - (void)setMasksToBounds:(BOOL)masksToBounds
 {
@@ -724,7 +724,7 @@ if (_DOMContentsElement && aLayer._zPosition > _DOMContentsElement.style.zIndex)
     Inserts a layer below another layer.
     @param aLayer the layer to insert
     @param aSublayer the layer to insert below
-    @throws CALayerNotFoundException if \c aSublayer is not in the array of sublayers
+    @throws CALayerNotFoundException if <code>aSublayer</code> is not in the array of sublayers
 */
 - (void)insertSublayer:(CALayer)aLayer below:(CALayer)aSublayer
 {
@@ -737,7 +737,7 @@ if (_DOMContentsElement && aLayer._zPosition > _DOMContentsElement.style.zIndex)
     Inserts a layer above another layer.
     @param aLayer the layer to insert
     @param aSublayer the layer to insert above
-    @throws CALayerNotFoundException if \c aSublayer is not in the array of sublayers
+    @throws CALayerNotFoundException if <code>aSublayer</code> is not in the array of sublayers
 */
 - (void)insertSublayer:(CALayer)aLayer above:(CALayer)aSublayer
 {
@@ -777,10 +777,11 @@ if (_DOMContentsElement && aLayer._zPosition > _DOMContentsElement.style.zIndex)
     @ignore
 */
 + (void)runLoopUpdateLayers
-{
-    for (UID in CALayerRegisteredRunLoopUpdates)
+{if (window.oops) {alert(window.latest); objj_debug_print_backtrace();}
+    window.loop = true;
+    for (hash in CALayerRegisteredRunLoopUpdates)
     {
-        var layer = CALayerRegisteredRunLoopUpdates[UID],
+        var layer = CALayerRegisteredRunLoopUpdates[hash],
             mask = layer._runLoopUpdateMask;
 
         if (mask & CALayerDOMUpdateMask)
@@ -812,7 +813,7 @@ if (_DOMContentsElement && aLayer._zPosition > _DOMContentsElement.style.zIndex)
     }
     
     _runLoopUpdateMask |= anUpdateMask;
-    CALayerRegisteredRunLoopUpdates[[self UID]] = self;
+    CALayerRegisteredRunLoopUpdates[[self hash]] = self;
 }
 
 /*
@@ -833,7 +834,7 @@ if (_DOMContentsElement && aLayer._zPosition > _DOMContentsElement.style.zIndex)
 
 /*!
     Sets whether the layer needs to be redrawn when its bounds are changed.
-    @param needsDisplayOnBoundsChange \c YES means the display is redraw on a bounds change.
+    @param needsDisplayOnBoundsChange <code>YES</code> means the display is redraw on a bounds change.
 */
 - (void)setNeedsDisplayOnBoundsChange:(BOOL)needsDisplayOnBoundsChange
 {
@@ -841,7 +842,7 @@ if (_DOMContentsElement && aLayer._zPosition > _DOMContentsElement.style.zIndex)
 }
 
 /*!
-    Returns \c YES if the display should be redrawn on a bounds change.
+    Returns <code>YES</code> if the display should be redrawn on a bounds change.
 */
 - (BOOL)needsDisplayOnBoundsChange
 {
@@ -905,7 +906,7 @@ if (_DOMContentsElement && aLayer._zPosition > _DOMContentsElement.style.zIndex)
 
 // Hit Testing
 /*!
-    Returns \c YES if the layer contains the point.
+    Returns <code>YES</code> if the layer contains the point.
     @param aPoint the point to test
 */
 - (BOOL)containsPoint:(CGPoint)aPoint
@@ -916,7 +917,7 @@ if (_DOMContentsElement && aLayer._zPosition > _DOMContentsElement.style.zIndex)
 /*!
     Returns the farthest descendant of this layer that contains the specified point.
     @param aPoint the point to test
-    @return the containing layer or \c nil if there was no hit.
+    @return the containing layer or <code>nil</code> if there was no hit.
 */
 - (CALayer)hitTest:(CGPoint)aPoint
 {

AppKit/CoreGraphics/CGColor.j

@@ -101,8 +101,8 @@ function CGColorCreateCopy(aColor)
 
 /*!
     Creates a gray color object.
-    @param gray the value to use for the color intensities (\c 0.\c 0-\c 1.\c 0).
-    @param alpha the gray's alpha value (\c 0.\c 0-\c 1.\c 0).
+    @param gray the value to use for the color intensities (<code>0.0-1.0</code>)
+    @param alpha the gray's alpha value (<code>0.0-1.0</code>)
     @return CGColor the new gray color object
     @group CGColor
 */
@@ -113,10 +113,10 @@ function CGColorCreateGenericGray(gray, alpha)
 
 /*!
     Creates an RGB color.
-    @param red the red component (\c 0.\c 0-\c 1.\c 0)..
-    @param green the green component (\c 0.\c 0-\c 1.\c 0).
-    @param blue the blue component (\c 0.\c 0-\c 1.\c 0).
-    @param alpha the alpha component (\c 0.\c 0-\c 1.\c 0).
+    @param red the red component (<code>0.0-1.0</code>)
+    @param green the green component (<code>0.0-1.0</code>)
+    @param blue the blue component (<code>0.0-1.0</code>)
+    @param alpha the alpha component (<code>0.0-1.0</code>)
     @return CGColor the RGB based color
     @group CGColor
 */
@@ -127,11 +127,11 @@ function CGColorCreateGenericRGB(red, green, blue, alpha)
 
 /*!
     Creates a CMYK color.
-    @param cyan the cyan component (\c 0.\c 0-\c 1.\c 0).
-    @param magenta the magenta component (\c 0.\c 0-\c 1.\c 0).
-    @param yellow the yellow component (\c 0.\c 0-\c 1.\c 0).
-    @param black the black component (\c 0.\c 0-\c 1.\c 0).
-    @param alpha the alpha component (\c 0.\c 0-\c 1.\c 0).
+    @param cyan the cyan component (<code>0.0-1.0</code>)
+    @param magenta the magenta component (<code>0.0-1.0</code>)
+    @param yellow the yellow component (<code>0.0-1.0</code>)
+    @param black the black component (<code>0.0-1.0</code>)
+    @param alpha the alpha component (<code>0.0-1.0</code>)
     @return CGColor the CMYK based color
     @group CGColor
 */
@@ -143,7 +143,7 @@ function CGColorCreateGenericCMYK(cyan, magenta, yellow, black, alpha)
 /*!
     Creates a copy of the color with a specified alpha.
     @param aColor the color object to copy
-    @param anAlpha the new alpha component for the copy (\c 0.\c 0-\c 1.\c 0).
+    @param anAlpha the new alpha component for the copy (<code>0.0-1.0</code>)
     @return CGColor the new copy
     @group CGColor
 */
@@ -184,8 +184,8 @@ function CGColorCreateWithPattern(aColorSpace, aPattern, components)
     Determines if two colors are the same.
     @param lhs the first CGColor
     @param rhs the second CGColor
-    @return \c YES if the two colors are equal.
-    \c NO otherwise.
+    @return <code>YES</code> if the two colors are equal.
+    <code>NO</code> otherwise.
 */
 function CGColorEqualToColor(lhs, rhs)
 {
@@ -218,7 +218,7 @@ function CGColorEqualToColor(lhs, rhs)
 /*!
     Returns the color's alpha component.
     @param aColor the color
-    @return float the alpha component (\c 0.\c 0-\c 1.\c 0).
+    @return float the alpha component (<code>0.0-1.0</code>)
     @group CGColor
 */
 function CGColorGetAlpha(aColor)