summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinWX/Frame.cpp
diff options
context:
space:
mode:
authorMat M <mathew1800@gmail.com>2017-01-05 14:33:10 -0500
committerGitHub <noreply@github.com>2017-01-05 14:33:10 -0500
commite7359f247b553d8ff3b5e0e10f8be86e9d9f6172 (patch)
tree608f99aec298709bec6381c52ddf6e70add8b2fa /Source/Core/DolphinWX/Frame.cpp
parent6fe621f2030ab973373d4f00954ab05e48a2049e (diff)
parentcc7c410cf1f22b92dc7ab1725d095ae61c08d763 (diff)
Merge pull request #4595 from aldelaro5/add-debugger-hotkeys
Add debugger hotkeys
Diffstat (limited to 'Source/Core/DolphinWX/Frame.cpp')
-rw-r--r--Source/Core/DolphinWX/Frame.cpp59
1 files changed, 59 insertions, 0 deletions
diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp
index 200b495a11..27e80ad7d7 100644
--- a/Source/Core/DolphinWX/Frame.cpp
+++ b/Source/Core/DolphinWX/Frame.cpp
@@ -52,7 +52,9 @@
#include "Core/State.h"
#include "DolphinWX/Config/ConfigMain.h"
+#include "DolphinWX/Debugger/BreakpointDlg.h"
#include "DolphinWX/Debugger/CodeWindow.h"
+#include "DolphinWX/Debugger/MemoryCheckDlg.h"
#include "DolphinWX/GameListCtrl.h"
#include "DolphinWX/Globals.h"
#include "DolphinWX/LogWindow.h"
@@ -1282,6 +1284,63 @@ void CFrame::ParseHotkeys()
->UpdateSyncButtonState(IsHotkey(HK_TRIGGER_SYNC_BUTTON, true));
}
+ if (UseDebugger)
+ {
+ if (IsHotkey(HK_STEP))
+ {
+ wxCommandEvent evt(wxEVT_MENU, IDM_STEP);
+ GetEventHandler()->AddPendingEvent(evt);
+ }
+ if (IsHotkey(HK_STEP_OVER))
+ {
+ wxCommandEvent evt(wxEVT_MENU, IDM_STEPOVER);
+ GetEventHandler()->AddPendingEvent(evt);
+ }
+ if (IsHotkey(HK_STEP_OUT))
+ {
+ wxCommandEvent evt(wxEVT_MENU, IDM_STEPOUT);
+ GetEventHandler()->AddPendingEvent(evt);
+ }
+ if (IsHotkey(HK_SKIP))
+ {
+ wxCommandEvent evt(wxEVT_MENU, IDM_SKIP);
+ GetEventHandler()->AddPendingEvent(evt);
+ }
+ if (IsHotkey(HK_SHOW_PC))
+ {
+ wxCommandEvent evt(wxEVT_MENU, IDM_GOTOPC);
+ GetEventHandler()->AddPendingEvent(evt);
+ }
+ if (IsHotkey(HK_SET_PC))
+ {
+ wxCommandEvent evt(wxEVT_MENU, IDM_SETPC);
+ GetEventHandler()->AddPendingEvent(evt);
+ }
+ if (IsHotkey(HK_BP_TOGGLE))
+ {
+ wxCommandEvent evt(wxEVT_MENU, IDM_TOGGLE_BREAKPOINT);
+ GetEventHandler()->AddPendingEvent(evt);
+ }
+ if (IsHotkey(HK_BP_ADD))
+ {
+ BreakPointDlg bpDlg(this);
+ if (bpDlg.ShowModal() == wxID_OK)
+ {
+ wxCommandEvent evt(wxEVT_HOST_COMMAND, IDM_UPDATE_BREAKPOINTS);
+ g_pCodeWindow->GetEventHandler()->AddPendingEvent(evt);
+ }
+ }
+ if (IsHotkey(HK_MBP_ADD))
+ {
+ MemoryCheckDlg memDlg(this);
+ if (memDlg.ShowModal() == wxID_OK)
+ {
+ wxCommandEvent evt(wxEVT_HOST_COMMAND, IDM_UPDATE_BREAKPOINTS);
+ g_pCodeWindow->GetEventHandler()->AddPendingEvent(evt);
+ }
+ }
+ }
+
// Wiimote connect and disconnect hotkeys
int WiimoteId = -1;
if (IsHotkey(HK_WIIMOTE1_CONNECT))