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
This commit is contained in:
luisr142004
2010-02-09 00:34:27 +00:00
parent e93e777ffb
commit c291a2db67
7 changed files with 29 additions and 10 deletions

View File

@ -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()
{