Rework CPWindow cluster so CPWindow's code is in its file

AppKit/CPButton.j

@@ -523,6 +523,7 @@ CPButtonImageOffset   = 3.0;
     _isTracking = YES;
 
     var startedTracking = [super startTrackingAt:aPoint];
+
     if (_highlightsBy & (CPPushInCellMask | CPChangeGrayCellMask))
     {
         if (_showsStateBy & (CPChangeGrayCellMask | CPChangeBackgroundCellMask))
@@ -537,6 +538,7 @@ CPButtonImageOffset   = 3.0;
         else
             [self highlight:NO];
     }
+
     return startedTracking;
 }
 

AppKit/CPColorPanel.j

@@ -23,6 +23,7 @@
 @import "CPButton.j"
 @import "CPCookie.j"
 @import "CPPanel.j"
+@import "CPPasteboard.j"
 @import "CPView.j"
 
 @class CPSlider

AppKit/CPDragServer.j

@@ -25,8 +25,9 @@
 @import "CPImageView.j"
 @import "CPPasteboard.j"
 @import "CPView.j"
-@import "CPWindow.j"
+@import "CPWindow_Constants.j"
 
+@class CPWindow  // This file is imported by CPWindow.j
 @class _CPDOMDataTransferPasteboard
 
 @global CPApp

AppKit/CPRuleEditor/CPRuleEditor.j

@@ -25,6 +25,7 @@
 @import <Foundation/CPDictionary.j>
 @import <Foundation/CPIndexSet.j>
 
+@import "CPPasteboard.j"
 @import "CPRuleEditor_Constants.j"
 @import "CPTextField.j"
 @import "CPViewAnimation.j"

AppKit/CPWindow/CPWindow_Constants.j

@@ -189,3 +189,8 @@ CPWindowPositionFlexibleRight   = 1 << 19;
 CPWindowPositionFlexibleLeft    = 1 << 20;
 CPWindowPositionFlexibleBottom  = 1 << 21;
 CPWindowPositionFlexibleTop     = 1 << 22;
+
+CPStandardWindowShadowStyle = 0;
+CPMenuWindowShadowStyle     = 1;
+CPPanelWindowShadowStyle    = 2;
+CPCustomWindowShadowStyle   = 3;

AppKit/CPWindow/_CPShadowWindowView.j

@@ -21,7 +21,6 @@
  */
 
 @import "_CPWindowView.j"
-@import "CPView.j"
 
 
 @implementation _CPShadowWindowView : CPView

AppKit/CPWindow/_CPStandardWindowView.j

@@ -20,9 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-@import "CPTextField.j"
-@import "_CPTitleableWindowView.j"
 @import "CPButton.j"
+@import "_CPTitleableWindowView.j"
 
 @class _CPDocModalWindowView
 

AppKit/CPWindow/_CPTitleableWindowView.j

@@ -20,14 +20,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+@import "CPTextField.j"
 @import "_CPWindowView.j"
 
-@class CPTextField
-
 
 @implementation _CPTitleableWindowView : _CPWindowView
 {
-    CPTextField         _titleField;
+    CPTextField _titleField;
 }
 
 + (int)titleBarHeight

AppKit/CPWindow/_CPToolTipWindowView.j

@@ -21,7 +21,7 @@
  */
 
 @import "_CPWindowView.j"
-@import "_CPToolTip.j"
+
 
 @implementation _CPToolTipWindowView : _CPWindowView
 {

AppKit/Platform/CPPlatformWindow.j

@@ -142,7 +142,7 @@ var PrimaryPlatformWindow   = NULL;
 {
     var frame = [self contentBounds];
 
-    frame.origin = CGPointMakeZero();
+    frame.origin = _CGPointMakeZero();
 
     if ([CPMenu menuBarVisible] && [CPPlatformWindow primaryPlatformWindow] === self)
     {