Applied patch [ 735304 ] wxDisplay::ChangeMode - does not resize full-screen windows

[wxWidgets.git] / src / mac / app.cpp

diff --git a/src/mac/app.cpp b/src/mac/app.cpp
index 71ea9d67d1786234d6a3b2e287a41b5f879bd14c..ecf1ec44b2d1a52e09e406c9f64582f1fb2d18d8 100644 (file)
--- a/src/mac/app.cpp
+++ b/src/mac/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))
 {
@@ -303,10 +303,7 @@ void wxApp::MacNewFile()
 
 static pascal OSStatus MenuEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
 {
-    OSStatus result = eventNotHandledErr ;
-    UInt32 kind = GetEventKind( event ) ;
-
-    return result ;
+    return eventNotHandledErr ;
 }
 
 // due to the rather low-level event API of wxWindows, we cannot use RunApplicationEventLoop
@@ -654,6 +651,7 @@ void wxApp::CleanUp()
         delete wxWinMacControlList ;
     }
     delete wxPendingEvents;
+    wxPendingEvents = NULL;
 
 #if wxUSE_THREADS
     delete wxPendingEventsLocker;
@@ -1401,7 +1399,12 @@ void wxApp::MacSuspend( bool convertClipboard )
     while (node)
     {
         wxTopLevelWindow* win = (wxTopLevelWindow*) node->Data();
-        win->MacActivate( ((EventRecord*) MacGetCurrentEvent())->when , false ) ;
+#if TARGET_CARBON
+#if 0 //  having problems right now with that
+        if (!win->HasFlag(wxSTAY_ON_TOP))
+#endif  
+#endif
+            win->MacActivate( ((EventRecord*) MacGetCurrentEvent())->when , false ) ;
 
         node = node->GetNext();
     }