diff --git a/AppKit/CPAlert.j b/AppKit/CPAlert.j index 55ff0425f..a6817ee09 100644 --- a/AppKit/CPAlert.j +++ b/AppKit/CPAlert.j @@ -34,6 +34,7 @@ @import "CPImage.j" @import "CPImageView.j" @import "CPPanel.j" +@import "CPText.j" @import "CPTextField.j" @class CPCheckBox diff --git a/AppKit/CPButton.j b/AppKit/CPButton.j index 8b8148808..3d468e87d 100644 --- a/AppKit/CPButton.j +++ b/AppKit/CPButton.j @@ -25,9 +25,8 @@ @import "CPControl.j" @import "CPStringDrawing.j" - -@global CPWindowAbove -@global CPWindowBelow +@import "CPText.j" +@import "CPWindow_Constants.j" /* @group CPBezelStyle */ diff --git a/AppKit/CPComboBox.j b/AppKit/CPComboBox.j index f65df0b11..781c323fc 100644 --- a/AppKit/CPComboBox.j +++ b/AppKit/CPComboBox.j @@ -20,6 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +@import "CPText.j" @import "CPTextField.j" @import "_CPPopUpList.j" diff --git a/AppKit/CPCompatibility.j b/AppKit/CPCompatibility.j index d2fd4ca06..eb76bf22a 100644 --- a/AppKit/CPCompatibility.j +++ b/AppKit/CPCompatibility.j @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -@import "CPEvent.j" +@import "CPEvent_Constants.j" @import "CPPlatform.j" diff --git a/AppKit/CPCursor.j b/AppKit/CPCursor.j index 3705d6b30..0042699eb 100755 --- a/AppKit/CPCursor.j +++ b/AppKit/CPCursor.j @@ -23,6 +23,8 @@ Cursor support by browser: @import +@global CPApp + var currentCursor = nil, cursorStack = [], cursors = {}, diff --git a/AppKit/CPEvent.j b/AppKit/CPEvent.j index 99a231f75..77ea70792 100644 --- a/AppKit/CPEvent.j +++ b/AppKit/CPEvent.j @@ -20,171 +20,19 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +@import "CPEvent_Constants.j" + @import @import @import +@import "CPCompatibility.j" @import "CGGeometry.j" @import "CPText.j" @class CPTextField @global CPApp -@global CPBrowserIsOperatingSystem -@global CPMacOperatingSystem - -CPLeftMouseDown = 1; -CPLeftMouseUp = 2; -CPRightMouseDown = 3; -CPRightMouseUp = 4; -CPMouseMoved = 5; -CPLeftMouseDragged = 6; -CPRightMouseDragged = 7; -CPMouseEntered = 8; -CPMouseExited = 9; -CPKeyDown = 10; -CPKeyUp = 11; -CPFlagsChanged = 12; -CPAppKitDefined = 13; -CPSystemDefined = 14; -CPApplicationDefined = 15; -CPPeriodic = 16; -CPCursorUpdate = 17; -CPScrollWheel = 22; -CPOtherMouseDown = 25; -CPOtherMouseUp = 26; -CPOtherMouseDragged = 27; - -// iPhone Event Types -CPTouchStart = 28; -CPTouchMove = 29; -CPTouchEnd = 30; -CPTouchCancel = 31; - -CPAlphaShiftKeyMask = 1 << 16; -CPShiftKeyMask = 1 << 17; -CPControlKeyMask = 1 << 18; -CPAlternateKeyMask = 1 << 19; -CPCommandKeyMask = 1 << 20; -CPNumericPadKeyMask = 1 << 21; -CPHelpKeyMask = 1 << 22; -CPFunctionKeyMask = 1 << 23; -CPDeviceIndependentModifierFlagsMask = 0xffff0000; - -CPLeftMouseDownMask = 1 << CPLeftMouseDown; -CPLeftMouseUpMask = 1 << CPLeftMouseUp; -CPRightMouseDownMask = 1 << CPRightMouseDown; -CPRightMouseUpMask = 1 << CPRightMouseUp; -CPOtherMouseDownMask = 1 << CPOtherMouseDown; -CPOtherMouseUpMask = 1 << CPOtherMouseUp; -CPMouseMovedMask = 1 << CPMouseMoved; -CPLeftMouseDraggedMask = 1 << CPLeftMouseDragged; -CPRightMouseDraggedMask = 1 << CPRightMouseDragged; -CPOtherMouseDragged = 1 << CPOtherMouseDragged; -CPMouseEnteredMask = 1 << CPMouseEntered; -CPMouseExitedMask = 1 << CPMouseExited; -CPCursorUpdateMask = 1 << CPCursorUpdate; -CPKeyDownMask = 1 << CPKeyDown; -CPKeyUpMask = 1 << CPKeyUp; -CPFlagsChangedMask = 1 << CPFlagsChanged; -CPAppKitDefinedMask = 1 << CPAppKitDefined; -CPSystemDefinedMask = 1 << CPSystemDefined; -CPApplicationDefinedMask = 1 << CPApplicationDefined; -CPPeriodicMask = 1 << CPPeriodic; -CPScrollWheelMask = 1 << CPScrollWheel; -CPAnyEventMask = 0xffffffff; - -CPUpArrowFunctionKey = "\uF700"; -CPDownArrowFunctionKey = "\uF701"; -CPLeftArrowFunctionKey = "\uF702"; -CPRightArrowFunctionKey = "\uF703"; -CPF1FunctionKey = "\uF704"; -CPF2FunctionKey = "\uF705"; -CPF3FunctionKey = "\uF706"; -CPF4FunctionKey = "\uF707"; -CPF5FunctionKey = "\uF708"; -CPF6FunctionKey = "\uF709"; -CPF7FunctionKey = "\uF70A"; -CPF8FunctionKey = "\uF70B"; -CPF9FunctionKey = "\uF70C"; -CPF10FunctionKey = "\uF70D"; -CPF11FunctionKey = "\uF70E"; -CPF12FunctionKey = "\uF70F"; -CPF13FunctionKey = "\uF710"; -CPF14FunctionKey = "\uF711"; -CPF15FunctionKey = "\uF712"; -CPF16FunctionKey = "\uF713"; -CPF17FunctionKey = "\uF714"; -CPF18FunctionKey = "\uF715"; -CPF19FunctionKey = "\uF716"; -CPF20FunctionKey = "\uF717"; -CPF21FunctionKey = "\uF718"; -CPF22FunctionKey = "\uF719"; -CPF23FunctionKey = "\uF71A"; -CPF24FunctionKey = "\uF71B"; -CPF25FunctionKey = "\uF71C"; -CPF26FunctionKey = "\uF71D"; -CPF27FunctionKey = "\uF71E"; -CPF28FunctionKey = "\uF71F"; -CPF29FunctionKey = "\uF720"; -CPF30FunctionKey = "\uF721"; -CPF31FunctionKey = "\uF722"; -CPF32FunctionKey = "\uF723"; -CPF33FunctionKey = "\uF724"; -CPF34FunctionKey = "\uF725"; -CPF35FunctionKey = "\uF726"; -CPInsertFunctionKey = "\uF727"; -CPDeleteFunctionKey = "\uF728"; -CPHomeFunctionKey = "\uF729"; -CPBeginFunctionKey = "\uF72A"; -CPEndFunctionKey = "\uF72B"; -CPPageUpFunctionKey = "\uF72C"; -CPPageDownFunctionKey = "\uF72D"; -CPPrintScreenFunctionKey = "\uF72E"; -CPScrollLockFunctionKey = "\uF72F"; -CPPauseFunctionKey = "\uF730"; -CPSysReqFunctionKey = "\uF731"; -CPBreakFunctionKey = "\uF732"; -CPResetFunctionKey = "\uF733"; -CPStopFunctionKey = "\uF734"; -CPMenuFunctionKey = "\uF735"; -CPUserFunctionKey = "\uF736"; -CPSystemFunctionKey = "\uF737"; -CPPrintFunctionKey = "\uF738"; -CPClearLineFunctionKey = "\uF739"; -CPClearDisplayFunctionKey = "\uF73A"; -CPInsertLineFunctionKey = "\uF73B"; -CPDeleteLineFunctionKey = "\uF73C"; -CPInsertCharFunctionKey = "\uF73D"; -CPDeleteCharFunctionKey = "\uF73E"; -CPPrevFunctionKey = "\uF73F"; -CPNextFunctionKey = "\uF740"; -CPSelectFunctionKey = "\uF741"; -CPExecuteFunctionKey = "\uF742"; -CPUndoFunctionKey = "\uF743"; -CPRedoFunctionKey = "\uF744"; -CPFindFunctionKey = "\uF745"; -CPHelpFunctionKey = "\uF746"; -CPModeSwitchFunctionKey = "\uF747"; -CPEscapeFunctionKey = "\u001B"; -CPSpaceFunctionKey = "\u0020"; - - -CPDOMEventDoubleClick = "dblclick"; -CPDOMEventMouseDown = "mousedown"; -CPDOMEventMouseUp = "mouseup"; -CPDOMEventMouseMoved = "mousemove"; -CPDOMEventMouseDragged = "mousedrag"; -CPDOMEventKeyUp = "keyup"; -CPDOMEventKeyDown = "keydown"; -CPDOMEventKeyPress = "keypress"; -CPDOMEventCopy = "copy"; -CPDOMEventPaste = "paste"; -CPDOMEventScrollWheel = "mousewheel"; -CPDOMEventTouchStart = "touchstart"; -CPDOMEventTouchMove = "touchmove"; -CPDOMEventTouchEnd = "touchend"; -CPDOMEventTouchCancel = "touchcancel"; var _CPEventPeriodicEventPeriod = 0, _CPEventPeriodicEventTimer = nil, diff --git a/AppKit/CPEvent_Constants.j b/AppKit/CPEvent_Constants.j new file mode 100644 index 000000000..8dce05970 --- /dev/null +++ b/AppKit/CPEvent_Constants.j @@ -0,0 +1,174 @@ +/* + * CPEvent_Constants.j + * AppKit + * + * Created by Francisco Tolmasky. + * Copyright 2008, 280 North, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +CPLeftMouseDown = 1; +CPLeftMouseUp = 2; +CPRightMouseDown = 3; +CPRightMouseUp = 4; +CPMouseMoved = 5; +CPLeftMouseDragged = 6; +CPRightMouseDragged = 7; +CPMouseEntered = 8; +CPMouseExited = 9; +CPKeyDown = 10; +CPKeyUp = 11; +CPFlagsChanged = 12; +CPAppKitDefined = 13; +CPSystemDefined = 14; +CPApplicationDefined = 15; +CPPeriodic = 16; +CPCursorUpdate = 17; +CPScrollWheel = 22; +CPOtherMouseDown = 25; +CPOtherMouseUp = 26; +CPOtherMouseDragged = 27; + +// iPhone Event Types +CPTouchStart = 28; +CPTouchMove = 29; +CPTouchEnd = 30; +CPTouchCancel = 31; + +CPAlphaShiftKeyMask = 1 << 16; +CPShiftKeyMask = 1 << 17; +CPControlKeyMask = 1 << 18; +CPAlternateKeyMask = 1 << 19; +CPCommandKeyMask = 1 << 20; +CPNumericPadKeyMask = 1 << 21; +CPHelpKeyMask = 1 << 22; +CPFunctionKeyMask = 1 << 23; +CPDeviceIndependentModifierFlagsMask = 0xffff0000; + +CPLeftMouseDownMask = 1 << CPLeftMouseDown; +CPLeftMouseUpMask = 1 << CPLeftMouseUp; +CPRightMouseDownMask = 1 << CPRightMouseDown; +CPRightMouseUpMask = 1 << CPRightMouseUp; +CPOtherMouseDownMask = 1 << CPOtherMouseDown; +CPOtherMouseUpMask = 1 << CPOtherMouseUp; +CPMouseMovedMask = 1 << CPMouseMoved; +CPLeftMouseDraggedMask = 1 << CPLeftMouseDragged; +CPRightMouseDraggedMask = 1 << CPRightMouseDragged; +CPOtherMouseDragged = 1 << CPOtherMouseDragged; +CPMouseEnteredMask = 1 << CPMouseEntered; +CPMouseExitedMask = 1 << CPMouseExited; +CPCursorUpdateMask = 1 << CPCursorUpdate; +CPKeyDownMask = 1 << CPKeyDown; +CPKeyUpMask = 1 << CPKeyUp; +CPFlagsChangedMask = 1 << CPFlagsChanged; +CPAppKitDefinedMask = 1 << CPAppKitDefined; +CPSystemDefinedMask = 1 << CPSystemDefined; +CPApplicationDefinedMask = 1 << CPApplicationDefined; +CPPeriodicMask = 1 << CPPeriodic; +CPScrollWheelMask = 1 << CPScrollWheel; +CPAnyEventMask = 0xffffffff; + +CPUpArrowFunctionKey = "\uF700"; +CPDownArrowFunctionKey = "\uF701"; +CPLeftArrowFunctionKey = "\uF702"; +CPRightArrowFunctionKey = "\uF703"; +CPF1FunctionKey = "\uF704"; +CPF2FunctionKey = "\uF705"; +CPF3FunctionKey = "\uF706"; +CPF4FunctionKey = "\uF707"; +CPF5FunctionKey = "\uF708"; +CPF6FunctionKey = "\uF709"; +CPF7FunctionKey = "\uF70A"; +CPF8FunctionKey = "\uF70B"; +CPF9FunctionKey = "\uF70C"; +CPF10FunctionKey = "\uF70D"; +CPF11FunctionKey = "\uF70E"; +CPF12FunctionKey = "\uF70F"; +CPF13FunctionKey = "\uF710"; +CPF14FunctionKey = "\uF711"; +CPF15FunctionKey = "\uF712"; +CPF16FunctionKey = "\uF713"; +CPF17FunctionKey = "\uF714"; +CPF18FunctionKey = "\uF715"; +CPF19FunctionKey = "\uF716"; +CPF20FunctionKey = "\uF717"; +CPF21FunctionKey = "\uF718"; +CPF22FunctionKey = "\uF719"; +CPF23FunctionKey = "\uF71A"; +CPF24FunctionKey = "\uF71B"; +CPF25FunctionKey = "\uF71C"; +CPF26FunctionKey = "\uF71D"; +CPF27FunctionKey = "\uF71E"; +CPF28FunctionKey = "\uF71F"; +CPF29FunctionKey = "\uF720"; +CPF30FunctionKey = "\uF721"; +CPF31FunctionKey = "\uF722"; +CPF32FunctionKey = "\uF723"; +CPF33FunctionKey = "\uF724"; +CPF34FunctionKey = "\uF725"; +CPF35FunctionKey = "\uF726"; +CPInsertFunctionKey = "\uF727"; +CPDeleteFunctionKey = "\uF728"; +CPHomeFunctionKey = "\uF729"; +CPBeginFunctionKey = "\uF72A"; +CPEndFunctionKey = "\uF72B"; +CPPageUpFunctionKey = "\uF72C"; +CPPageDownFunctionKey = "\uF72D"; +CPPrintScreenFunctionKey = "\uF72E"; +CPScrollLockFunctionKey = "\uF72F"; +CPPauseFunctionKey = "\uF730"; +CPSysReqFunctionKey = "\uF731"; +CPBreakFunctionKey = "\uF732"; +CPResetFunctionKey = "\uF733"; +CPStopFunctionKey = "\uF734"; +CPMenuFunctionKey = "\uF735"; +CPUserFunctionKey = "\uF736"; +CPSystemFunctionKey = "\uF737"; +CPPrintFunctionKey = "\uF738"; +CPClearLineFunctionKey = "\uF739"; +CPClearDisplayFunctionKey = "\uF73A"; +CPInsertLineFunctionKey = "\uF73B"; +CPDeleteLineFunctionKey = "\uF73C"; +CPInsertCharFunctionKey = "\uF73D"; +CPDeleteCharFunctionKey = "\uF73E"; +CPPrevFunctionKey = "\uF73F"; +CPNextFunctionKey = "\uF740"; +CPSelectFunctionKey = "\uF741"; +CPExecuteFunctionKey = "\uF742"; +CPUndoFunctionKey = "\uF743"; +CPRedoFunctionKey = "\uF744"; +CPFindFunctionKey = "\uF745"; +CPHelpFunctionKey = "\uF746"; +CPModeSwitchFunctionKey = "\uF747"; +CPEscapeFunctionKey = "\u001B"; +CPSpaceFunctionKey = "\u0020"; + + +CPDOMEventDoubleClick = "dblclick"; +CPDOMEventMouseDown = "mousedown"; +CPDOMEventMouseUp = "mouseup"; +CPDOMEventMouseMoved = "mousemove"; +CPDOMEventMouseDragged = "mousedrag"; +CPDOMEventKeyUp = "keyup"; +CPDOMEventKeyDown = "keydown"; +CPDOMEventKeyPress = "keypress"; +CPDOMEventCopy = "copy"; +CPDOMEventPaste = "paste"; +CPDOMEventScrollWheel = "mousewheel"; +CPDOMEventTouchStart = "touchstart"; +CPDOMEventTouchMove = "touchmove"; +CPDOMEventTouchEnd = "touchend"; +CPDOMEventTouchCancel = "touchcancel"; diff --git a/AppKit/CPKeyBinding.j b/AppKit/CPKeyBinding.j index 5018fc538..970973a3a 100644 --- a/AppKit/CPKeyBinding.j +++ b/AppKit/CPKeyBinding.j @@ -23,8 +23,8 @@ @import @import -@import "CPEvent.j" - +@import "CPEvent_Constants.j" +@import "CPText.j" CPStandardKeyBindings = { @"@.": @"cancelOperation:", diff --git a/AppKit/CPMenuItem/CPMenuItem.j b/AppKit/CPMenuItem/CPMenuItem.j index 12970ca8b..568507a59 100644 --- a/AppKit/CPMenuItem/CPMenuItem.j +++ b/AppKit/CPMenuItem/CPMenuItem.j @@ -25,6 +25,7 @@ @import @import "CPImage.j" +@import "CPText.j" @import "CPView.j" @import "_CPMenuItemView.j" diff --git a/AppKit/CPTableView.j b/AppKit/CPTableView.j index 2fbe2605f..dfbe0bb30 100644 --- a/AppKit/CPTableView.j +++ b/AppKit/CPTableView.j @@ -32,6 +32,7 @@ @import "CPScrollView.j" @import "CPTableColumn.j" @import "CPTableHeaderView.j" +@import "CPText.j" @import "_CPCornerView.j" @class CPButton diff --git a/AppKit/CPTextField.j b/AppKit/CPTextField.j index 9def02cd6..5cfa1644a 100644 --- a/AppKit/CPTextField.j +++ b/AppKit/CPTextField.j @@ -25,17 +25,14 @@ @import "CPControl.j" @import "CPStringDrawing.j" @import "CPCompatibility.j" +@import "CPText.j" +@import "CPWindow_Constants.j" @import "_CPImageAndTextView.j" @class CPPasteboard @global CPApp @global CPStringPboardType -@global CPWindowAbove -@global CPWindowBelow -@global CPWindowDidBecomeKeyNotification -@global CPWindowDidResignKeyNotification -@global CPWindowDidResignKeyNotification CPTextFieldSquareBezel = 0; /*! A textfield bezel with squared corners. */ CPTextFieldRoundedBezel = 1; /*! A textfield bezel with rounded corners. */ diff --git a/AppKit/CPTokenField.j b/AppKit/CPTokenField.j index e003351fa..092cbc87a 100755 --- a/AppKit/CPTokenField.j +++ b/AppKit/CPTokenField.j @@ -29,8 +29,9 @@ @import "CPButton.j" @import "CPScrollView.j" -@import "CPTextField.j" @import "CPTableView.j" +@import "CPText.j" +@import "CPTextField.j" @import "CPWindow_Constants.j" @import "_CPAutocompleteMenu.j" diff --git a/AppKit/CPUserDefaultsController.j b/AppKit/CPUserDefaultsController.j index 9f9399f37..61eae10d8 100644 --- a/AppKit/CPUserDefaultsController.j +++ b/AppKit/CPUserDefaultsController.j @@ -26,11 +26,10 @@ @import @import @import +@import @import "CPController.j" -@class CPUserDefaults - @global CPUserDefaultsDidChangeNotification diff --git a/AppKit/CPWindow/_CPWindow.j b/AppKit/CPWindow/_CPWindow.j index 4148a02d8..890e9e94a 100644 --- a/AppKit/CPWindow/_CPWindow.j +++ b/AppKit/CPWindow/_CPWindow.j @@ -26,10 +26,11 @@ @import "CGGeometry.j" @import "CPAnimation.j" +@import "CPEvent.j" @import "CPPlatformWindow.j" @import "CPResponder.j" @import "CPScreen.j" -@import "CPEvent.j" +@import "CPText.j" @import "CPView.j" @import "CPWindow_Constants.j" @import "_CPWindowView.j" diff --git a/AppKit/Platform/DOM/CPPlatform.j b/AppKit/Platform/DOM/CPPlatform.j index 2c63d79e9..9b287120d 100644 --- a/AppKit/Platform/DOM/CPPlatform.j +++ b/AppKit/Platform/DOM/CPPlatform.j @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +@global CPApp + if (typeof window["CPPlatformEnableHTMLDragAndDrop"] === "undefined") CPPlatformEnableHTMLDragAndDrop = NO; diff --git a/AppKit/Platform/DOM/CPPlatformWindow+DOM.j b/AppKit/Platform/DOM/CPPlatformWindow+DOM.j index c61690c0d..e67c3b7ff 100644 --- a/AppKit/Platform/DOM/CPPlatformWindow+DOM.j +++ b/AppKit/Platform/DOM/CPPlatformWindow+DOM.j @@ -113,15 +113,15 @@ @import @import "CPCursor.j" -@import "CPEvent.j" -@import "CPText.j" @import "CPCompatibility.j" @import "CPDOMWindowLayer.j" @import "CPDragServer_Constants.j" +@import "CPEvent.j" @import "CPPasteboard.j" @import "CPPlatform.j" @import "CPPlatformWindow.j" @import "CPPlatformWindow+DOMKeys.j" +@import "CPText.j" @import "CPWindow_Constants.j" @class CPDragServer diff --git a/AppKit/Themes/Aristo2/ThemeDescriptors.j b/AppKit/Themes/Aristo2/ThemeDescriptors.j index f812a605e..c8b9a8ae9 100644 --- a/AppKit/Themes/Aristo2/ThemeDescriptors.j +++ b/AppKit/Themes/Aristo2/ThemeDescriptors.j @@ -45,6 +45,7 @@ @import @import @import +@import @import var themedButtonValues = nil, diff --git a/AppKit/_CPPopUpList.j b/AppKit/_CPPopUpList.j index 4f86c0e40..024bc291a 100644 --- a/AppKit/_CPPopUpList.j +++ b/AppKit/_CPPopUpList.j @@ -20,8 +20,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -@import "CPTableView.j" @import "CPPanel.j" +@import "CPTableView.j" +@import "CPText.j" @import "_CPPopUpListDataSource.j" @class CPScrollView diff --git a/Tests/Foundation/CPExceptionTest.j b/Tests/Foundation/CPExceptionTest.j index 5296ce5d9..9c038223d 100644 --- a/Tests/Foundation/CPExceptionTest.j +++ b/Tests/Foundation/CPExceptionTest.j @@ -7,7 +7,7 @@ - (void)setUp { - var exception = [CPException exceptionWithName:@"CPGenericException" + exception = [CPException exceptionWithName:@"CPGenericException" reason:@"Margins must be positive" userInfo:nil]; } diff --git a/Tools/nib2cib/NSTextField.j b/Tools/nib2cib/NSTextField.j index bd0c689ad..9c0ce5bac 100644 --- a/Tools/nib2cib/NSTextField.j +++ b/Tools/nib2cib/NSTextField.j @@ -71,7 +71,7 @@ else { // // Adjust frame for difference between layout->bounds rect in IB - [self setFrame:CGRectInset(frame, 3.0, 0.0)]; + // [self setFrame:CGRectInset(frame, 3.0, 0.0)]; // Hack to get baselines to align var fontSize = [[self font] size]; diff --git a/Tools/nib2cib/Nib2Cib.j b/Tools/nib2cib/Nib2Cib.j index d64205851..74a91490e 100644 --- a/Tools/nib2cib/Nib2Cib.j +++ b/Tools/nib2cib/Nib2Cib.j @@ -24,6 +24,7 @@ @import @import @import +@import @import @import "Nib2CibKeyedUnarchiver.j"