diff options
| author | Pringo <Pringo@users.noreply.github.com> | 2014-11-24 21:54:15 -0800 |
|---|---|---|
| committer | Pringo <Pringo@users.noreply.github.com> | 2014-11-24 21:54:15 -0800 |
| commit | 670d94967a64b6a3e99127caf5511b07825f21cb (patch) | |
| tree | e83e2909a2db5dbe8387a40f3839d27abf588c0c /Source/Core/DolphinWX/Debugger/MemoryView.cpp | |
| parent | 5a89ba20d75b17b1aeec090544934b95bdb0ec74 (diff) | |
| parent | 245ff601b7033f4122b48d837171c21baa9ac306 (diff) | |
Merge pull request #1 from dolphin-emu/master
update
Diffstat (limited to 'Source/Core/DolphinWX/Debugger/MemoryView.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/Debugger/MemoryView.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Source/Core/DolphinWX/Debugger/MemoryView.cpp b/Source/Core/DolphinWX/Debugger/MemoryView.cpp index d690f1f56d..4f87ef7763 100644 --- a/Source/Core/DolphinWX/Debugger/MemoryView.cpp +++ b/Source/Core/DolphinWX/Debugger/MemoryView.cpp @@ -221,22 +221,22 @@ void CMemoryView::OnPopupMenu(wxCommandEvent& event) void CMemoryView::OnMouseDownR(wxMouseEvent& event) { // popup menu - wxMenu* menu = new wxMenu; + wxMenu menu; //menu.Append(IDM_GOTOINMEMVIEW, _("&Goto in mem view")); #if wxUSE_CLIPBOARD - menu->Append(IDM_COPYADDRESS, _("Copy &address")); - menu->Append(IDM_COPYHEX, _("Copy &hex")); + menu.Append(IDM_COPYADDRESS, _("Copy &address")); + menu.Append(IDM_COPYHEX, _("Copy &hex")); #endif - menu->Append(IDM_WATCHADDRESS, _("Add to &watch")); - menu->Append(IDM_TOGGLEMEMORY, _("Toggle &memory")); + menu.Append(IDM_WATCHADDRESS, _("Add to &watch")); + menu.Append(IDM_TOGGLEMEMORY, _("Toggle &memory")); wxMenu* viewAsSubMenu = new wxMenu; viewAsSubMenu->Append(IDM_VIEWASFP, _("FP value")); viewAsSubMenu->Append(IDM_VIEWASASCII, "ASCII"); viewAsSubMenu->Append(IDM_VIEWASHEX, _("Hex")); - menu->AppendSubMenu(viewAsSubMenu, _("View As:")); + menu.AppendSubMenu(viewAsSubMenu, _("View As:")); - PopupMenu(menu); + PopupMenu(&menu); } void CMemoryView::OnPaint(wxPaintEvent& event) |