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 ebbb1498bef734f6546016c2febd2d9440c81084..ad2eb4d5ea45d23143511b984a81e2091ddcab69 100644 (file)
--- 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 ebbb1498bef734f6546016c2febd2d9440c81084..ad2eb4d5ea45d23143511b984a81e2091ddcab69 100644 (file)
--- 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()