diff --git a/ChangeLog b/ChangeLog index c57117c35..9d5b32a56 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2002-02-18 Gregory John Casamento + + * Source/NSWindow.m ([NSWindow -close]): Changes made earlier + would not compile w/ gcc < 3.0. + 2002-02-18 Pierre-Yves Rivaille * Source/NSTableHeaderView.m ([NSTableHeaderView -mouseDown:]): diff --git a/Source/NSWindow.m b/Source/NSWindow.m index 86d1ae590..07e89d08f 100644 --- a/Source/NSWindow.m +++ b/Source/NSWindow.m @@ -2023,25 +2023,21 @@ resetCursorRectsForView(NSView *theView) */ - (void) close { - if (_f.has_closed == YES) - { - // already closed - return; - } - - CREATE_AUTORELEASE_POOL(pool); - - [nc postNotificationName: NSWindowWillCloseNotification object: self]; - _f.has_opened = NO; - [[NSRunLoop currentRunLoop] - cancelPerformSelector: @selector(_handleWindowNeedsDisplay:) - target: self - argument: nil]; - [NSApp removeWindowsItem: self]; - [self orderOut: self]; - RELEASE(pool); if (_f.has_closed == NO) { + CREATE_AUTORELEASE_POOL(pool); + + [nc postNotificationName: NSWindowWillCloseNotification object: self]; + _f.has_opened = NO; + [[NSRunLoop currentRunLoop] + cancelPerformSelector: @selector(_handleWindowNeedsDisplay:) + target: self + argument: nil]; + [NSApp removeWindowsItem: self]; + [self orderOut: self]; + + RELEASE(pool); + _f.has_closed = YES; if (_f.is_released_when_closed) {