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

added menubar update OnActivate for multiple frames with their own menubars, it's not perfect (menu merge) would be better, but at last something

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9441 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2001-02-28 13:04:19 +00:00
parent c809f3be86
commit 41f38f4d59
4 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -230,7 +230,7 @@ void wxFrame::SetMenuBar(wxMenuBar *menuBar)
m_frameMenuBar = NULL; m_frameMenuBar = NULL;
m_frameMenuBar = menuBar; m_frameMenuBar = menuBar;
m_frameMenuBar->MacInstallMenuBar() ; // m_frameMenuBar->MacInstallMenuBar() ;
m_frameMenuBar->Attach(this); m_frameMenuBar->Attach(this);
} }
@@ -283,9 +283,14 @@ void wxFrame::OnActivate(wxActivateEvent& event)
) )
{ {
child->SetFocus(); child->SetFocus();
return; break;
} }
} }
if ( m_frameMenuBar != NULL )
{
m_frameMenuBar->MacInstallMenuBar() ;
}
} }
void wxFrame::DoGetClientSize(int *x, int *y) const void wxFrame::DoGetClientSize(int *x, int *y) const

3
src/mac/carbon/menu.cpp
View File

@@ -631,6 +631,9 @@ void wxMenuBar::RebuildAccelTable()
void wxMenuBar::MacInstallMenuBar() void wxMenuBar::MacInstallMenuBar()
{ {
if ( s_macInstalledMenuBar == this )
return ;
Handle menubar = ::GetNewMBar( kwxMacMenuBarResource ) ; Handle menubar = ::GetNewMBar( kwxMacMenuBarResource ) ;
wxString message ; wxString message ;
wxCHECK_RET( menubar != NULL, "can't read MBAR resource" ); wxCHECK_RET( menubar != NULL, "can't read MBAR resource" );

9
src/mac/frame.cpp
View File

@@ -230,7 +230,7 @@ void wxFrame::SetMenuBar(wxMenuBar *menuBar)
m_frameMenuBar = NULL; m_frameMenuBar = NULL;
m_frameMenuBar = menuBar; m_frameMenuBar = menuBar;
m_frameMenuBar->MacInstallMenuBar() ; // m_frameMenuBar->MacInstallMenuBar() ;
m_frameMenuBar->Attach(this); m_frameMenuBar->Attach(this);
} }
@@ -283,9 +283,14 @@ void wxFrame::OnActivate(wxActivateEvent& event)
) )
{ {
child->SetFocus(); child->SetFocus();
return; break;
} }
} }
if ( m_frameMenuBar != NULL )
{
m_frameMenuBar->MacInstallMenuBar() ;
}
} }
void wxFrame::DoGetClientSize(int *x, int *y) const void wxFrame::DoGetClientSize(int *x, int *y) const

3
src/mac/menu.cpp
View File

@@ -631,6 +631,9 @@ void wxMenuBar::RebuildAccelTable()
void wxMenuBar::MacInstallMenuBar() void wxMenuBar::MacInstallMenuBar()
{ {
if ( s_macInstalledMenuBar == this )
return ;
Handle menubar = ::GetNewMBar( kwxMacMenuBarResource ) ; Handle menubar = ::GetNewMBar( kwxMacMenuBarResource ) ;
wxString message ; wxString message ;
wxCHECK_RET( menubar != NULL, "can't read MBAR resource" ); wxCHECK_RET( menubar != NULL, "can't read MBAR resource" );