diff options
| author | Shawn Hoffman <godisgovernment@gmail.com> | 2009-10-06 15:49:20 +0000 |
|---|---|---|
| committer | Shawn Hoffman <godisgovernment@gmail.com> | 2009-10-06 15:49:20 +0000 |
| commit | 4c22bea4d47f4d0cf1b31b9d4e02178ecb7bccd7 (patch) | |
| tree | b66dd41898197b3be87748402f073a067db0e565 /Source/Core/DolphinWX/Src/FrameTools.cpp | |
| parent | 19b8e6bc08774ecd292fddbd70b0b80eb26cae60 (diff) | |
Add ability to use Reset (reset button interrupt, still figuring out the other reset modes)
Add support for button combos that are built-in to controllers:
y+x+start for three seconds updates the origin
b+x+start for three seconds resets
Changed CPeripheralInterface to a namespace and renamed to ProcessorInterface
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4366 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/DolphinWX/Src/FrameTools.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/Src/FrameTools.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp index c3bda8e3de..d3e2c7cd1f 100644 --- a/Source/Core/DolphinWX/Src/FrameTools.cpp +++ b/Source/Core/DolphinWX/Src/FrameTools.cpp @@ -61,6 +61,7 @@ Core::GetWindowHandle(). #include "Core.h" #include "OnFrame.h" #include "HW/DVDInterface.h" +#include "HW/ProcessorInterface.h" #include "State.h" #include "VolumeHandler.h" #include "NANDContentLoader.h" @@ -127,8 +128,9 @@ void CFrame::CreateMenu() wxMenu* emulationMenu = new wxMenu; emulationMenu->Append(IDM_PLAY, _T("&Play\tF10")); emulationMenu->Append(IDM_STOP, _T("&Stop")); + emulationMenu->Append(IDM_RESET, _T("&Reset")); emulationMenu->AppendSeparator(); - emulationMenu->Append(IDM_RECORD, _T("Start &Recording...")); + emulationMenu->Append(IDM_RECORD, _T("Start Re&cording...")); emulationMenu->Append(IDM_PLAYRECORD, _T("P&lay Recording...")); emulationMenu->AppendSeparator(); emulationMenu->Append(IDM_CHANGEDISC, _T("Change &Disc")); @@ -657,6 +659,11 @@ void CFrame::OnStop(wxCommandEvent& WXUNUSED (event)) DoStop(); } +void CFrame::OnReset(wxCommandEvent& WXUNUSED (event)) +{ + ProcessorInterface::ResetButton_Tap(); +} + void CFrame::OnConfigMain(wxCommandEvent& WXUNUSED (event)) { CConfigMain ConfigMain(this); |