From 80061353efbf7e7e60e993b4a28193b01f352486 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Fri, 9 Jan 2009 17:30:45 +0000 Subject: [PATCH] menubar activation, fixes #10352 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@57952 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/mac/carbon/frame.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/mac/carbon/frame.cpp b/src/mac/carbon/frame.cpp index b4da3e565f..ad625088a0 100644 --- a/src/mac/carbon/frame.cpp +++ b/src/mac/carbon/frame.cpp @@ -105,7 +105,9 @@ bool wxFrame::Enable(bool enable) if ( !wxWindow::Enable(enable) ) return false; - if ( m_frameMenuBar && m_frameMenuBar == wxMenuBar::MacGetInstalledMenuBar() ) + // we should always enable/disable the menubar, even if we are not current, otherwise + // we might miss some state change later (happened eg in the docview sample after PrintPreview) + if ( m_frameMenuBar /* && m_frameMenuBar == wxMenuBar::MacGetInstalledMenuBar() */ ) { int iMaxMenu = m_frameMenuBar->GetMenuCount(); for ( int i = 0 ; i < iMaxMenu ; ++ i )