X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1b1d2207ea3fe0b04d021bc9e7fa31a5d9464727..b77b87881bae2e6306366d79e7fe160334b3d4a2:/src/mac/menu.cpp diff --git a/src/mac/menu.cpp b/src/mac/menu.cpp index 70ea0b4fba..046f7e0166 100644 --- a/src/mac/menu.cpp +++ b/src/mac/menu.cpp @@ -74,7 +74,7 @@ void wxMenu::Init() if ( !m_hMenu ) { - wxLogLastError("UMANewMenu failed"); + wxLogLastError(wxT("UMANewMenu failed")); } // if we have a title, insert it in the beginning of the menu @@ -276,15 +276,6 @@ bool wxMenu::ProcessCommand(wxCommandEvent & event) { bool processed = FALSE; -#if WXWIN_COMPATIBILITY - // Try a callback - if (m_callback) - { - (void)(*(m_callback))(*this, event); - processed = TRUE; - } -#endif WXWIN_COMPATIBILITY - // Try the menu's event handler if ( !processed && GetEventHandler()) { @@ -750,12 +741,10 @@ wxMenu *wxMenuBar::Remove(size_t pos) ::DeleteMenu( menu->MacGetMenuId() /* m_menus[pos]->MacGetMenuId() */ ) ; } - menu->Detach(); - Refresh(); } - m_titles.Remove(pos); + m_titles.RemoveAt(pos); return menu; }