From 757a2bf400a7ee0cdd54d55abacb93cd429395dd Mon Sep 17 00:00:00 2001
From: Alexander Ljungberg <aljungberg@wireload.net>
Date: Thu, 8 Mar 2012 12:05:12 +0000
Subject: [PATCH] nib2cib support for CPWindow autorecalculatesKeyViewLoop.

---
 AppKit/Cib/_CPCibWindowTemplate.j | 5 ++---
 Tools/nib2cib/NSWindowTemplate.j  | 5 ++++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/AppKit/Cib/_CPCibWindowTemplate.j b/AppKit/Cib/_CPCibWindowTemplate.j
index 808b74154..6d232a76c 100644
--- a/AppKit/Cib/_CPCibWindowTemplate.j
+++ b/AppKit/Cib/_CPCibWindowTemplate.j
@@ -125,14 +125,13 @@ var _CPCibWindowTemplateMinSizeKey                          = @"_CPCibWindowTemp
 
 - (id)_cibInstantiate
 {
-    var windowClass = CPClassFromString([self windowClass]);
+    var windowClass = CPClassFromString([self windowClass]),
+        theWindow = [[windowClass alloc] initWithContentRect:_windowRect styleMask:_windowStyleMask];
 
 /*    if (!windowClass)
         [NSException raise:NSInvalidArgumentException format:@"Unable to locate NSWindow class %@, using NSWindow",_windowClass];
         class=[NSWindow class];*/
 
-    var theWindow = [[windowClass alloc] initWithContentRect:_windowRect styleMask:_windowStyleMask];
-
     if (_minSize)
         [theWindow setMinSize:_minSize];
     if (_maxSize)
diff --git a/Tools/nib2cib/NSWindowTemplate.j b/Tools/nib2cib/NSWindowTemplate.j
index 4c903b5c4..5e79cd353 100644
--- a/Tools/nib2cib/NSWindowTemplate.j
+++ b/Tools/nib2cib/NSWindowTemplate.j
@@ -31,7 +31,9 @@ var NSBorderlessWindowMask          = 0x00,
     NSUtilityWindowMask             = 0x10,
     NSDocModalWindowMask            = 0x40,
     NSTexturedBackgroundWindowMask  = 0x100,
-    NSHUDBackgroundWindowMask       = 0x2000;
+    NSHUDBackgroundWindowMask       = 0x2000,
+
+    NSAutorecalculatesKeyViewLoopWTFlag = 0x800;
 
 @implementation _CPCibWindowTemplate (NSCoding)
 
@@ -50,6 +52,7 @@ var NSBorderlessWindowMask          = 0x00,
         _screenRect = [aCoder decodeRectForKey:@"NSScreenRect"]; // screen created on
         _viewClass = [aCoder decodeObjectForKey:@"NSViewClass"]; // references the toolbar if present (anything else?)
         _wtFlags = [aCoder decodeIntForKey:@"NSWTFlags"];
+        _windowAutorecalculatesKeyViewLoop = !!(_wtFlags & NSAutorecalculatesKeyViewLoopWTFlag);
         _windowBacking = [aCoder decodeIntForKey:@"NSWindowBacking"];
 
         // Convert NSWindows to CPWindows.