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

* Headers/AppKit/NSWindow.h: Minor cleanup and spacing.

Browse source 
* Source/GSNibTemplates.m: Removed call to designated init, since
	this is handled by the initWithCOoder method in NSWindow.m.
	* Source/NSWindow.m: Correction for calling the designated initializer.
	Fix for bug#23336.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@26567 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
gcasa 2008-05-24 15:00:12 +00:00
parent 3e0abcb588
commit 71462c5bac
4 changed files with 25 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2008-05-24 10:54-EDT Gregory John Casamento <greg_casamento@yahoo.com>
* Headers/AppKit/NSWindow.h: Minor cleanup and spacing.
* Source/GSNibTemplates.m: Removed call to designated init, since
this is handled by the initWithCOoder method in NSWindow.m.
* Source/NSWindow.m: Correction for calling the designated initializer.
Fix for bug#23336.
2008-05-21 Fred Kiefer <FredKiefer@gmx.de> 2008-05-21 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSAttributedString.m (-_substituteFontFor:font:fromList:): * Source/NSAttributedString.m (-_substituteFontFor:font:fromList:):

8
Headers/AppKit/NSWindow.h
View file

@ -191,16 +191,16 @@ APPKIT_EXPORT NSSize NSTokenSize;
NSRect _rectNeedingFlush; NSRect _rectNeedingFlush;
NSMutableArray *_rectsBeingDrawn; NSMutableArray *_rectsBeingDrawn;
unsigned _disableFlushWindow; unsigned _disableFlushWindow;
NSWindowDepth _depthLimit; NSWindowDepth _depthLimit;
NSWindowController *_windowController; NSWindowController *_windowController;
int _counterpart; int _counterpart;
float _alphaValue; float _alphaValue;
NSMutableArray *_children; NSMutableArray *_children;
NSWindow *_parent; NSWindow *_parent;
NSCachedImageRep *_cachedImage; NSCachedImageRep *_cachedImage;
NSPoint _cachedImageOrigin; NSPoint _cachedImageOrigin;
struct GSWindowFlagsType { struct GSWindowFlagsType {
unsigned accepts_drag:1; unsigned accepts_drag:1;

42
Source/GSNibTemplates.m
View file

@ -910,40 +910,20 @@ static NSString *GSInternalNibItemAddedNotification = @"_GSInternalNibItemAddedN
_screenRect = [[_object screen] frame]; _screenRect = [[_object screen] frame];
} }
if ([self shouldSwapClass]) // FIXME: The designated initializer logic for NSWindow is in the initWithCoder: method of
{ // NSWindow. Unfortunately, this means that the "defer" flag for NSWindows and NSWindow
if (GSGetMethod([obj class], @selector(initWithContentRect:styleMask:backing:defer:), YES, NO) != NULL // subclasses in gorm files will be ignored. This shouldn't have a great impact,
&& ![_className isEqualToString: NSStringFromClass(_superClass)]) // but it is not the correct behavior.
{
NSView *contentView = [obj contentView];
// if we are not in an interface builder, call //
// designated initializer per spec... // Set all of the attributes into the object, if it
RETAIN(contentView); // prevent view from being deallocated. // responds to any of these methods.
obj = [obj initWithContentRect: [contentView frame] //
styleMask: [obj styleMask] if ([obj respondsToSelector: @selector(setAutoPositionMask:)])
backing: [obj backingType]
defer: _deferFlag];
// set the content view back
[obj setContentView: contentView];
RELEASE(contentView); // release view.
}
// autoposition window
[self autoPositionWindow: obj];
}
else
{ {
// [obj setAutoPositionMask: [self autoPositionMask]];
// Set all of the attributes into the object, if it
// responds to any of these methods.
//
if ([obj respondsToSelector: @selector(setAutoPositionMask:)])
{
[obj setAutoPositionMask: [self autoPositionMask]];
}
} }
RELEASE(self); RELEASE(self);
} }
return obj; return obj;

4
Source/NSWindow.m
View file

@ -4899,11 +4899,11 @@ current key view.<br />
[aDecoder decodeValueOfObjCType: @encode(NSBackingStoreType) [aDecoder decodeValueOfObjCType: @encode(NSBackingStoreType)
at: &aBacking]; at: &aBacking];
// call the designated initializer....
self = [self initWithContentRect: aRect self = [self initWithContentRect: aRect
styleMask: aStyle styleMask: aStyle
backing: aBacking backing: aBacking
defer: NO defer: NO];
screen: nil];
p = [aDecoder decodePoint]; p = [aDecoder decodePoint];
obj = [aDecoder decodeObject]; obj = [aDecoder decodeObject];