X-Git-Url: http://Server1/repobrowser/?p=xestiacalendar%2F.git;a=blobdiff_plain;f=source%2Fwidgets%2FXCCalendarMenu.cpp;h=2cb9a7ccaac20de4011ee7336c14091065533898;hp=c3d07a97ea14a1e5ac5392e9138e273f6ed946cc;hb=902d948e5e45ad483c8e235690dda8f2bf596ad5;hpb=401fd2eee6047f72fdaf811bbcc3924409a4fb9d

diff --git a/source/widgets/XCCalendarMenu.cpp b/source/widgets/XCCalendarMenu.cpp
index c3d07a9..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<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, 
@@ -62,7 +52,7 @@ void XCCalendarMenu::AppendMenuItem(wxString objectName,
 	
 	// Append a menu item to the XCCalendarMenu control.
 
-	wxMenuItem *menuitem = this->Append(ItemID, menuName, menuDescription);
+	wxMenuItem *menuitem = this->Append(itemID, menuName, menuDescription);
 	this->Connect(menuitem->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(XCCalendarMenu::ProcessMenuItemClick));
 	menuItems.insert(std::make_pair(objectName.ToStdString(), menuitem));
 
@@ -81,7 +71,7 @@ void XCCalendarMenu::ProcessMenuItemClick( wxCommandEvent& event){
 	
 	int itemID = event.GetId();
 	
-	PopupPtr->Dismiss();
+	popupPtr->Dismiss();
 	
 	switch (itemID){
 		
@@ -90,7 +80,7 @@ void XCCalendarMenu::ProcessMenuItemClick( wxCommandEvent& event){
 				wxCommandEvent editCalendar(XCMAIN_EDITCALENDAR);
 				editCalendar.SetId(ID_EDITCALENDAR);
 				editCalendar.SetInt(calendarID);
-				wxPostEvent(WindowPtr->GetParent()->GetParent()->GetParent()->GetParent(), editCalendar);
+				wxPostEvent(windowPtr->GetParent()->GetParent()->GetParent()->GetParent(), editCalendar);
 			}
 			break;
 		case ID_CALENDARMENU_DELETE:
@@ -103,7 +93,7 @@ void XCCalendarMenu::ProcessMenuItemClick( wxCommandEvent& event){
 				wxCommandEvent deleteCalendar(XCMAIN_DELETECALENDAR);
 				deleteCalendar.SetId(ID_DELETECALENDAR);
 				deleteCalendar.SetClientData(calendarInfo);
-				wxPostEvent(WindowPtr->GetParent()->GetParent()->GetParent()->GetParent(), deleteCalendar);
+				wxPostEvent(windowPtr->GetParent()->GetParent()->GetParent()->GetParent(), deleteCalendar);
 			}
 			break;
 			
@@ -125,12 +115,12 @@ void XCCalendarMenu::SetAccountPreferencesID(int accountPreferencesID){
 
 void XCCalendarMenu::SetWindowPointer(wxWindow *windowPointer){
 	
-	WindowPtr = windowPointer;
+	windowPtr = windowPointer;
 	
 }
 
 void XCCalendarMenu::SetPopupPointer(wxPopupTransientWindow *popupPointer){
 	
-	PopupPtr = popupPointer;
+	popupPtr = popupPointer;
 	
 }
\ No newline at end of file