gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-05-31 07:10:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix a rather long standing incompatibility between GNUstep and Cocoa

Browse source 
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
This commit is contained in:
Wolfgang Lux 2010-05-12 14:47:10 +00:00
parent 77eaadf3ae
commit fb7e725344
2 changed files with 49 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -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> 2010-05-12 Wolfgang Lux <wolfgang.lux@gmail.com>
* Source/GSNibLoading.m (-nibInstantiateWithOwner:topLevelObjects:): * Source/GSNibLoading.m (-nibInstantiateWithOwner:topLevelObjects:):

82
Source/NSWindow.m
View file

@ -931,7 +931,8 @@ many times.
/** /**
<p> Initializes the receiver with a content rect of <p> Initializes the receiver with a content rect of
<var>contentRect</var>, a style mask of <var>styleMask</var>, and a <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>
<p> The style mask values are <code>NSTitledWindowMask</code>, for a <p> The style mask values are <code>NSTitledWindowMask</code>, for a
@ -951,41 +952,6 @@ many times.
styleMask: (unsigned int)aStyle styleMask: (unsigned int)aStyle
backing: (NSBackingStoreType)bufferingType backing: (NSBackingStoreType)bufferingType
defer: (BOOL)flag 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; NSRect cframe;
NSInterfaceStyle style = NSInterfaceStyle style =
@ -1011,9 +977,7 @@ many times.
_attachedSheet = nil; _attachedSheet = nil;
_backingType = bufferingType; _backingType = bufferingType;
_styleMask = aStyle; _styleMask = aStyle;
if (aScreen == nil) ASSIGN(_screen, [NSScreen mainScreen]);
aScreen = [NSScreen mainScreen];
ASSIGN(_screen, aScreen);
_depthLimit = [_screen depth]; _depthLimit = [_screen depth];
_frame = [NSWindow frameRectForContentRect: contentRect styleMask: aStyle]; _frame = [NSWindow frameRectForContentRect: contentRect styleMask: aStyle];
@ -1075,6 +1039,46 @@ many times.
return self; 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 - (id) initWithWindowRef: (void *)windowRef
{ {
NSRect contentRect; NSRect contentRect;