Now sends an exit command to the app so Quit behaves as it should

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25804 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/app.cpp b/src/mac/app.cpp
index 42e2c0aba8a650105bbe87cbc893b1e841c57695..0b4b57cc2ff36bb79c4031d5c5b06f97eaf99d81 100644 (file)
--- a/src/mac/app.cpp
+++ b/src/mac/app.cpp
@@ -231,12 +231,14 @@ short wxApp::MacHandleAEOApp(const WXEVENTREF WXUNUSED(event) , WXEVENTREF WXUNU
 
 short wxApp::MacHandleAEQuit(const WXEVENTREF WXUNUSED(event) , WXEVENTREF WXUNUSED(reply))
 {
 
 short wxApp::MacHandleAEQuit(const WXEVENTREF WXUNUSED(event) , WXEVENTREF WXUNUSED(reply))
 {

-       wxWindow* win = GetTopWindow() ;
+    wxWindow* win = GetTopWindow() ;

     if ( win )
     {
     if ( win )
     {

-        win->Close(TRUE ) ;
+        wxCommandEvent exitEvent(wxEVT_COMMAND_MENU_SELECTED, s_macExitMenuItemId);
+        if (!win->ProcessEvent(exitEvent))
+            win->Close(TRUE ) ;

     }
     }

-       else
+    else

     {
         ExitMainLoop() ;
     }
     {
         ExitMainLoop() ;
     }

diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp
index 42e2c0aba8a650105bbe87cbc893b1e841c57695..0b4b57cc2ff36bb79c4031d5c5b06f97eaf99d81 100644 (file)
--- a/src/mac/carbon/app.cpp
+++ b/src/mac/carbon/app.cpp
@@ -231,12 +231,14 @@ short wxApp::MacHandleAEOApp(const WXEVENTREF WXUNUSED(event) , WXEVENTREF WXUNU
 
 short wxApp::MacHandleAEQuit(const WXEVENTREF WXUNUSED(event) , WXEVENTREF WXUNUSED(reply))
 {
 
 short wxApp::MacHandleAEQuit(const WXEVENTREF WXUNUSED(event) , WXEVENTREF WXUNUSED(reply))
 {

-       wxWindow* win = GetTopWindow() ;
+    wxWindow* win = GetTopWindow() ;

     if ( win )
     {
     if ( win )
     {

-        win->Close(TRUE ) ;
+        wxCommandEvent exitEvent(wxEVT_COMMAND_MENU_SELECTED, s_macExitMenuItemId);
+        if (!win->ProcessEvent(exitEvent))
+            win->Close(TRUE ) ;

     }
     }

-       else
+    else

     {
         ExitMainLoop() ;
     }
     {
         ExitMainLoop() ;
     }