From c3d8f4f80b704508ed43e23fa74193b64fcdc74c Mon Sep 17 00:00:00 2001 From: Antoine Mercadal Date: Fri, 18 Jan 2013 14:46:49 -0800 Subject: [PATCH] Fix bug in NSWindowTemplate.j where using a non existing ivar --- Tools/nib2cib/NSWindowTemplate.j | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Tools/nib2cib/NSWindowTemplate.j b/Tools/nib2cib/NSWindowTemplate.j index b72ae26f8..455c5abb5 100644 --- a/Tools/nib2cib/NSWindowTemplate.j +++ b/Tools/nib2cib/NSWindowTemplate.j @@ -59,7 +59,10 @@ var NSBorderlessWindowMask = 0x00, _viewClass = [aCoder decodeObjectForKey:@"NSViewClass"]; // references the toolbar if present (anything else?) _wtFlags = [aCoder decodeIntForKey:@"NSWTFlags"]; _windowAutorecalculatesKeyViewLoop = !!(_wtFlags & NSAutorecalculatesKeyViewLoopWTFlag); - _windowBacking = [aCoder decodeIntForKey:@"NSWindowBacking"]; + + // @TODO: this seems to not be used anywhere, maybe we should safely remove this + // from Antoine the 18 Jan 2013 + // _windowBacking = [aCoder decodeIntForKey:@"NSWindowBacking"]; // Convert NSWindows to CPWindows. _windowClass = CP_NSMapClassName([aCoder decodeObjectForKey:@"NSWindowClass"]); @@ -84,7 +87,7 @@ var NSBorderlessWindowMask = 0x00, (_windowStyleMask & NSDocModalWindowMask ? CPDocModalWindowMask : 0) | (_windowStyleMask & NSHUDBackgroundWindowMask ? CPHUDBackgroundWindowMask : 0); - _windowIsFullBridge = [aCoder decodeObjectForKey:"NSFrameAutosaveName"] === "CPBorderlessBridgeWindowMask"; + [self setFullBridge:([aCoder decodeObjectForKey:"NSFrameAutosaveName"] === "CPBorderlessBridgeWindowMask")]; /*if (![_windowClass isEqualToString:@"NSPanel"]) _windowRect.origin.y -= [NSMainMenuView menuHeight]; // compensation for the additional menu bar