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

Instead of m_menuBar use GetMenuBar() which will be modified (with next patch)

Browse Source 
to traverse up the menu hierarchy to return the menu bar.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26476 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Elliott
2004-03-30 00:43:16 +00:00
parent 7fa23c09cd
commit 4224f05975
6 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -124,7 +124,7 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
wxASSERT_MSG( pSubMenu->m_hMenu != NULL , wxT("invalid submenu added"));
pSubMenu->m_menuParent = this ;
if (wxMenuBar::MacGetInstalledMenuBar() == m_menuBar)
if (wxMenuBar::MacGetInstalledMenuBar() == GetMenuBar())
{
pSubMenu->MacBeforeDisplay( true ) ;
}
@@ -166,7 +166,7 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
// if we're already attached to the menubar, we must update it
if ( IsAttached() )
{
m_menuBar->Refresh();
GetMenuBar()->Refresh();
}
return TRUE ;
}
@@ -263,7 +263,7 @@ wxMenuItem *wxMenu::DoRemove(wxMenuItem *item)
if ( IsAttached() )
{
// otherwise, the change won't be visible
m_menuBar->Refresh();
GetMenuBar()->Refresh();
}
// and from internal data structures
@@ -303,8 +303,8 @@ wxWindow *wxMenu::GetWindow() const
{
if ( m_invokingWindow != NULL )
return m_invokingWindow;
else if ( m_menuBar != NULL)
return (wxWindow *) m_menuBar->GetFrame();
else if ( GetMenuBar() != NULL)
return (wxWindow *) GetMenuBar()->GetFrame();
return NULL;
}