X-Git-Url: http://Server1/repobrowser/?p=xestiacalendar%2F.git;a=blobdiff_plain;f=source%2Fwidgets%2FXCEventMenu.cpp;h=ac3b5ec6b8cb20957f4293c340412002745413c3;hp=6c02caa2d28a05ca78ba11b739dcbfd9a5272de9;hb=902d948e5e45ad483c8e235690dda8f2bf596ad5;hpb=49cd1caba10366538e7f87181d2ff90b5c715693 diff --git a/source/widgets/XCEventMenu.cpp b/source/widgets/XCEventMenu.cpp index 6c02caa..ac3b5ec 100644 --- a/source/widgets/XCEventMenu.cpp +++ b/source/widgets/XCEventMenu.cpp @@ -31,22 +31,12 @@ XCEventMenu::~XCEventMenu(){ // Destory the XCEventMenu object. - // Delete the menu items. - - for (std::map::iterator menuItemIter = menuItems.begin(); - menuItemIter != menuItems.end(); ++menuItemIter){ - - // Delete the wxMenuItem object. - - this->Disconnect(menuItemIter->second->GetId(), wxEVT_COMMAND_MENU_SELECTED, - wxCommandEventHandler(XCEventMenu::ProcessMenuItemClick) ); - delete(menuItemIter->second); - menuItemIter->second = NULL; - - } + // Remove items from list (but don't delete). menuItems.clear(); + // Menu items are deleted through ~wxMenuBase() + } void XCEventMenu::AppendMenuItem(wxString objectName,