widgets: Cleanup objects in destructors and minor code cleanup

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

diff --git a/source/widgets/XCEventMenu.cpp b/source/widgets/XCEventMenu.cpp
index 7373545..ac3b5ec 100644 (file)
--- 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<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(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, 
@@ -88,7 +78,7 @@ void XCEventMenu::ProcessMenuItemClick( wxCommandEvent& event){
                                wxCommandEvent editEntry(XCMAIN_EDITEVENT);
                                editEntry.SetId(ID_EDITEVENT);
                                editEntry.SetInt(eventID);
-                               wxPostEvent(WindowPtr, editEntry);
+                               wxPostEvent(windowPtr, editEntry);
                        }
                        break;
                case ID_EVENTMENU_DELETE:
@@ -101,7 +91,7 @@ void XCEventMenu::ProcessMenuItemClick( wxCommandEvent& event){
                                wxCommandEvent deleteEvent(XCMAIN_DELETEEVENT);
                                deleteEvent.SetId(ID_DELETEEVENT);
                                deleteEvent.SetClientData(eventInfo);
-                               wxPostEvent(WindowPtr, deleteEvent);
+                               wxPostEvent(windowPtr, deleteEvent);
                        }
                        break;