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

diff --git a/source/widgets/XCCalendarMenu.cpp b/source/widgets/XCCalendarMenu.cpp
index 7c2ec51..2cb9a7c 100644
--- a/source/widgets/XCCalendarMenu.cpp
+++ b/source/widgets/XCCalendarMenu.cpp
@@ -31,40 +31,30 @@ XCCalendarMenu::~XCCalendarMenu(){
 
 	// Destory the XCCalendarMenu object.
 	
-	// Delete the menu items.
+	// Delete the list of items in menuItems (not the menu items themselves).
 	
-	for (std::map<std::string, wxMenuItem*>::iterator MenuItemIter = MenuItems.begin(); 
-		MenuItemIter != MenuItems.end(); ++MenuItemIter){
+	menuItems.clear();
 	
-		// Delete the wxMenuItem object.
-		
-		this->Disconnect(MenuItemIter->second->GetId(), wxEVT_COMMAND_MENU_SELECTED, 
-			wxCommandEventHandler(XCCalendarMenu::ProcessMenuItemClick) );
-		delete(MenuItemIter->second);
-		MenuItemIter->second = NULL;
-	
-	}
-	
-	MenuItems.clear();
+	// Menu items are deleted through ~wxMenuBase()
 	
 }
 
-void XCCalendarMenu::AppendMenuItem(wxString ObjectName, 
-	wxString MenuName, 
-	wxString MenuDescription,
-	XCCalendarMenuID ItemID,
-	wxItemKind ItemType){
+void XCCalendarMenu::AppendMenuItem(wxString objectName, 
+	wxString menuName, 
+	wxString menuDescription,
+	XCCalendarMenuID itemID,
+	wxItemKind itemType){
 	
-	if (ItemType == wxITEM_SEPARATOR){
+	if (itemType == wxITEM_SEPARATOR){
 		this->AppendSeparator();
 		return;
 	}
 	
 	// 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));
+	menuItems.insert(std::make_pair(objectName.ToStdString(), menuitem));
 
 }
 
@@ -79,18 +69,18 @@ void XCCalendarMenu::ProcessMenuItemClick( wxCommandEvent& event){
 	// Process an action when a menu item in the XCCalendarMenu
 	// control is selected.
 	
-	int ItemID = event.GetId();
+	int itemID = event.GetId();
 	
-	PopupPtr->Dismiss();
+	popupPtr->Dismiss();
 	
-	switch (ItemID){
+	switch (itemID){
 		
 		case ID_CALENDARMENU_EDIT:
 			{
 				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