X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b2383543b6a878093883f8f538bf63c031660d8e..43f4e852a1b2ac37c3db6a2b87315192ac549191:/src/msw/wince/menuce.cpp diff --git a/src/msw/wince/menuce.cpp b/src/msw/wince/menuce.cpp index 477b00dac1..6231ea1e22 100644 --- a/src/msw/wince/menuce.cpp +++ b/src/msw/wince/menuce.cpp @@ -6,7 +6,7 @@ // Created: 28.05.2004 // RCS-ID: $Id$ // Copyright: (c) Wlodzimierz Skiba -// License: wxWindows licence +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -54,11 +54,7 @@ wxTopLevelWindowMSW::ButtonMenu::ButtonMenu() wxTopLevelWindowMSW::ButtonMenu::~ButtonMenu() { - if(m_menu) - { - delete m_menu; - m_menu = NULL; - }; + wxDELETE(m_menu); } void wxTopLevelWindowMSW::SetLeftMenu(int id, const wxString& label, wxMenu *subMenu) @@ -78,7 +74,7 @@ void wxTopLevelWindowMSW::ButtonMenu::SetButton(int id, const wxString& label, w m_assigned = true; m_id = id; if(label.empty() && wxIsStockID(id)) - m_label = wxGetStockLabel(id, false); + m_label = wxGetStockLabel(id, wxSTOCK_NOFLAGS); else m_label = label; m_menu = subMenu; @@ -225,7 +221,7 @@ void wxTopLevelWindowMSW::ReloadAllButtons() if (!SHCreateMenuBar(&menu_bar)) { - wxFAIL_MSG( _T("SHCreateMenuBar failed") ); + wxFAIL_MSG( wxT("SHCreateMenuBar failed") ); return; }