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/Frame.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/Frame.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/Src/Frame.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Source/Core/DolphinWX/Src/Frame.cpp b/Source/Core/DolphinWX/Src/Frame.cpp index e8f478b794..7cfef5fc0d 100644 --- a/Source/Core/DolphinWX/Src/Frame.cpp +++ b/Source/Core/DolphinWX/Src/Frame.cpp @@ -145,6 +145,11 @@ CPanel::CPanel( case WM_USER: switch(wParam) { + // Pause + case WM_USER_PAUSE: + main_frame->DoPause(); + break; + // Stop case WM_USER_STOP: main_frame->DoStop(); @@ -739,7 +744,7 @@ void CFrame::OnKeyDown(wxKeyEvent& event) } else if(event.GetKeyCode() == WXK_ESCAPE) { - main_frame->DoStop(); + main_frame->DoPause(); } // event.Skip() allows the event to propagate to the gamelist for example else if (! (Core::GetState() == Core::CORE_RUN && bRenderToMain && event.GetEventObject() == this)) @@ -932,8 +937,8 @@ void CFrame::DoFullscreen(bool bF) #ifdef _WIN32 else // Post the message to the separate rendering window which will then handle it. { - PostMessage((HWND)Core::GetWindowHandle(), WM_USER, TOGGLE_FULLSCREEN, 0); BringWindowToTop((HWND)Core::GetWindowHandle()); + PostMessage((HWND)Core::GetWindowHandle(), WM_USER, TOGGLE_FULLSCREEN, 0); } #endif } |