X-Git-Url: http://Server1/repobrowser/?p=xestiacalendar%2F.git;a=blobdiff_plain;f=source%2Fwidgets%2FXCCalendarMenu.cpp;h=2cb9a7ccaac20de4011ee7336c14091065533898;hp=1ca0550a1e892569d2ce3be287e40c2691d95336;hb=902d948e5e45ad483c8e235690dda8f2bf596ad5;hpb=49cd1caba10366538e7f87181d2ff90b5c715693 diff --git a/source/widgets/XCCalendarMenu.cpp b/source/widgets/XCCalendarMenu.cpp index 1ca0550..2cb9a7c 100644 --- a/source/widgets/XCCalendarMenu.cpp +++ b/source/widgets/XCCalendarMenu.cpp @@ -31,22 +31,12 @@ XCCalendarMenu::~XCCalendarMenu(){ // Destory the XCCalendarMenu 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(XCCalendarMenu::ProcessMenuItemClick) ); - delete(menuItemIter->second); - menuItemIter->second = NULL; - - } + // Delete the list of items in menuItems (not the menu items themselves). menuItems.clear(); + // Menu items are deleted through ~wxMenuBase() + } void XCCalendarMenu::AppendMenuItem(wxString objectName,