widgets: Cleanup objects in destructors and minor code cleanup

[xestiacalendar/.git] / source / widgets / XCCalendarMenu.cpp

diff --git a/source/widgets/XCCalendarMenu.cpp b/source/widgets/XCCalendarMenu.cpp
index 1ca0550..2cb9a7c 100644 (file)
--- 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<std::string, wxMenuItem*>::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,