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/WatchView.cpp | |
| parent | 5a89ba20d75b17b1aeec090544934b95bdb0ec74 (diff) | |
| parent | 245ff601b7033f4122b48d837171c21baa9ac306 (diff) | |
Merge pull request #1 from dolphin-emu/master
update
Diffstat (limited to 'Source/Core/DolphinWX/Debugger/WatchView.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/Debugger/WatchView.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Source/Core/DolphinWX/Debugger/WatchView.cpp b/Source/Core/DolphinWX/Debugger/WatchView.cpp index 8bf1d0b14b..13baf3660a 100644 --- a/Source/Core/DolphinWX/Debugger/WatchView.cpp +++ b/Source/Core/DolphinWX/Debugger/WatchView.cpp @@ -56,7 +56,7 @@ static void UpdateWatchAddr(int count, u32 value) PowerPC::watches.Update(count - 1, value); } -static void SetWatchName(int count, const std::string value) +static void SetWatchName(int count, const std::string& value) { if ((count - 1) < (int)PowerPC::watches.GetWatches().size()) { @@ -247,18 +247,18 @@ void CWatchView::OnMouseDownR(wxGridEvent& event) TryParse("0x" + WxStrToStr(strNewVal), &m_selectedAddress); } - wxMenu* menu = new wxMenu; + wxMenu menu; if (row != 0 && row != (int)(PowerPC::watches.GetWatches().size() + 1)) - menu->Append(IDM_DELETEWATCH, _("&Delete watch")); + menu.Append(IDM_DELETEWATCH, _("&Delete watch")); if (row != 0 && row != (int)(PowerPC::watches.GetWatches().size() + 1) && (col == 1 || col == 2)) { #ifdef ENABLE_MEM_CHECK - menu->Append(IDM_ADDMEMCHECK, _("Add memory &breakpoint")); + menu.Append(IDM_ADDMEMCHECK, _("Add memory &breakpoint")); #endif - menu->Append(IDM_VIEWMEMORY, _("View &memory")); + menu.Append(IDM_VIEWMEMORY, _("View &memory")); } - PopupMenu(menu); + PopupMenu(&menu); } void CWatchView::OnPopupMenu(wxCommandEvent& event) |