From 45a52767bd76e79c127eb451888341a65fe197cf Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Mon, 11 Nov 2002 09:07:58 +0000 Subject: [PATCH] Applied frame.cpp part of [ 606958 ] Mac Menubar proposal git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17828 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/mac/carbon/frame.cpp | 6 ++++++ src/mac/frame.cpp | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/src/mac/carbon/frame.cpp b/src/mac/carbon/frame.cpp index 4d83421744..09544ddd4d 100644 --- a/src/mac/carbon/frame.cpp +++ b/src/mac/carbon/frame.cpp @@ -231,6 +231,12 @@ 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(); + } } } diff --git a/src/mac/frame.cpp b/src/mac/frame.cpp index 4d83421744..09544ddd4d 100644 --- a/src/mac/frame.cpp +++ b/src/mac/frame.cpp @@ -231,6 +231,12 @@ 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(); + } } }