summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinWX/FrameAui.cpp
diff options
context:
space:
mode:
authorskidau <skidau@gmail.com>2014-10-28 12:53:22 +1100
committerskidau <skidau@gmail.com>2014-10-28 12:53:22 +1100
commit1630b0c684c837c074e2f5b9dbf5b45554dfc43e (patch)
tree56f0fb651ba36dbbf856a6f5e0b3ef84e62aa505 /Source/Core/DolphinWX/FrameAui.cpp
parentb13ba0680c5a717d43becd9c50dd739ff64d7c01 (diff)
parentdaf977e84e82d5687bdad7589541319b4288a5dd (diff)
Merge pull request #1291 from skidau/debugger-step-out
Dolphin debugger enhancements
Diffstat (limited to 'Source/Core/DolphinWX/FrameAui.cpp')
-rw-r--r--Source/Core/DolphinWX/FrameAui.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/Source/Core/DolphinWX/FrameAui.cpp b/Source/Core/DolphinWX/FrameAui.cpp
index c309976a46..43e3f86043 100644
--- a/Source/Core/DolphinWX/FrameAui.cpp
+++ b/Source/Core/DolphinWX/FrameAui.cpp
@@ -179,6 +179,9 @@ void CFrame::OnToggleWindow(wxCommandEvent& event)
case IDM_REGISTERWINDOW:
g_pCodeWindow->ToggleRegisterWindow(bShow);
break;
+ case IDM_WATCHWINDOW:
+ g_pCodeWindow->ToggleWatchWindow(bShow);
+ break;
case IDM_BREAKPOINTWINDOW:
g_pCodeWindow->ToggleBreakPointWindow(bShow);
break;
@@ -208,6 +211,7 @@ void CFrame::ClosePages()
{
g_pCodeWindow->ToggleCodeWindow(false);
g_pCodeWindow->ToggleRegisterWindow(false);
+ g_pCodeWindow->ToggleWatchWindow(false);
g_pCodeWindow->ToggleBreakPointWindow(false);
g_pCodeWindow->ToggleMemoryWindow(false);
g_pCodeWindow->ToggleJitWindow(false);
@@ -247,6 +251,8 @@ void CFrame::OnNotebookPageClose(wxAuiNotebookEvent& event)
ToggleLogConfigWindow(false);
if (Ctrl->GetPage(event.GetSelection())->GetId() == IDM_REGISTERWINDOW)
g_pCodeWindow->ToggleRegisterWindow(false);
+ if (Ctrl->GetPage(event.GetSelection())->GetId() == IDM_WATCHWINDOW)
+ g_pCodeWindow->ToggleWatchWindow(false);
if (Ctrl->GetPage(event.GetSelection())->GetId() == IDM_BREAKPOINTWINDOW)
g_pCodeWindow->ToggleBreakPointWindow(false);
if (Ctrl->GetPage(event.GetSelection())->GetId() == IDM_JITWINDOW)