From 52f7844aee15ea2c1c1bce45a45322a5968be70f Mon Sep 17 00:00:00 2001 From: Francisco Ryan Tolmasky I Date: Mon, 1 Nov 2010 11:10:01 -0700 Subject: [PATCH] Made it so .h files are automatically included in AppKit (avoiding needing to manually include Platform.h, etc.). Also changed a bunch of imports to "*" imports. Reviewed by me. --- AppKit/CPAccordionView.j | 5 ++--- AppKit/CPAlert.j | 16 ++++++++-------- AppKit/CPApplication.j | 1 - AppKit/CPArrayController.j | 4 ++-- AppKit/CPBezierPath.j | 3 ++- AppKit/CPButton.j | 2 -- AppKit/CPButtonBar.j | 4 +--- AppKit/CPCheckBox.j | 1 + AppKit/CPClipView.j | 2 -- AppKit/CPCollectionViewItem.j | 1 + AppKit/CPColorPanel.j | 1 + AppKit/CPColorPicker.j | 4 ++-- AppKit/CPCompatibility.j | 1 + AppKit/CPControl.j | 2 -- AppKit/CPCookie.j | 1 - AppKit/CPCursor.j | 2 -- AppKit/CPDragServer.j | 15 ++++++--------- AppKit/CPEvent.j | 2 -- AppKit/CPFlashMovie.j | 1 + AppKit/CPFlashView.j | 1 - AppKit/CPFont.j | 3 ++- AppKit/CPFontManager.j | 2 +- AppKit/CPGraphics.j | 2 -- AppKit/CPGraphicsContext.j | 4 +++- AppKit/CPImage.j | 2 -- AppKit/CPImageView.j | 4 ---- AppKit/CPKeyBinding.j | 3 ++- AppKit/CPKeyValueBinding.j | 1 + AppKit/CPMenu/CPMenu.j | 3 --- AppKit/CPMenu/_CPMenuBarWindow.j | 4 ---- AppKit/CPMenu/_CPMenuManager.j | 3 --- AppKit/CPMenu/_CPMenuWindow.j | 4 +--- AppKit/CPMenuItem/CPMenuItem.j | 1 + AppKit/CPMenuItem/_CPMenuItemMenuBarView.j | 3 ++- AppKit/CPMenuItem/_CPMenuItemSeparatorView.j | 2 +- AppKit/CPMenuItem/_CPMenuItemStandardView.j | 3 ++- AppKit/CPOpenPanel.j | 2 +- AppKit/CPOutlineView.j | 2 -- AppKit/CPPasteboard.j | 2 -- AppKit/CPPopUpButton.j | 2 -- AppKit/CPProgressIndicator.j | 8 +++----- AppKit/CPRadio.j | 1 + AppKit/CPResponder.j | 1 + AppKit/CPSavePanel.j | 2 +- AppKit/CPScreen.j | 2 -- AppKit/CPScrollView.j | 2 -- AppKit/CPScroller.j | 2 -- AppKit/CPSearchField.j | 2 -- AppKit/CPSecureTextField.j | 1 + AppKit/CPSegmentedControl.j | 1 - AppKit/CPShadowView.j | 2 -- AppKit/CPSlider.j | 1 - AppKit/CPSliderColorPicker.j | 1 - AppKit/CPSplitView.j | 4 ---- AppKit/CPStringDrawing.j | 1 + AppKit/CPTabView.j | 8 ++++---- AppKit/CPTabViewItem.j | 2 +- AppKit/CPTableColumn.j | 1 - AppKit/CPTableHeaderView.j | 1 - AppKit/CPTableView.j | 6 +++--- AppKit/CPTextField.j | 3 --- AppKit/CPTheme.j | 1 + AppKit/CPThemeBlend.j | 7 ++++--- AppKit/CPTokenField.j | 1 - AppKit/CPToolbar.j | 2 -- AppKit/CPToolbarItem.j | 5 +++-- AppKit/CPView.j | 5 ----- AppKit/CPViewAnimation.j | 3 +-- AppKit/CPViewController.j | 7 ++++--- AppKit/CPWebView.j | 6 ++---- AppKit/CPWindow/CPWindow.j | 5 ----- AppKit/CPWindow/_CPStandardWindowView.j | 1 + AppKit/CPWindow/_CPWindowView.j | 2 -- AppKit/CPWindowController.j | 2 -- AppKit/Cib/_CPCibWindowTemplate.j | 4 ++-- AppKit/CoreAnimation/CALayer.j | 9 +++------ AppKit/CoreGraphics/CGAffineTransform.j | 7 ++----- AppKit/CoreGraphics/CGContext.j | 4 +--- AppKit/CoreGraphics/CGGeometry.j | 2 -- AppKit/CoreGraphics/CGPath.j | 3 --- AppKit/Jakefile | 10 ++++++++-- AppKit/Platform/CPPlatform.j | 2 -- AppKit/Platform/CPPlatformString.j | 3 --- AppKit/Platform/CPPlatformWindow.j | 3 --- AppKit/Platform/DOM/CPDOMWindowLayer.j | 2 -- AppKit/Platform/DOM/CPPlatformString.j | 2 -- AppKit/Platform/DOM/CPPlatformWindow+DOM.j | 1 - AppKit/_CPDisplayServer.j | 4 ---- AppKit/_CPImageAndTextView.j | 4 ---- Foundation/Jakefile | 6 ++++-- Objective-J/CommonJS/lib/objective-j/compiler.js | 11 ++++++++++- 91 files changed, 107 insertions(+), 190 deletions(-) diff --git a/AppKit/CPAccordionView.j b/AppKit/CPAccordionView.j index 8cb047c22..796078010 100644 --- a/AppKit/CPAccordionView.j +++ b/AppKit/CPAccordionView.j @@ -26,10 +26,9 @@ @import @import -@import -@import +@import "CPView.j" +@import "CPButton.j" -#import "CoreGraphics/CGGeometry.h" /*! @ingroup appkit diff --git a/AppKit/CPAlert.j b/AppKit/CPAlert.j index 142a81ae7..4b0b2c76a 100644 --- a/AppKit/CPAlert.j +++ b/AppKit/CPAlert.j @@ -26,14 +26,14 @@ @import @import -@import -@import -@import -@import -@import -@import -@import -@import +@import "CPApplication.j" +@import "CPButton.j" +@import "CPColor.j" +@import "CPFont.j" +@import "CPImage.j" +@import "CPImageView.j" +@import "CPPanel.j" +@import "CPTextField.j" /* @global diff --git a/AppKit/CPApplication.j b/AppKit/CPApplication.j index 2205726e2..9d20a03f2 100644 --- a/AppKit/CPApplication.j +++ b/AppKit/CPApplication.j @@ -31,7 +31,6 @@ @import "CPCibLoading.j" @import "CPPlatform.j" -#include "Platform/Platform.h" var CPMainCibFile = @"CPMainCibFile", CPMainCibFileHumanFriendly = @"Main cib file base name"; diff --git a/AppKit/CPArrayController.j b/AppKit/CPArrayController.j index 382d474b7..42018c520 100644 --- a/AppKit/CPArrayController.j +++ b/AppKit/CPArrayController.j @@ -25,8 +25,8 @@ @import -@import -@import +@import "CPObjectController.j" +@import "CPKeyValueBinding.j" @implementation CPArrayController : CPObjectController diff --git a/AppKit/CPBezierPath.j b/AppKit/CPBezierPath.j index f71d4de49..0517cf5ac 100644 --- a/AppKit/CPBezierPath.j +++ b/AppKit/CPBezierPath.j @@ -23,9 +23,10 @@ */ -@import @import +@import "CPGraphicsContext.j" + // Class defaults diff --git a/AppKit/CPButton.j b/AppKit/CPButton.j index 717995ce8..d8613b4f6 100644 --- a/AppKit/CPButton.j +++ b/AppKit/CPButton.j @@ -26,8 +26,6 @@ @import "CPControl.j" @import "CPStringDrawing.j" -#include "CoreGraphics/CGGeometry.h" - /* @group CPBezelStyle */ diff --git a/AppKit/CPButtonBar.j b/AppKit/CPButtonBar.j index 73873dc5f..162e76c47 100644 --- a/AppKit/CPButtonBar.j +++ b/AppKit/CPButtonBar.j @@ -1,7 +1,5 @@ -@import - -#include "CoreGraphics/CGGeometry.h" +@import "CPView.j" @implementation CPButtonBar : CPView diff --git a/AppKit/CPCheckBox.j b/AppKit/CPCheckBox.j index 3e6ac7e8b..9e3a5ebb3 100644 --- a/AppKit/CPCheckBox.j +++ b/AppKit/CPCheckBox.j @@ -22,6 +22,7 @@ @import "CPButton.j" + CPCheckBoxImageOffset = 4.0; @implementation CPCheckBox : CPButton diff --git a/AppKit/CPClipView.j b/AppKit/CPClipView.j index 5227ea530..437a210d9 100644 --- a/AppKit/CPClipView.j +++ b/AppKit/CPClipView.j @@ -22,8 +22,6 @@ @import "CPView.j" -#include "CoreGraphics/CGGeometry.h" - /*! @ingroup appkit diff --git a/AppKit/CPCollectionViewItem.j b/AppKit/CPCollectionViewItem.j index 1711df6c0..44e06394e 100644 --- a/AppKit/CPCollectionViewItem.j +++ b/AppKit/CPCollectionViewItem.j @@ -22,6 +22,7 @@ @import "CPViewController.j" + /*! Represents an object inside a CPCollectionView. */ diff --git a/AppKit/CPColorPanel.j b/AppKit/CPColorPanel.j index 176c751ba..d385b28c1 100644 --- a/AppKit/CPColorPanel.j +++ b/AppKit/CPColorPanel.j @@ -26,6 +26,7 @@ @import "CPPanel.j" @import "CPView.j" + CPColorPanelColorDidChangeNotification = @"CPColorPanelColorDidChangeNotification"; var PREVIEW_HEIGHT = 20.0, diff --git a/AppKit/CPColorPicker.j b/AppKit/CPColorPicker.j index 89f5d7e24..032f78dc4 100644 --- a/AppKit/CPColorPicker.j +++ b/AppKit/CPColorPicker.j @@ -21,9 +21,9 @@ */ @import -@import -#include "Platform/Platform.h" +@import "CPView.j" + /*! @ingroup appkit diff --git a/AppKit/CPCompatibility.j b/AppKit/CPCompatibility.j index cc9328f0e..03f3081a1 100644 --- a/AppKit/CPCompatibility.j +++ b/AppKit/CPCompatibility.j @@ -23,6 +23,7 @@ @import "CPEvent.j" @import "CPPlatform.j" + // Browser Engines CPUnknownBrowserEngine = 0; CPGeckoBrowserEngine = 1; diff --git a/AppKit/CPControl.j b/AppKit/CPControl.j index 6d9aeacfe..5af7d9b63 100644 --- a/AppKit/CPControl.j +++ b/AppKit/CPControl.j @@ -25,8 +25,6 @@ @import "CPView.j" @import "CPKeyValueBinding.j" -#include "CoreGraphics/CGGeometry.h" -#include "Platform/Platform.h" CPLeftTextAlignment = 0; CPRightTextAlignment = 1; diff --git a/AppKit/CPCookie.j b/AppKit/CPCookie.j index c3f8da3b6..8b040362b 100644 --- a/AppKit/CPCookie.j +++ b/AppKit/CPCookie.j @@ -23,7 +23,6 @@ @import @import -#include "Platform/Platform.h" /*! @ingroup appkit diff --git a/AppKit/CPCursor.j b/AppKit/CPCursor.j index 34a076c35..a8b09e218 100755 --- a/AppKit/CPCursor.j +++ b/AppKit/CPCursor.j @@ -12,8 +12,6 @@ Implemented class methods: 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" - @import var currentCursor = nil, diff --git a/AppKit/CPDragServer.j b/AppKit/CPDragServer.j index c3e25b0c3..e33d7a74f 100644 --- a/AppKit/CPDragServer.j +++ b/AppKit/CPDragServer.j @@ -20,15 +20,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -@import -@import -@import -@import -@import -@import - -#import "CoreGraphics/CGGeometry.h" -#import "Platform/Platform.h" +@import "CPApplication.j" +@import "CPEvent.j" +@import "CPImageView.j" +@import "CPPasteboard.j" +@import "CPView.j" +@import "CPWindow.j" CPDragOperationNone = 0, diff --git a/AppKit/CPEvent.j b/AppKit/CPEvent.j index 6c05c96d6..e4fbe8dfd 100644 --- a/AppKit/CPEvent.j +++ b/AppKit/CPEvent.j @@ -23,8 +23,6 @@ @import @import "CPText.j" -#include "CoreGraphics/CGGeometry.h" - CPLeftMouseDown = 1; CPLeftMouseUp = 2; diff --git a/AppKit/CPFlashMovie.j b/AppKit/CPFlashMovie.j index 22cd0c520..2ff4a06fa 100644 --- a/AppKit/CPFlashMovie.j +++ b/AppKit/CPFlashMovie.j @@ -22,6 +22,7 @@ @import + /*! @ingroup appkit @class CPFlashMovie diff --git a/AppKit/CPFlashView.j b/AppKit/CPFlashView.j index d3dc99f48..8b2fe928a 100644 --- a/AppKit/CPFlashView.j +++ b/AppKit/CPFlashView.j @@ -23,7 +23,6 @@ @import "CPFlashMovie.j" @import "CPView.j" -#include "Platform/Platform.h" var IEFlashCLSID = "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"; diff --git a/AppKit/CPFont.j b/AppKit/CPFont.j index eeebca263..517ae1b28 100644 --- a/AppKit/CPFont.j +++ b/AppKit/CPFont.j @@ -23,7 +23,8 @@ @import @import -@import +@import "CPView.j" + var _CPFonts = {}, _CPFontSystemFontFace = @"Arial, sans-serif", diff --git a/AppKit/CPFontManager.j b/AppKit/CPFontManager.j index e4f9c8c68..07189d9ee 100644 --- a/AppKit/CPFontManager.j +++ b/AppKit/CPFontManager.j @@ -22,7 +22,7 @@ @import -@import +@import "CPFont.j" var CPSharedFontManager = nil, diff --git a/AppKit/CPGraphics.j b/AppKit/CPGraphics.j index caf4c82aa..af4da70ec 100644 --- a/AppKit/CPGraphics.j +++ b/AppKit/CPGraphics.j @@ -23,8 +23,6 @@ @import "CPColor.j" @import "CPGraphicsContext.j" -#include "CoreGraphics/CGGeometry.h" - function CPDrawTiledRects( /* CGRect */ boundsRect, diff --git a/AppKit/CPGraphicsContext.j b/AppKit/CPGraphicsContext.j index 4b2f15682..70d290cc2 100644 --- a/AppKit/CPGraphicsContext.j +++ b/AppKit/CPGraphicsContext.j @@ -21,7 +21,9 @@ */ @import -@import + +@import "CGContext.j" + var CPGraphicsContextCurrent = nil; diff --git a/AppKit/CPImage.j b/AppKit/CPImage.j index 53a3f1937..a440c94d4 100644 --- a/AppKit/CPImage.j +++ b/AppKit/CPImage.j @@ -28,8 +28,6 @@ @import "CPGeometry.j" -#include "Platform/Platform.h" - CPImageLoadStatusInitialized = 0; CPImageLoadStatusLoading = 1; diff --git a/AppKit/CPImageView.j b/AppKit/CPImageView.j index 25189100d..655316751 100644 --- a/AppKit/CPImageView.j +++ b/AppKit/CPImageView.j @@ -26,10 +26,6 @@ @import "CPImage.j" @import "CPShadowView.j" -#include "Platform/Platform.h" -#include "Platform/DOM/CPDOMDisplayServer.h" - -#include "CoreGraphics/CGGeometry.h" CPScaleProportionally = 0; CPScaleToFit = 1; diff --git a/AppKit/CPKeyBinding.j b/AppKit/CPKeyBinding.j index 8f29bfe08..6abacfddc 100644 --- a/AppKit/CPKeyBinding.j +++ b/AppKit/CPKeyBinding.j @@ -21,7 +21,8 @@ */ @import -@import + +@import "CPEvent.j" CPStandardKeyBindings = { diff --git a/AppKit/CPKeyValueBinding.j b/AppKit/CPKeyValueBinding.j index 64ef1f583..713b85731 100644 --- a/AppKit/CPKeyValueBinding.j +++ b/AppKit/CPKeyValueBinding.j @@ -28,6 +28,7 @@ @import @import + var exposedBindingsMap = [CPDictionary new], bindingsMap = [CPDictionary new]; diff --git a/AppKit/CPMenu/CPMenu.j b/AppKit/CPMenu/CPMenu.j index 4cdcd7a16..8851c8775 100644 --- a/AppKit/CPMenu/CPMenu.j +++ b/AppKit/CPMenu/CPMenu.j @@ -31,9 +31,6 @@ @import "CPMenuItem.j" @import "CPPanel.j" -#include "../CoreGraphics/CGGeometry.h" -#include "../Platform/Platform.h" - CPMenuDidAddItemNotification = @"CPMenuDidAddItemNotification"; CPMenuDidChangeItemNotification = @"CPMenuDidChangeItemNotification"; diff --git a/AppKit/CPMenu/_CPMenuBarWindow.j b/AppKit/CPMenu/_CPMenuBarWindow.j index dc7cbb4bd..9b3b1221b 100644 --- a/AppKit/CPMenu/_CPMenuBarWindow.j +++ b/AppKit/CPMenu/_CPMenuBarWindow.j @@ -1,7 +1,3 @@ - -#include "../CoreGraphics/CGGeometry.h" -#include "../Platform/Platform.h" - @import "CPPanel.j" @import "_CPMenuWindow.j" diff --git a/AppKit/CPMenu/_CPMenuManager.j b/AppKit/CPMenu/_CPMenuManager.j index 18d1021e1..bfe082cea 100644 --- a/AppKit/CPMenu/_CPMenuManager.j +++ b/AppKit/CPMenu/_CPMenuManager.j @@ -1,6 +1,3 @@ - -#include "../CoreGraphics/CGGeometry.h" - @import diff --git a/AppKit/CPMenu/_CPMenuWindow.j b/AppKit/CPMenu/_CPMenuWindow.j index 216853206..c51d329a3 100644 --- a/AppKit/CPMenu/_CPMenuWindow.j +++ b/AppKit/CPMenu/_CPMenuWindow.j @@ -1,7 +1,5 @@ +@import "CPWindow.j" -#include "../CoreGraphics/CGGeometry.h" - -@import var _CPMenuWindowPool = [], _CPMenuWindowPoolCapacity = 5, diff --git a/AppKit/CPMenuItem/CPMenuItem.j b/AppKit/CPMenuItem/CPMenuItem.j index 0f173c7da..aafd0f067 100644 --- a/AppKit/CPMenuItem/CPMenuItem.j +++ b/AppKit/CPMenuItem/CPMenuItem.j @@ -29,6 +29,7 @@ @import "CPView.j" @import "_CPMenuItemView.j" + /*! @ingroup appkit @class CPMenuItem diff --git a/AppKit/CPMenuItem/_CPMenuItemMenuBarView.j b/AppKit/CPMenuItem/_CPMenuItemMenuBarView.j index 5308ee35c..8ba3b1ec5 100644 --- a/AppKit/CPMenuItem/_CPMenuItemMenuBarView.j +++ b/AppKit/CPMenuItem/_CPMenuItemMenuBarView.j @@ -1,4 +1,5 @@ -@import +@import "CPView.j" + var HORIZONTAL_MARGIN = 8.0, SUBMENU_INDICATOR_MARGIN = 3.0, diff --git a/AppKit/CPMenuItem/_CPMenuItemSeparatorView.j b/AppKit/CPMenuItem/_CPMenuItemSeparatorView.j index a6762cb6c..95a930f06 100644 --- a/AppKit/CPMenuItem/_CPMenuItemSeparatorView.j +++ b/AppKit/CPMenuItem/_CPMenuItemSeparatorView.j @@ -1,5 +1,5 @@ -@import +@import "CPView.j" @implementation _CPMenuItemSeparatorView : CPView diff --git a/AppKit/CPMenuItem/_CPMenuItemStandardView.j b/AppKit/CPMenuItem/_CPMenuItemStandardView.j index 04b581ae8..c6fc8182f 100644 --- a/AppKit/CPMenuItem/_CPMenuItemStandardView.j +++ b/AppKit/CPMenuItem/_CPMenuItemStandardView.j @@ -1,4 +1,5 @@ -@import +@import "CPControl.j" + var LEFT_MARGIN = 3.0, RIGHT_MARGIN = 14.0 + 3.0, diff --git a/AppKit/CPOpenPanel.j b/AppKit/CPOpenPanel.j index e8c2fe676..db2f3888b 100644 --- a/AppKit/CPOpenPanel.j +++ b/AppKit/CPOpenPanel.j @@ -1,5 +1,5 @@ -@import +@import "CPPanel.j" @implementation CPOpenPanel : CPPanel diff --git a/AppKit/CPOutlineView.j b/AppKit/CPOutlineView.j index b66e4f1e9..f94d568ec 100644 --- a/AppKit/CPOutlineView.j +++ b/AppKit/CPOutlineView.j @@ -23,8 +23,6 @@ @import "CPTableColumn.j" @import "CPTableView.j" -#include "CoreGraphics/CGGeometry.h" - CPOutlineViewColumnDidMoveNotification = @"CPOutlineViewColumnDidMoveNotification"; CPOutlineViewColumnDidResizeNotification = @"CPOutlineViewColumnDidResizeNotification"; diff --git a/AppKit/CPPasteboard.j b/AppKit/CPPasteboard.j index 89b4360dd..ee3af3bd0 100644 --- a/AppKit/CPPasteboard.j +++ b/AppKit/CPPasteboard.j @@ -25,8 +25,6 @@ @import @import -#include "Platform/Platform.h" - CPGeneralPboard = @"CPGeneralPboard"; CPFontPboard = @"CPFontPboard"; diff --git a/AppKit/CPPopUpButton.j b/AppKit/CPPopUpButton.j index 6cb3150b8..77b3474c6 100644 --- a/AppKit/CPPopUpButton.j +++ b/AppKit/CPPopUpButton.j @@ -25,8 +25,6 @@ @import "CPMenu.j" @import "CPMenuItem.j" -#include "CoreGraphics/CGGeometry.h" - var VISIBLE_MARGIN = 7.0; diff --git a/AppKit/CPProgressIndicator.j b/AppKit/CPProgressIndicator.j index a9502c418..7e49ac053 100644 --- a/AppKit/CPProgressIndicator.j +++ b/AppKit/CPProgressIndicator.j @@ -20,11 +20,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -@import -@import -@import - -#include "CoreGraphics/CGGeometry.h" +@import "CGGeometry.j" +@import "CPImageView.j" +@import "CPView.j" /* diff --git a/AppKit/CPRadio.j b/AppKit/CPRadio.j index 59d6f76d4..e38f8aeff 100644 --- a/AppKit/CPRadio.j +++ b/AppKit/CPRadio.j @@ -25,6 +25,7 @@ @import "CPButton.j" + /*! @ingroup appkit diff --git a/AppKit/CPResponder.j b/AppKit/CPResponder.j index b9c7d3247..244244103 100644 --- a/AppKit/CPResponder.j +++ b/AppKit/CPResponder.j @@ -22,6 +22,7 @@ @import + CPDeleteKeyCode = 8; CPTabKeyCode = 9; CPReturnKeyCode = 13; diff --git a/AppKit/CPSavePanel.j b/AppKit/CPSavePanel.j index 13f7e62b2..7991143ea 100644 --- a/AppKit/CPSavePanel.j +++ b/AppKit/CPSavePanel.j @@ -1,5 +1,5 @@ -@import +@import "CPPanel.j" @implementation CPSavePanel : CPPanel diff --git a/AppKit/CPScreen.j b/AppKit/CPScreen.j index dccfbdb17..aae462ac8 100644 --- a/AppKit/CPScreen.j +++ b/AppKit/CPScreen.j @@ -1,8 +1,6 @@ @import -#import "CoreGraphics/CGGeometry.h" -#import "Platform/Platform.h" @implementation CPScreen : CPObject { diff --git a/AppKit/CPScrollView.j b/AppKit/CPScrollView.j index 9af371f5f..b3def44bc 100644 --- a/AppKit/CPScrollView.j +++ b/AppKit/CPScrollView.j @@ -25,8 +25,6 @@ @import "CPScroller.j" @import "CPView.j" -#include "CoreGraphics/CGGeometry.h" - /*! @ingroup appkit diff --git a/AppKit/CPScroller.j b/AppKit/CPScroller.j index 8709fc537..14228b14b 100644 --- a/AppKit/CPScroller.j +++ b/AppKit/CPScroller.j @@ -22,8 +22,6 @@ @import "CPControl.j" -#include "CoreGraphics/CGGeometry.h" - // CPScroller Constants CPScrollerNoPart = 0; diff --git a/AppKit/CPSearchField.j b/AppKit/CPSearchField.j index f38f3cc19..6494df077 100644 --- a/AppKit/CPSearchField.j +++ b/AppKit/CPSearchField.j @@ -23,8 +23,6 @@ @import "CPButton.j" @import "CPTextField.j" -#include "CoreGraphics/CGGeometry.h" -#include "Platform/Platform.h" CPSearchFieldRecentsTitleMenuItemTag = 1000; CPSearchFieldRecentsMenuItemTag = 1001; diff --git a/AppKit/CPSecureTextField.j b/AppKit/CPSecureTextField.j index 35792a375..236f7759d 100644 --- a/AppKit/CPSecureTextField.j +++ b/AppKit/CPSecureTextField.j @@ -1,6 +1,7 @@ @import "CPTextField.j" + /*! @ingroup appkit */ diff --git a/AppKit/CPSegmentedControl.j b/AppKit/CPSegmentedControl.j index edcf3226d..3c0928bec 100644 --- a/AppKit/CPSegmentedControl.j +++ b/AppKit/CPSegmentedControl.j @@ -24,7 +24,6 @@ @import "CPControl.j" -#include "CoreGraphics/CGGeometry.h" CPSegmentSwitchTrackingSelectOne = 0; CPSegmentSwitchTrackingSelectAny = 1; diff --git a/AppKit/CPShadowView.j b/AppKit/CPShadowView.j index c1aaac6f5..e9e05c4a0 100644 --- a/AppKit/CPShadowView.j +++ b/AppKit/CPShadowView.j @@ -28,8 +28,6 @@ @import "CPView.j" -#include "CoreGraphics/CGGeometry.h" - CPLightShadow = 0; CPHeavyShadow = 1; diff --git a/AppKit/CPSlider.j b/AppKit/CPSlider.j index 96f2c44e6..9ef5ccfe9 100644 --- a/AppKit/CPSlider.j +++ b/AppKit/CPSlider.j @@ -22,7 +22,6 @@ @import "CPControl.j" -#include "CoreGraphics/CGGeometry.h" /*! SLIDER STATES */ diff --git a/AppKit/CPSliderColorPicker.j b/AppKit/CPSliderColorPicker.j index be7a92643..957e11fa1 100644 --- a/AppKit/CPSliderColorPicker.j +++ b/AppKit/CPSliderColorPicker.j @@ -23,7 +23,6 @@ @import "CPView.j" @import "CPColorPicker.j" -#include "Platform/Platform.h" /* @ignore diff --git a/AppKit/CPSplitView.j b/AppKit/CPSplitView.j index e90ea195a..908278731 100644 --- a/AppKit/CPSplitView.j +++ b/AppKit/CPSplitView.j @@ -24,10 +24,6 @@ @import "CPImage.j" @import "CPView.j" -#include "CoreGraphics/CGGeometry.h" -#include "Platform/Platform.h" -#include "Platform/DOM/CPDOMDisplayServer.h" - CPSplitViewDidResizeSubviewsNotification = @"CPSplitViewDidResizeSubviewsNotification"; CPSplitViewWillResizeSubviewsNotification = @"CPSplitViewWillResizeSubviewsNotification"; diff --git a/AppKit/CPStringDrawing.j b/AppKit/CPStringDrawing.j index 0f930caf1..9069e7f5c 100644 --- a/AppKit/CPStringDrawing.j +++ b/AppKit/CPStringDrawing.j @@ -24,6 +24,7 @@ @import "CPPlatformString.j" + var CPStringSizeWithFontInWidthCache = {}; CPStringSizeCachingEnabled = YES; diff --git a/AppKit/CPTabView.j b/AppKit/CPTabView.j index 31c6d1c51..383112a6d 100644 --- a/AppKit/CPTabView.j +++ b/AppKit/CPTabView.j @@ -1,7 +1,7 @@ -@import -@import -@import -@import +@import "CPBox.j" +@import "CPSegmentedControl.j" +@import "CPTabViewItem.j" +@import "CPView.j" /* Places tabs on top with a bezeled border. diff --git a/AppKit/CPTabViewItem.j b/AppKit/CPTabViewItem.j index f1c3715d8..a7952fb6e 100644 --- a/AppKit/CPTabViewItem.j +++ b/AppKit/CPTabViewItem.j @@ -22,7 +22,7 @@ @import -@import +@import "CPView.j" /* diff --git a/AppKit/CPTableColumn.j b/AppKit/CPTableColumn.j index 99dcbb407..9ce5fd102 100644 --- a/AppKit/CPTableColumn.j +++ b/AppKit/CPTableColumn.j @@ -28,7 +28,6 @@ @import "CPTableHeaderView.j" -#include "CoreGraphics/CGGeometry.h" CPTableColumnNoResizing = 0; CPTableColumnAutoresizingMask = 1 << 0; diff --git a/AppKit/CPTableHeaderView.j b/AppKit/CPTableHeaderView.j index 254c2c582..a9863d245 100644 --- a/AppKit/CPTableHeaderView.j +++ b/AppKit/CPTableHeaderView.j @@ -26,7 +26,6 @@ @import "CPTableView.j" @import "CPView.j" -#include "CoreGraphics/CGGeometry.h" @implementation _CPTableColumnHeaderView : CPView { diff --git a/AppKit/CPTableView.j b/AppKit/CPTableView.j index 3db9479f5..9312246ce 100644 --- a/AppKit/CPTableView.j +++ b/AppKit/CPTableView.j @@ -22,20 +22,20 @@ @import @import -@import + +@import "CGGradient.j" @import "CPControl.j" @import "CPTableColumn.j" @import "_CPCornerView.j" @import "CPScroller.j" + CPTableViewColumnDidMoveNotification = @"CPTableViewColumnDidMoveNotification"; CPTableViewColumnDidResizeNotification = @"CPTableViewColumnDidResizeNotification"; CPTableViewSelectionDidChangeNotification = @"CPTableViewSelectionDidChangeNotification"; CPTableViewSelectionIsChangingNotification = @"CPTableViewSelectionIsChangingNotification"; -#include "CoreGraphics/CGGeometry.h" - var CPTableViewDataSource_numberOfRowsInTableView_ = 1 << 0, CPTableViewDataSource_tableView_objectValueForTableColumn_row_ = 1 << 1, CPTableViewDataSource_tableView_setObjectValue_forTableColumn_row_ = 1 << 2, diff --git a/AppKit/CPTextField.j b/AppKit/CPTextField.j index 83ec81440..92c57f8ea 100644 --- a/AppKit/CPTextField.j +++ b/AppKit/CPTextField.j @@ -26,9 +26,6 @@ @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. */ diff --git a/AppKit/CPTheme.j b/AppKit/CPTheme.j index 5098db017..7e854b147 100644 --- a/AppKit/CPTheme.j +++ b/AppKit/CPTheme.j @@ -24,6 +24,7 @@ @import @import + var CPThemesByName = { }, CPThemeDefaultTheme = nil, CPThemeDefaultHudTheme = nil; diff --git a/AppKit/CPThemeBlend.j b/AppKit/CPThemeBlend.j index b1f58e3df..eeea9c09c 100644 --- a/AppKit/CPThemeBlend.j +++ b/AppKit/CPThemeBlend.j @@ -22,9 +22,10 @@ @import -@import -@import -@import +@import "CPTheme.j" +@import "_CPCibCustomResource.j" +@import "_CPCibKeyedUnarchiver.j" + /*! @ingroup appkit diff --git a/AppKit/CPTokenField.j b/AppKit/CPTokenField.j index 76199dc5f..a7b0ef651 100755 --- a/AppKit/CPTokenField.j +++ b/AppKit/CPTokenField.j @@ -30,7 +30,6 @@ @import "CPWindow.j" @import "_CPMenuWindow.j" -#include "Platform/Platform.h" #if PLATFORM(DOM) diff --git a/AppKit/CPToolbar.j b/AppKit/CPToolbar.j index e3ef772d0..97e5e7d74 100644 --- a/AppKit/CPToolbar.j +++ b/AppKit/CPToolbar.j @@ -28,8 +28,6 @@ @import "CPPopUpButton.j" @import "CPToolbarItem.j" -#include "CoreGraphics/CGGeometry.h" - /* @global diff --git a/AppKit/CPToolbarItem.j b/AppKit/CPToolbarItem.j index e5148576e..db985a828 100644 --- a/AppKit/CPToolbarItem.j +++ b/AppKit/CPToolbarItem.j @@ -23,8 +23,9 @@ @import @import -@import -@import +@import "CPImage.j" +@import "CPView.j" + CPToolbarItemVisibilityPriorityStandard = 0; CPToolbarItemVisibilityPriorityLow = -1000; diff --git a/AppKit/CPView.j b/AppKit/CPView.j index b70293882..3ad7649b2 100644 --- a/AppKit/CPView.j +++ b/AppKit/CPView.j @@ -35,11 +35,6 @@ @import "_CPDisplayServer.j" -#include "Platform/Platform.h" -#include "CoreGraphics/CGAffineTransform.h" -#include "CoreGraphics/CGGeometry.h" -#include "Platform/DOM/CPDOMDisplayServer.h" - /* @global @group CPViewAutoresizingMasks diff --git a/AppKit/CPViewAnimation.j b/AppKit/CPViewAnimation.j index 594b638a2..77d2ef55c 100644 --- a/AppKit/CPViewAnimation.j +++ b/AppKit/CPViewAnimation.j @@ -20,9 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -@import +@import "CPAnimation.j" -#include "CoreGraphics/CGGeometry.h" CPViewAnimationTargetKey = @"CPViewAnimationTarget"; CPViewAnimationStartFrameKey = @"CPViewAnimationStartFrame"; diff --git a/AppKit/CPViewController.j b/AppKit/CPViewController.j index fb734a5f3..f64a24331 100644 --- a/AppKit/CPViewController.j +++ b/AppKit/CPViewController.j @@ -22,9 +22,10 @@ @import -@import -@import -@import +@import "CPApplication.j" +@import "CPCib.j" +@import "CPResponder.j" + var CPViewControllerCachedCibs; diff --git a/AppKit/CPWebView.j b/AppKit/CPWebView.j index 698620efd..8d7fe28a5 100644 --- a/AppKit/CPWebView.j +++ b/AppKit/CPWebView.j @@ -20,10 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -@import -@import - -#include "Platform/Platform.h" +@import "CPView.j" +@import "CPScrollView.j" // FIXME: implement these where possible: diff --git a/AppKit/CPWindow/CPWindow.j b/AppKit/CPWindow/CPWindow.j index d03e53e58..87b2b4687 100644 --- a/AppKit/CPWindow/CPWindow.j +++ b/AppKit/CPWindow/CPWindow.j @@ -30,11 +30,6 @@ @import "CPResponder.j" @import "CPScreen.j" -#include "../Platform/Platform.h" -#include "../Platform/DOM/CPDOMDisplayServer.h" - -#include "../CoreGraphics/CGGeometry.h" - /* Borderless window mask option. diff --git a/AppKit/CPWindow/_CPStandardWindowView.j b/AppKit/CPWindow/_CPStandardWindowView.j index 8ea33a72e..0996526bd 100644 --- a/AppKit/CPWindow/_CPStandardWindowView.j +++ b/AppKit/CPWindow/_CPStandardWindowView.j @@ -22,6 +22,7 @@ @import "_CPWindowView.j" + var GRADIENT_HEIGHT = 41.0; var _CPTexturedWindowHeadGradientColor = nil, diff --git a/AppKit/CPWindow/_CPWindowView.j b/AppKit/CPWindow/_CPWindowView.j index 77314d44d..381c3cb78 100644 --- a/AppKit/CPWindow/_CPWindowView.j +++ b/AppKit/CPWindow/_CPWindowView.j @@ -23,8 +23,6 @@ @import "CPImageView.j" @import "CPView.j" -#include "../CoreGraphics/CGGeometry.h" - var _CPWindowViewResizeIndicatorImage = nil; diff --git a/AppKit/CPWindowController.j b/AppKit/CPWindowController.j index 2d011af98..de7db8f84 100644 --- a/AppKit/CPWindowController.j +++ b/AppKit/CPWindowController.j @@ -27,8 +27,6 @@ @import "CPWindow.j" @import "CPDocument.j" -#include "Platform/Platform.h" - /*! @ingroup appkit diff --git a/AppKit/Cib/_CPCibWindowTemplate.j b/AppKit/Cib/_CPCibWindowTemplate.j index 9cfb437df..c8179d4c8 100644 --- a/AppKit/Cib/_CPCibWindowTemplate.j +++ b/AppKit/Cib/_CPCibWindowTemplate.j @@ -1,8 +1,8 @@ @import -@import -@import +@import "CGGeometry.j" +@import "CPWindow.j" var _CPCibWindowTemplateMinSizeKey = @"_CPCibWindowTemplateMinSizeKey", diff --git a/AppKit/CoreAnimation/CALayer.j b/AppKit/CoreAnimation/CALayer.j index 7a27d7a34..cc22ea18e 100644 --- a/AppKit/CoreAnimation/CALayer.j +++ b/AppKit/CoreAnimation/CALayer.j @@ -22,13 +22,10 @@ @import -@import +@import "CABackingStore.j" -@import -@import - -#include "../CoreGraphics/CGGeometry.h" -#include "../CoreGraphics/CGAffineTransform.j" +@import "CGContext.j" +@import "CGGeometry.j" #define DOM(aLayer) aLayer._DOMElement diff --git a/AppKit/CoreGraphics/CGAffineTransform.j b/AppKit/CoreGraphics/CGAffineTransform.j index b366ed842..6b7dc4880 100644 --- a/AppKit/CoreGraphics/CGAffineTransform.j +++ b/AppKit/CoreGraphics/CGAffineTransform.j @@ -20,14 +20,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "CGGeometry.h" -#include "CGAffineTransform.h" - -#define _function(inline) function inline { return _##inline; } - @import "CGGeometry.j" +#define _function(inline) function inline { return _##inline; } + _function(CGAffineTransformMake(a, b, c, d, tx, ty)) _function(CGAffineTransformMakeIdentity()) _function(CGAffineTransformMakeCopy(anAffineTransform)) diff --git a/AppKit/CoreGraphics/CGContext.j b/AppKit/CoreGraphics/CGContext.j index 38c33c2ab..5904be677 100644 --- a/AppKit/CoreGraphics/CGContext.j +++ b/AppKit/CoreGraphics/CGContext.j @@ -20,14 +20,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "CGGeometry.h" -#include "CGAffineTransform.h" - @import "CGAffineTransform.j" @import "CPCompatibility.j" @import "CGGeometry.j" @import "CGPath.j" + kCGLineCapButt = 0; kCGLineCapRound = 1; kCGLineCapSquare = 2; diff --git a/AppKit/CoreGraphics/CGGeometry.j b/AppKit/CoreGraphics/CGGeometry.j index bd670e5bf..18029f7f1 100644 --- a/AppKit/CoreGraphics/CGGeometry.j +++ b/AppKit/CoreGraphics/CGGeometry.j @@ -20,8 +20,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "CGGeometry.h" - #define _function(inline) function inline { return _##inline; } _function(CGPointMake(x, y)) diff --git a/AppKit/CoreGraphics/CGPath.j b/AppKit/CoreGraphics/CGPath.j index 147903dc8..e0a989401 100644 --- a/AppKit/CoreGraphics/CGPath.j +++ b/AppKit/CoreGraphics/CGPath.j @@ -20,9 +20,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "CGGeometry.h" -#include "CGAffineTransform.h" - @import "CGGeometry.j" @import "CGAffineTransform.j" diff --git a/AppKit/Jakefile b/AppKit/Jakefile index 0e37aef16..24325dced 100644 --- a/AppKit/Jakefile +++ b/AppKit/Jakefile @@ -27,10 +27,16 @@ appKitTask = framework ("AppKit", function(appKitTask) appKitTask.setFlattensSources(true); appKitTask.setInfoPlistPath("Info.plist"); + // Grab all the .h's and just include them in each file. + var INCLUDES = new FileList("**/*.h").map(function(aFilename) + { + return "--include \"" + aFilename + "\""; + }).join(" "); + if ($CONFIGURATION === "Release") - appKitTask.setCompilerFlags("-O"); + appKitTask.setCompilerFlags("-O " + INCLUDES); else - appKitTask.setCompilerFlags("-DDEBUG -g"); + appKitTask.setCompilerFlags("-DDEBUG -g " + INCLUDES); }); $BUILD_CJS_CAPPUCCINO_APPKIT = FILE.join($BUILD_CJS_CAPPUCCINO_FRAMEWORKS, "AppKit"); diff --git a/AppKit/Platform/CPPlatform.j b/AppKit/Platform/CPPlatform.j index db2128810..432875dcd 100644 --- a/AppKit/Platform/CPPlatform.j +++ b/AppKit/Platform/CPPlatform.j @@ -22,8 +22,6 @@ @import -#include "Platform.h" - @implementation CPBasePlatform : CPObject { diff --git a/AppKit/Platform/CPPlatformString.j b/AppKit/Platform/CPPlatformString.j index 26f85d738..edc639a5e 100644 --- a/AppKit/Platform/CPPlatformString.j +++ b/AppKit/Platform/CPPlatformString.j @@ -22,9 +22,6 @@ @import -#include "../CoreGraphics/CGGeometry.h" -#include "Platform.h" - @implementation CPBasePlatformString : CPObject { diff --git a/AppKit/Platform/CPPlatformWindow.j b/AppKit/Platform/CPPlatformWindow.j index e7e126ec6..32a4478fe 100644 --- a/AppKit/Platform/CPPlatformWindow.j +++ b/AppKit/Platform/CPPlatformWindow.j @@ -22,9 +22,6 @@ @import -#import "Platform.h" -#import "../CoreGraphics/CGGeometry.h" - var PrimaryPlatformWindow = NULL; diff --git a/AppKit/Platform/DOM/CPDOMWindowLayer.j b/AppKit/Platform/DOM/CPDOMWindowLayer.j index a41fa4cc9..6478153e7 100644 --- a/AppKit/Platform/DOM/CPDOMWindowLayer.j +++ b/AppKit/Platform/DOM/CPDOMWindowLayer.j @@ -23,8 +23,6 @@ @import @import -#include "CPDOMDisplayServer.h" - @implementation CPDOMWindowLayer : CPObject { diff --git a/AppKit/Platform/DOM/CPPlatformString.j b/AppKit/Platform/DOM/CPPlatformString.j index ab908ce65..2f231abf4 100644 --- a/AppKit/Platform/DOM/CPPlatformString.j +++ b/AppKit/Platform/DOM/CPPlatformString.j @@ -20,8 +20,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "../CoreGraphics/CGGeometry.h" - var DOMFixedWidthSpanElement = nil, DOMFlexibleWidthSpanElement = nil, DOMMetricsDivElement = nil, diff --git a/AppKit/Platform/DOM/CPPlatformWindow+DOM.j b/AppKit/Platform/DOM/CPPlatformWindow+DOM.j index 62b1b376d..21e6fa589 100644 --- a/AppKit/Platform/DOM/CPPlatformWindow+DOM.j +++ b/AppKit/Platform/DOM/CPPlatformWindow+DOM.j @@ -120,7 +120,6 @@ @import "CPPlatformWindow.j" @import "CPPlatformWindow+DOMKeys.j" -#import "../../CoreGraphics/CGGeometry.h" // List of all open native windows var PlatformWindows = [CPSet set]; diff --git a/AppKit/_CPDisplayServer.j b/AppKit/_CPDisplayServer.j index 74caa3f29..9ea5dbc12 100644 --- a/AppKit/_CPDisplayServer.j +++ b/AppKit/_CPDisplayServer.j @@ -20,10 +20,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "CoreGraphics/CGGeometry.h" -#include "CoreGraphics/CGAffineTransform.h" -#include "Platform/DOM/CPDOMDisplayServer.h" - @import PREPARE_DOM_OPTIMIZATION(); diff --git a/AppKit/_CPImageAndTextView.j b/AppKit/_CPImageAndTextView.j index c15f7b13c..9660c8ac0 100644 --- a/AppKit/_CPImageAndTextView.j +++ b/AppKit/_CPImageAndTextView.j @@ -28,10 +28,6 @@ @import "CPView.j" @import "CPControl.j" -#include "CoreGraphics/CGGeometry.h" - -#include "Platform/Platform.h" -#include "Platform/DOM/CPDOMDisplayServer.h" var _CPimageAndTextViewFrameSizeChangedFlag = 1 << 0, _CPImageAndTextViewImageChangedFlag = 1 << 1, diff --git a/Foundation/Jakefile b/Foundation/Jakefile index 3a6911b90..3f339a409 100644 --- a/Foundation/Jakefile +++ b/Foundation/Jakefile @@ -42,10 +42,12 @@ foundationTask = framework ("Foundation", function(foundationTask) foundationTask.setInfoPlistPath("Info.plist"); foundationTask.setEnvironments(require("objective-j/jake/environment").ObjJ); + var INCLUDES = "--include \"../AppKit/Platform/Platform.h\""; + if ($CONFIGURATION === "Release") - foundationTask.setCompilerFlags("-O"); + foundationTask.setCompilerFlags("-O " + INCLUDES); else - foundationTask.setCompilerFlags("-DDEBUG -g"); + foundationTask.setCompilerFlags("-DDEBUG -g " + INCLUDES); }); $BUILD_CJS_FOUNDATION = FILE.join($BUILD_CJS_CAPPUCCINO_FRAMEWORKS, "Foundation"); diff --git a/Objective-J/CommonJS/lib/objective-j/compiler.js b/Objective-J/CommonJS/lib/objective-j/compiler.js index 94bf0da36..a83904e15 100644 --- a/Objective-J/CommonJS/lib/objective-j/compiler.js +++ b/Objective-J/CommonJS/lib/objective-j/compiler.js @@ -112,7 +112,16 @@ function resolveFlags(args) else if (argument.indexOf("-U") === 0) gccFlags.push(argument); - + + else if (argument.indexOf("--include") === 0) + { + if (++index < count) + { + gccFlags.push(argument); + gccFlags.push(args[index]); + } + } + else if (argument.indexOf("-E") === 0) objjcFlags &= ~ObjectiveJ.Preprocessor.Flags.Preprocess;