mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-05-01 14:28:02 +03:00
wxMenu objects are now deleted by wxwidgets - should fix a few GUI-related crashes
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4602 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
parent
425ee74c76
commit
66b80131d6
8 changed files with 124 additions and 123 deletions
|
@ -227,20 +227,20 @@ void CMemoryView::OnPopupMenu(wxCommandEvent& event)
|
|||
void CMemoryView::OnMouseDownR(wxMouseEvent& event)
|
||||
{
|
||||
// popup menu
|
||||
wxMenu menu;
|
||||
wxMenu* menu = new wxMenu;
|
||||
//menu.Append(IDM_GOTOINMEMVIEW, "&Goto in mem view");
|
||||
#if wxUSE_CLIPBOARD
|
||||
menu.Append(IDM_COPYADDRESS, wxString::FromAscii("Copy &address"));
|
||||
menu.Append(IDM_COPYHEX, wxString::FromAscii("Copy &hex"));
|
||||
menu->Append(IDM_COPYADDRESS, wxString::FromAscii("Copy &address"));
|
||||
menu->Append(IDM_COPYHEX, wxString::FromAscii("Copy &hex"));
|
||||
#endif
|
||||
menu.Append(IDM_TOGGLEMEMORY, wxString::FromAscii("Toggle &memory (RAM/ARAM)"));
|
||||
menu->Append(IDM_TOGGLEMEMORY, wxString::FromAscii("Toggle &memory (RAM/ARAM)"));
|
||||
|
||||
wxMenu viewAsSubMenu;
|
||||
viewAsSubMenu.Append(IDM_VIEWASFP, wxString::FromAscii("FP value"));
|
||||
viewAsSubMenu.Append(IDM_VIEWASASCII, wxString::FromAscii("ASCII"));
|
||||
menu.AppendSubMenu(&viewAsSubMenu, wxString::FromAscii("View As:"));
|
||||
wxMenu* viewAsSubMenu = new wxMenu;
|
||||
viewAsSubMenu->Append(IDM_VIEWASFP, wxString::FromAscii("FP value"));
|
||||
viewAsSubMenu->Append(IDM_VIEWASASCII, wxString::FromAscii("ASCII"));
|
||||
menu->AppendSubMenu(viewAsSubMenu, wxString::FromAscii("View As:"));
|
||||
|
||||
PopupMenu(&menu);
|
||||
PopupMenu(menu);
|
||||
|
||||
event.Skip(true);
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue