add our own Apple Event handler for the quit app event, fixes #16200

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76392 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
wxWidgets · Apr 22, 2014 · 60578d6 · 60578d6
1 parent fe49efa
commit 60578d6
Showing 1 changed file with 14 additions and 1 deletion.
diff --git a/src/osx/cocoa/utils.mm b/src/osx/cocoa/utils.mm
@@ -60,7 +60,10 @@ - (void)applicationWillFinishLaunching:(NSNotification *)application
 
     [appleEventManager setEventHandler:self andSelector:@selector(handleOpenAppEvent:withReplyEvent:)
                          forEventClass:kCoreEventClass andEventID:kAEOpenApplication];
-
+
+    [appleEventManager setEventHandler:self andSelector:@selector(handleQuitAppEvent:withReplyEvent:)
+                         forEventClass:kCoreEventClass andEventID:kAEQuitApplication];
+
     wxTheApp->OSXOnWillFinishLaunching();
 }
 
@@ -134,6 +137,16 @@ - (void)handleGetURLEvent:(NSAppleEventDescriptor *)event
         wxTheApp->OSXStoreOpenURL(cf.AsString());
 }
 
+- (void)handleQuitAppEvent:(NSAppleEventDescriptor *)event
+            withReplyEvent:(NSAppleEventDescriptor *)replyEvent
+{
+    if ( wxTheApp->OSXOnShouldTerminate() )
+    {
+        wxTheApp->OSXOnWillTerminate();
+        wxTheApp->ExitMainLoop();
+    }
+}
+
 - (void)handleOpenAppEvent:(NSAppleEventDescriptor *)event
            withReplyEvent:(NSAppleEventDescriptor *)replyEvent
 {