// Destory the XCEventMenu 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(XCEventMenu::ProcessMenuItemClick) );
- delete(menuItemIter->second);
- menuItemIter->second = NULL;
-
- }
+ // Remove items from list (but don't delete).
menuItems.clear();
+ // Menu items are deleted through ~wxMenuBase()
+
}
void XCEventMenu::AppendMenuItem(wxString objectName,
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;