Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Applied frame.cpp part of [ 606958 ] Mac Menubar proposal

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17828 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2002-11-11 09:07:58 +00:00
parent 888eaa3d8c
commit 45a52767bd
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/mac/carbon/frame.cpp
View File

@@ -231,6 +231,12 @@ void wxFrame::OnActivate(wxActivateEvent& event)
{ {
m_frameMenuBar->MacInstallMenuBar() ; 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();
}
} }
} }

6
src/mac/frame.cpp
View File

@@ -231,6 +231,12 @@ void wxFrame::OnActivate(wxActivateEvent& event)
{ {
m_frameMenuBar->MacInstallMenuBar() ; 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();
}
} }
} }