From fb7e7253444fd54889469cce4a43018eeb681720 Mon Sep 17 00:00:00 2001
From: Wolfgang Lux <wolfgang.lux@gmail.com>
Date: Wed, 12 May 2010 14:47:10 +0000
Subject: [PATCH] Fix a rather long standing incompatibility between GNUstep
 and Cocoa and make -initWithContentRect:styleMask:backing:defer: the
 designated initializer of NSWindow.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@30368 72102866-910b-0410-8b05-ffd578937521
---
 ChangeLog         |  6 ++++
 Source/NSWindow.m | 82 +++++++++++++++++++++++++----------------------
 2 files changed, 49 insertions(+), 39 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3830a8094..5abb36b48 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-05-12  Wolfgang Lux  <wolfgang.lux@gmail.com>
+
+	* Source/NSWindow.m: Fix a rather long standing incompatibility
+	and make -initWithContentRect:styleMask:backing:defer: the
+	designated initializer of NSWindow.
+
 2010-05-12  Wolfgang Lux  <wolfgang.lux@gmail.com>
 
 	* Source/GSNibLoading.m (-nibInstantiateWithOwner:topLevelObjects:):
diff --git a/Source/NSWindow.m b/Source/NSWindow.m
index 2a6d107b1..46abb9c7f 100644
--- a/Source/NSWindow.m
+++ b/Source/NSWindow.m
@@ -931,7 +931,8 @@ many times.
 /**
   <p> Initializes the receiver with a content rect of
   <var>contentRect</var>, a style mask of <var>styleMask</var>, and a
-  backing store type of <var>backingType</var>.  
+  backing store type of <var>backingType</var>.  This is the designated
+  initializer.
   </p>
 
   <p> The style mask values are <code>NSTitledWindowMask</code>, for a
@@ -951,41 +952,6 @@ many times.
                  styleMask: (unsigned int)aStyle
                    backing: (NSBackingStoreType)bufferingType
                      defer: (BOOL)flag
-{
-  return [self initWithContentRect: contentRect
-                         styleMask: aStyle
-                           backing: bufferingType
-                             defer: flag
-                            screen: nil];
-}
-
-/**
-  <p> Initializes the receiver with a content rect of
-  <var>contentRect</var>, a style mask of <var>styleMask</var>, a
-  backing store type of <var>backingType</var> and a boolean
-  <var>flag</var>.  <var>flag</var> specifies whether the window
-  should be created now (<code>NO</code>), or when it is displayed
-  (<code>YES</code>).  
-  </p>
-
-  <p> The style mask values are <code>NSTitledWindowMask</code>, for a
-  window with a title, <code>NSClosableWindowMask</code>, for a window
-  with a close widget, <code>NSMiniaturizableWindowMask</code>, for a
-  window with a miniaturize widget, and
-  <code>NSResizableWindowMask</code>, for a window with a resizing
-  widget.  These mask values can be OR'd in any combination.  
-  </p>
-
-  <p> Backing store values are <code>NSBackingStoreBuffered</code>,
-  <code>NSBackingStoreRetained</code> and
-  <code>NSBackingStoreNonretained</code>.  
-  </p> 
-*/
-- (id) initWithContentRect: (NSRect)contentRect
-                 styleMask: (unsigned int)aStyle
-                   backing: (NSBackingStoreType)bufferingType
-                     defer: (BOOL)flag
-                    screen: (NSScreen*)aScreen
 {
   NSRect  cframe;
   NSInterfaceStyle style = 
@@ -1011,9 +977,7 @@ many times.
   _attachedSheet = nil;
   _backingType = bufferingType;
   _styleMask = aStyle;
-  if (aScreen == nil)
-    aScreen = [NSScreen mainScreen];
-  ASSIGN(_screen, aScreen);
+  ASSIGN(_screen, [NSScreen mainScreen]);
   _depthLimit = [_screen depth];
   
   _frame = [NSWindow frameRectForContentRect: contentRect styleMask: aStyle];
@@ -1075,6 +1039,46 @@ many times.
   return self;
 }
 
+/**
+  <p> Initializes the receiver with a content rect of
+  <var>contentRect</var>, a style mask of <var>styleMask</var>, a
+  backing store type of <var>backingType</var> and a boolean
+  <var>flag</var>.  <var>flag</var> specifies whether the window
+  should be created now (<code>NO</code>), or when it is displayed
+  (<code>YES</code>).  
+  </p>
+
+  <p> The style mask values are <code>NSTitledWindowMask</code>, for a
+  window with a title, <code>NSClosableWindowMask</code>, for a window
+  with a close widget, <code>NSMiniaturizableWindowMask</code>, for a
+  window with a miniaturize widget, and
+  <code>NSResizableWindowMask</code>, for a window with a resizing
+  widget.  These mask values can be OR'd in any combination.  
+  </p>
+
+  <p> Backing store values are <code>NSBackingStoreBuffered</code>,
+  <code>NSBackingStoreRetained</code> and
+  <code>NSBackingStoreNonretained</code>.  
+  </p> 
+*/
+- (id) initWithContentRect: (NSRect)contentRect
+                 styleMask: (unsigned int)aStyle
+                   backing: (NSBackingStoreType)bufferingType
+                     defer: (BOOL)flag
+                    screen: (NSScreen*)aScreen
+{
+  self = [self initWithContentRect: contentRect
+                         styleMask: aStyle
+                           backing: bufferingType
+                             defer: flag];
+  if (self && aScreen != nil)
+    {
+      ASSIGN(_screen, aScreen);
+      _depthLimit = [_screen depth];
+    }
+  return self;
+}
+
 - (id) initWithWindowRef: (void *)windowRef
 {
   NSRect contentRect;