From: David Elliott <dfe@tgwbd.org>
Date: Thu, 19 Jun 2003 18:20:26 +0000 (+0000)
Subject: In wxApp::OnIdle() check to see if there is not a current menubar and if
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/3fdac2ab39c2a8509a1b8f4a0589f4a82b410156

In wxApp::OnIdle() check to see if there is not a current menubar and if
there is a common menubar, install it.


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

diff --git a/src/mac/app.cpp b/src/mac/app.cpp
index ebbb1498be..ad2eb4d5ea 100644
--- a/src/mac/app.cpp
+++ b/src/mac/app.cpp
@@ -1222,6 +1222,8 @@ void wxApp::OnIdle(wxIdleEvent& event)
     wxMacProcessNotifierAndPendingEvents();
 
   s_inOnIdle = FALSE;
+  if(!wxMenuBar::MacGetInstalledMenuBar() && wxMenuBar::MacGetCommonMenuBar())
+    wxMenuBar::MacGetCommonMenuBar()->MacInstallMenuBar();
 }
 
 void wxWakeUpIdle()
diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp
index ebbb1498be..ad2eb4d5ea 100644
--- a/src/mac/carbon/app.cpp
+++ b/src/mac/carbon/app.cpp
@@ -1222,6 +1222,8 @@ void wxApp::OnIdle(wxIdleEvent& event)
     wxMacProcessNotifierAndPendingEvents();
 
   s_inOnIdle = FALSE;
+  if(!wxMenuBar::MacGetInstalledMenuBar() && wxMenuBar::MacGetCommonMenuBar())
+    wxMenuBar::MacGetCommonMenuBar()->MacInstallMenuBar();
 }
 
 void wxWakeUpIdle()