GetIcon() returns wxIconLocation, not wxIcon, now

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

diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp
index ebc798b4fd84c2824488c81e6814dd8f2c497dae..ad2eb4d5ea45d23143511b984a81e2091ddcab69 100644 (file)
--- 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))
 {
@@ -665,7 +665,7 @@ void wxApp::CleanUp()
 
 #ifndef __DARWIN__
 #  if __option(profile)
-    ProfilerDump( "\papp.prof" ) ;
+    ProfilerDump( (StringPtr)"\papp.prof" ) ;
     ProfilerTerm() ;
 #  endif
 #endif
@@ -1222,6 +1222,8 @@ void wxApp::OnIdle(wxIdleEvent& event)
     wxMacProcessNotifierAndPendingEvents();
 
   s_inOnIdle = FALSE;
+  if(!wxMenuBar::MacGetInstalledMenuBar() && wxMenuBar::MacGetCommonMenuBar())
+    wxMenuBar::MacGetCommonMenuBar()->MacInstallMenuBar();
 }
 
 void wxWakeUpIdle()
@@ -1399,7 +1401,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();
     }