gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-23 07:00:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Send -applicationShouldTerminateAfterLastWindowClosed: to the delegate

Browse source 
only after a short delay so that all observers can process the
NSWindowWillCloseNotification. This ensures that a modified document
associated with the closed window has been closed before -terminate:
is called and therefore the user isn't asked twice whether she wants
to save the unsaved changes.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@29428 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Wolfgang Lux 2010-01-28 00:10:42 +00:00
parent 460f7f7c39
commit 1ace430690
2 changed files with 51 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,13 @@
2010-01-28 Wolfgang Lux <wolfgang.lux@gmail.com>
* Source/NSApplication.m (-_windowWillClose:, -_lastWindowClosed:):
Send -applicationShouldTerminateAfterLastWindowClosed: to the
delegate only after a short delay so that all observers can
process the NSWindowWillCloseNotification. This ensures that a
modified document associated with the closed window has been
closed before -terminate: is called and therefore the user isn't
asked twice whether she wants to save the unsaved changes.
2010-01-28 Wolfgang Lux <wolfgang.lux@gmail.com>
* Source/GSIconManager.m (GSGetIconFrame): Don't touch icon

76
Source/NSApplication.m
View file

@ -3932,56 +3932,62 @@ struct _DelegateWrapper
}
}
- (void) _lastWindowClosed
{
if ([_delegate respondsToSelector:
@selector(applicationShouldTerminateAfterLastWindowClosed:)])
{
if ([_delegate
applicationShouldTerminateAfterLastWindowClosed: self])
{
[self terminate: self];
}
}
/* wlux 2009-10-17: If we use MS Windows style menus, terminate
the application by default when the last window is closed. */
else if (NSInterfaceStyleForKey(@"NSMenuInterfaceStyle", nil) ==
NSWindows95InterfaceStyle)
{
[self terminate: self];
}
}
- (void) _windowWillClose: (NSNotification*) notification
{
NSWindow *win = [notification object];
if (_app_is_running)
{
/* FIXME Don't use GSOrderedWindows(), since it may not return all
windows when the application is hidden. E.g., given a hidden
application with a single window with canHide == NO, if the user
closes this window it would appear as if the last window was closed. */
NSArray *windows_list = GSOrderedWindows();
unsigned count = [windows_list count];
NSEnumerator *iter = [windows_list objectEnumerator];
NSMutableArray *list = [NSMutableArray arrayWithCapacity: count];
BOOL wasLast = YES;
NSWindow *tmp;
/* FIXME: Why are non-visible windows not counted? When there are
minimized windows left over, this would still terminate the application.
*/
while ((tmp = [iter nextObject]))
{
if ([tmp canBecomeMainWindow] == YES && [tmp isVisible] == YES)
if (tmp != win && [tmp canBecomeMainWindow] == YES)
{
[list addObject: tmp];
}
}
[list removeObjectIdenticalTo: win];
count = [list count];
/* If there's only one window left, and that's the one being closed,
then we ask the delegate if the app is to be terminated. */
if (count == 0)
{
if ([_delegate respondsToSelector:
@selector(applicationShouldTerminateAfterLastWindowClosed:)])
{
if ([_delegate
applicationShouldTerminateAfterLastWindowClosed: self])
{
[self terminate: self];
}
}
/*
wlux 2009-10-17: If we use MS Windows style menus, we terminate
the application by default if the last window is closed.
FIXME: I think we should send [self interfaceStyle] here, but
this does not return a meaningful result at present.
*/
else if (NSInterfaceStyleForKey(@"NSMenuInterfaceStyle", nil) ==
NSWindows95InterfaceStyle)
{
[self terminate: self];
wasLast = NO;
break;
}
}
/* Perform _lastWindowDidClose at the end of the event loop cycle so
that all interested objects are notified before we terminate the
application. In particular, this means that a modified document
associated with the closed window has been closed before -terminate:
is called and therefore the user isn't asked twice whether she wants
to save that document's unsaved changes. */
if (wasLast)
{
[self performSelector: @selector(_lastWindowClosed)
withObject: nil
afterDelay: 0.1];
}
}
}