X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9a83f860948059b0273b5cc6d9e43fadad3ebfca..fe7cefd493837b49e8095b87aad1a01679eb7592:/src/msw/wince/menuce.cpp diff --git a/src/msw/wince/menuce.cpp b/src/msw/wince/menuce.cpp index 4b8c400570..9f8822d9bc 100644 --- a/src/msw/wince/menuce.cpp +++ b/src/msw/wince/menuce.cpp @@ -4,9 +4,8 @@ // Author: Wlodzimierz ABX Skiba // Modified by: // Created: 28.05.2004 -// RCS-ID: $Id$ // Copyright: (c) Wlodzimierz Skiba -// License: wxWindows licence +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -54,11 +53,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) @@ -252,7 +247,7 @@ bool wxTopLevelWindowMSW::HandleCommand(WXWORD id, WXWORD WXUNUSED(cmd), WXHWND if ( id == IDM_LEFT || id == IDM_RIGHT ) { int menuId = id == IDM_LEFT ? m_LeftButton.GetId() : m_RightButton.GetId() ; - wxCommandEvent commandEvent(wxEVT_COMMAND_MENU_SELECTED, menuId); + wxCommandEvent commandEvent(wxEVT_MENU, menuId); commandEvent.SetEventObject(this); GetEventHandler()->ProcessEvent(commandEvent); return true;