X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e40865607cd25e82e438fe2b5c9d54c397e1e84c..05ac7ac5785ef0ddb1bd04585f3c59c5d53089be:/src/mac/carbon/frame.cpp

diff --git a/src/mac/carbon/frame.cpp b/src/mac/carbon/frame.cpp
index 4fe1aec422..7f1860a837 100644
--- a/src/mac/carbon/frame.cpp
+++ b/src/mac/carbon/frame.cpp
@@ -132,7 +132,8 @@ bool wxFrame::Enable(bool enable)
 
 	if ( m_frameMenuBar && m_frameMenuBar == wxMenuBar::MacGetInstalledMenuBar() )
 	{
-		for ( int i = 0 ; i < m_frameMenuBar->GetMenuCount() ; ++ i )
+ 		int iMaxMenu = m_frameMenuBar->GetMenuCount(); 
+		for ( int i = 0 ; i < iMaxMenu ; ++ i )
 		{
 			m_frameMenuBar->EnableTop( i , enable ) ;
 		}
@@ -230,9 +231,35 @@ void wxFrame::OnActivate(wxActivateEvent& event)
 	    {
 	    	m_frameMenuBar->MacInstallMenuBar() ;
 	    }
+	    else if (wxTheApp->GetTopWindow() && wxTheApp->GetTopWindow()->IsKindOf(CLASSINFO(wxFrame)))
+        {
+            // Trying toplevel frame menbar
+            if( ((wxFrame*)wxTheApp->GetTopWindow())->GetMenuBar() )
+	            ((wxFrame*)wxTheApp->GetTopWindow())->GetMenuBar()->MacInstallMenuBar();
+ 	    }
 	}
 }
 
+void wxFrame::DetachMenuBar()
+{
+    if ( m_frameMenuBar )
+    {
+        m_frameMenuBar->UnsetInvokingWindow();
+    }
+
+    wxFrameBase::DetachMenuBar();
+}
+
+void wxFrame::AttachMenuBar( wxMenuBar *menuBar )
+{
+    wxFrameBase::AttachMenuBar(menuBar);
+
+    if (m_frameMenuBar)
+    {
+        m_frameMenuBar->SetInvokingWindow( this );
+    }
+}
+
 void wxFrame::DoGetClientSize(int *x, int *y) const
 {
 	wxWindow::DoGetClientSize( x , y ) ;