X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6d9713540dd22f7e81a7c11a68249f5ed35c87bd..4997d3014cd76b41f2d4036dfd168ad886972f35:/src/common/menucmn.cpp?ds=inline diff --git a/src/common/menucmn.cpp b/src/common/menucmn.cpp index bf618f7939..b272d1483d 100644 --- a/src/common/menucmn.cpp +++ b/src/common/menucmn.cpp @@ -310,11 +310,6 @@ void wxMenuBase::AddSubMenu(wxMenu *submenu) { wxCHECK_RET( submenu, _T("can't add a NULL submenu") ); - if ( m_menuBar ) - { - submenu->Attach(m_menuBar); - } - submenu->SetParent((wxMenu *)this); } @@ -629,6 +624,13 @@ bool wxMenuBase::SendEvent(int id, int checked) // wxMenu attaching/detaching to/from menu bar // ---------------------------------------------------------------------------- +wxMenuBar* wxMenuBase::GetMenuBar() const +{ + if(GetParent()) + return GetParent()->GetMenuBar(); + return m_menuBar; +} + void wxMenuBase::Attach(wxMenuBarBase *menubar) { // use Detach() instead!