// 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(XCEventMenu::ProcessMenuItemClick) );
- delete(MenuItemIter->second);
- MenuItemIter->second = NULL;
+ delete(menuItemIter->second);
+ menuItemIter->second = NULL;
}
- MenuItems.clear();
+ menuItems.clear();
}
-void XCEventMenu::AppendMenuItem(wxString ObjectName,
- wxString MenuName,
- wxString MenuDescription,
- XCEventMenuID ItemID,
- wxItemKind ItemType){
+void XCEventMenu::AppendMenuItem(wxString objectName,
+ wxString menuName,
+ wxString menuDescription,
+ XCEventMenuID itemID,
+ wxItemKind itemType){
- if (ItemType == wxITEM_SEPARATOR){
+ if (itemType == wxITEM_SEPARATOR){
this->AppendSeparator();
return;
}
// Append a menu item to the XCEventMenu control.
- wxMenuItem *menuitem = this->Append(ItemID, MenuName, MenuDescription);
+ wxMenuItem *menuitem = this->Append(itemID, menuName, menuDescription);
this->Connect(menuitem->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(XCEventMenu::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 XCEventMenu
// control is selected.
- int ItemID = event.GetId();
+ int itemID = event.GetId();
- switch (ItemID){
+ switch (itemID){
case ID_EVENTMENU_EDIT:
{
wxCommandEvent editEntry(XCMAIN_EDITEVENT);
editEntry.SetId(ID_EDITEVENT);
editEntry.SetInt(eventID);
- wxPostEvent(WindowPtr, editEntry);
+ wxPostEvent(windowPtr, editEntry);
}
break;
case ID_EVENTMENU_DELETE:
wxCommandEvent deleteEvent(XCMAIN_DELETEEVENT);
deleteEvent.SetId(ID_DELETEEVENT);
deleteEvent.SetClientData(eventInfo);
- wxPostEvent(WindowPtr, deleteEvent);
+ wxPostEvent(windowPtr, deleteEvent);
}
break;
void XCEventMenu::SetWindowPointer(wxWindow *windowPointer){
- WindowPtr = windowPointer;
+ windowPtr = windowPointer;
}
\ No newline at end of file