X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/84a667dc065e2a6fac37e9287a81b7bc02aa4056..ff699386b9b709c069ecc3c24acd6f7f4644d23e:/src/mac/carbon/app.cpp

diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp
index bedbae9605..f3ef282530 100644
--- a/src/mac/carbon/app.cpp
+++ b/src/mac/carbon/app.cpp
@@ -219,7 +219,7 @@ short wxApp::MacHandleAEOApp(const WXEVENTREF WXUNUSED(event) , WXEVENTREF WXUNU
     return noErr ;
 }
 
-// AEQuit attempts to quite the application
+// AEQuit attempts to quit the application
 
 short wxApp::MacHandleAEQuit(const WXEVENTREF WXUNUSED(event) , WXEVENTREF WXUNUSED(reply))
 {
@@ -651,6 +651,7 @@ void wxApp::CleanUp()
         delete wxWinMacControlList ;
     }
     delete wxPendingEvents;
+    wxPendingEvents = NULL;
 
 #if wxUSE_THREADS
     delete wxPendingEventsLocker;
@@ -1398,7 +1399,8 @@ void wxApp::MacSuspend( bool convertClipboard )
     while (node)
     {
         wxTopLevelWindow* win = (wxTopLevelWindow*) node->Data();
-        win->MacActivate( ((EventRecord*) MacGetCurrentEvent())->when , false ) ;
+        if (!win->HasFlag(wxSTAY_ON_TOP))
+            win->MacActivate( ((EventRecord*) MacGetCurrentEvent())->when , false ) ;
 
         node = node->GetNext();
     }