From cc0503c8a4496faf2ee86e29911c07ef512074a6 Mon Sep 17 00:00:00 2001 From: Aparajita Fishman Date: Mon, 21 Jan 2013 12:07:03 +0700 Subject: [PATCH] Fixed missing import, deprecated CP functions, misnamed ivar --- Foundation/CPKeyedArchiver.j | 7 ++++--- Tools/nib2cib/NSWindowTemplate.j | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Foundation/CPKeyedArchiver.j b/Foundation/CPKeyedArchiver.j index 5dec686e2..a039edd9d 100644 --- a/Foundation/CPKeyedArchiver.j +++ b/Foundation/CPKeyedArchiver.j @@ -27,6 +27,7 @@ @import "CPNumber.j" @import "CPString.j" @import "CPValue.j" +@import "_CGGeometry.j" var CPArchiverReplacementClassNames = nil; @@ -321,7 +322,7 @@ var _CPKeyedArchiverStringClass = Nil, */ - (void)encodePoint:(CGPoint)aPoint forKey:(CPString)aKey { - [_plistObject setObject:_CPKeyedArchiverEncodeObject(self, CPStringFromPoint(aPoint), NO) forKey:aKey]; + [_plistObject setObject:_CPKeyedArchiverEncodeObject(self, CGStringFromPoint(aPoint), NO) forKey:aKey]; } /*! @@ -331,7 +332,7 @@ var _CPKeyedArchiverStringClass = Nil, */ - (void)encodeRect:(CGRect)aRect forKey:(CPString)aKey { - [_plistObject setObject:_CPKeyedArchiverEncodeObject(self, CPStringFromRect(aRect), NO) forKey:aKey]; + [_plistObject setObject:_CPKeyedArchiverEncodeObject(self, CGStringFromRect(aRect), NO) forKey:aKey]; } /*! @@ -341,7 +342,7 @@ var _CPKeyedArchiverStringClass = Nil, */ - (void)encodeSize:(CGSize)aSize forKey:(CPString)aKey { - [_plistObject setObject:_CPKeyedArchiverEncodeObject(self, CPStringFromSize(aSize), NO) forKey:aKey]; + [_plistObject setObject:_CPKeyedArchiverEncodeObject(self, CGStringFromSize(aSize), NO) forKey:aKey]; } /*! diff --git a/Tools/nib2cib/NSWindowTemplate.j b/Tools/nib2cib/NSWindowTemplate.j index 6ef87a23e..d728bfa50 100644 --- a/Tools/nib2cib/NSWindowTemplate.j +++ b/Tools/nib2cib/NSWindowTemplate.j @@ -87,7 +87,7 @@ var NSBorderlessWindowMask = 0x00, (_windowStyleMask & NSDocModalWindowMask ? CPDocModalWindowMask : 0) | (_windowStyleMask & NSHUDBackgroundWindowMask ? CPHUDBackgroundWindowMask : 0); - _windowIsFullBridge = [aCoder decodeObjectForKey:"NSFrameAutosaveName"] === "CPBorderlessBridgeWindowMask"; + _windowIsFullPlatformWindow = [aCoder decodeObjectForKey:"NSFrameAutosaveName"] === "CPBorderlessBridgeWindowMask"; /*if (![_windowClass isEqualToString:@"NSPanel"]) _windowRect.origin.y -= [NSMainMenuView menuHeight]; // compensation for the additional menu bar