From c291a2db676c330bec77e77cc08ed5210be3daae Mon Sep 17 00:00:00 2001 From: luisr142004 Date: Tue, 9 Feb 2010 00:34:27 +0000 Subject: 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 --- Source/Core/DolphinWX/Src/FrameTools.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'Source/Core/DolphinWX/Src/FrameTools.cpp') 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() { -- cgit v1.2.3