diff options
| author | luisr142004 <luisr142004@gmail.com> | 2010-02-09 00:34:27 +0000 |
|---|---|---|
| committer | luisr142004 <luisr142004@gmail.com> | 2010-02-09 00:34:27 +0000 |
| commit | c291a2db676c330bec77e77cc08ed5210be3daae (patch) | |
| tree | ac01153020c6a5802164060096a2866ed29c61ed /Source/Core/DolphinWX/Src/FrameTools.cpp | |
| parent | e93e777ffb941af612805ee438db5b8c0e5b5c73 (diff) | |
make ESC pause the game now instead of quitting plus fix another bug with key and window handling
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5035 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/DolphinWX/Src/FrameTools.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/Src/FrameTools.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp index fe29e18e0d..556eeb00cd 100644 --- a/Source/Core/DolphinWX/Src/FrameTools.cpp +++ b/Source/Core/DolphinWX/Src/FrameTools.cpp @@ -144,6 +144,7 @@ void CFrame::CreateMenu() m_pSubMenuFrameSkipping = emulationMenu->AppendSubMenu(skippingMenu, _T("Frame S&kipping")); for(int i = 0; i < 10; i++) skippingMenu->Append(IDM_FRAMESKIP0 + i, wxString::Format(_T("%i"), i), wxEmptyString, wxITEM_RADIO); + skippingMenu->Check(IDM_FRAMESKIP0 + SConfig::GetInstance().m_FrameSkip, true); emulationMenu->AppendSeparator(); emulationMenu->Append(IDM_SCREENSHOT, _T("Take S&creenshot\tF9")); @@ -688,6 +689,13 @@ void CFrame::OnScreenshot(wxCommandEvent& WXUNUSED (event)) Core::ScreenShot(); } +// Pause the emulation +void CFrame::DoPause() +{ + Core::SetState(Core::CORE_PAUSE); + UpdateGUI(); +} + // Stop the emulation void CFrame::DoStop() { |