X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c25f373e2b49e6d97c45d3f73da7edd0021ab2b3..34952e03e27f4d9b0eb255752678c79b29575a18:/src/msw/menu.cpp diff --git a/src/msw/menu.cpp b/src/msw/menu.cpp index 25ea2adc19..151427eca6 100644 --- a/src/msw/menu.cpp +++ b/src/msw/menu.cpp @@ -321,7 +321,7 @@ void wxMenu::UpdateAccel(wxMenuItem *item) if ( IsAttached() ) { - m_menuBar->RebuildAccelTable(); + GetMenuBar()->RebuildAccelTable(); } } //else: it is a separator, they can't have accels, nothing to do @@ -419,9 +419,9 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos) #endif // __WIN32__ // if we're already attached to the menubar, we must update it - if ( IsAttached() && m_menuBar->IsAttached() ) + if ( IsAttached() && GetMenuBar()->IsAttached() ) { - m_menuBar->Refresh(); + GetMenuBar()->Refresh(); } return TRUE; @@ -532,10 +532,10 @@ wxMenuItem *wxMenu::DoRemove(wxMenuItem *item) wxLogLastError(wxT("RemoveMenu")); } - if ( IsAttached() && m_menuBar->IsAttached() ) + if ( IsAttached() && GetMenuBar()->IsAttached() ) { // otherwise, the chane won't be visible - m_menuBar->Refresh(); + GetMenuBar()->Refresh(); } // and from internal data structures @@ -662,8 +662,8 @@ wxWindow *wxMenu::GetWindow() const { if ( m_invokingWindow != NULL ) return m_invokingWindow; - else if ( m_menuBar != NULL) - return m_menuBar->GetFrame(); + else if ( GetMenuBar() != NULL) + return GetMenuBar()->GetFrame(); return NULL; }