// 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,
// 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));
int itemID = event.GetId();
- PopupPtr->Dismiss();
+ popupPtr->Dismiss();
switch (itemID){
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:
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;
void XCCalendarMenu::SetWindowPointer(wxWindow *windowPointer){
- WindowPtr = windowPointer;
+ windowPtr = windowPointer;
}
void XCCalendarMenu::SetPopupPointer(wxPopupTransientWindow *popupPointer){
- PopupPtr = popupPointer;
+ popupPtr = popupPointer;
}
\ No newline at end of file