From c48ab519e93a858aa64faa817e655cff974b61af Mon Sep 17 00:00:00 2001 From: gcasa Date: Sun, 2 Aug 2009 14:16:13 +0000 Subject: [PATCH] * Headers/AppKit/NSWindow.h * Source/NSApplication.m * Source/NSWindow.m: Added ivar for attached sheet back. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@28433 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 6 ++++++ Headers/AppKit/NSWindow.h | 2 +- Source/NSApplication.m | 2 +- Source/NSWindow.m | 7 +++---- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index a84e4379d..8c6150b00 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2009-08-02 10:15-EDT Gregory John Casamento + + * Headers/AppKit/NSWindow.h + * Source/NSApplication.m + * Source/NSWindow.m: Added ivar for attached sheet back. + 2009-08-01 20:28-EDT Gregory John Casamento * config.make.in: Change to include BUILD_SPEECH in output diff --git a/Headers/AppKit/NSWindow.h b/Headers/AppKit/NSWindow.h index 4266f3f00..b9edc6989 100644 --- a/Headers/AppKit/NSWindow.h +++ b/Headers/AppKit/NSWindow.h @@ -203,7 +203,7 @@ APPKIT_EXPORT NSSize NSTokenSize; NSWindow *_parent; NSCachedImageRep *_cachedImage; NSPoint _cachedImageOrigin; - // NSWindow *_attachedSheet; + NSWindow *_attachedSheet; struct GSWindowFlagsType { unsigned accepts_drag:1; diff --git a/Source/NSApplication.m b/Source/NSApplication.m index 26f59be26..8adcd338b 100644 --- a/Source/NSApplication.m +++ b/Source/NSApplication.m @@ -382,7 +382,7 @@ struct _NSModalSession { */ - (void) setAttachedSheet: (id) sheet { - // _attachedSheet = sheet; + _attachedSheet = sheet; } @end diff --git a/Source/NSWindow.m b/Source/NSWindow.m index fa3a44f3d..91d014753 100644 --- a/Source/NSWindow.m +++ b/Source/NSWindow.m @@ -985,8 +985,8 @@ many times. /* Initialize attributes and flags */ [super init]; [self _initDefaults]; - - // _attachedSheet = nil; + + _attachedSheet = nil; _backingType = bufferingType; _styleMask = aStyle; if (aScreen == nil) @@ -5102,8 +5102,7 @@ current key view.
- (NSWindow *) attachedSheet { - // return _attachedSheet; - return nil; + return _attachedSheet; } @end