// Delete the menu items.
- for (std::map<std::string, wxMenuItem*>::iterator MenuItemIter = MenuItems.begin();
- MenuItemIter != MenuItems.end(); ++MenuItemIter){
+ 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,
+ this->Disconnect(menuItemIter->second->GetId(), wxEVT_COMMAND_MENU_SELECTED,
wxCommandEventHandler(XCCalendarMenu::ProcessMenuItemClick) );
- delete(MenuItemIter->second);
- MenuItemIter->second = NULL;
+ delete(menuItemIter->second);
+ menuItemIter->second = NULL;
}
- MenuItems.clear();
+ menuItems.clear();
}
-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));
}
// 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:
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