X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ff8b6290e9b7d0c604c35ca938d87cbd1fd157ed..8b3fddc49326c0b6019cd7082218726aa17a5727:/src/msw/menu.cpp?ds=sidebyside diff --git a/src/msw/menu.cpp b/src/msw/menu.cpp index 4de484376f..e4299163f2 100644 --- a/src/msw/menu.cpp +++ b/src/msw/menu.cpp @@ -172,7 +172,7 @@ void wxMenu::UpdateAccel(wxMenuItem *item) if ( accel ) m_accels[n] = accel; else - m_accels.Remove(n); + m_accels.RemoveAt(n); } if ( IsAttached() ) @@ -317,7 +317,7 @@ wxMenuItem *wxMenu::DoRemove(wxMenuItem *item) { delete m_accels[n]; - m_accels.Remove(n); + m_accels.RemoveAt(n); } //else: this item doesn't have an accel, nothing to do #endif // wxUSE_ACCEL @@ -649,8 +649,6 @@ bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title) m_titles.Insert(title, pos); - menu->Attach(this); - if ( IsAttached() ) { if ( !::InsertMenu(GetHmenu(), pos, @@ -722,8 +720,6 @@ wxMenu *wxMenuBar::Remove(size_t pos) wxLogLastError(wxT("RemoveMenu")); } - menu->Detach(); - #if wxUSE_ACCEL if ( menu->HasAccels() ) { @@ -774,8 +770,6 @@ void wxMenuBar::Attach(wxFrame *frame) { wxMenuBarBase::Attach(frame); - m_menuBarFrame = frame; - #if wxUSE_ACCEL RebuildAccelTable(); #endif // wxUSE_ACCEL