From 20db80bf6d59b8fc86c31af0122647fbf2ef35b5 Mon Sep 17 00:00:00 2001 From: hrydgard Date: Thu, 2 Jul 2009 21:17:36 +0000 Subject: [PATCH] MSDN says that wParam should be masked ... maybe will fix a user reported problem of the screensaver starting git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3651 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/DolphinWX/Src/Frame.cpp | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/Source/Core/DolphinWX/Src/Frame.cpp b/Source/Core/DolphinWX/Src/Frame.cpp index 278a07ee38..5ef27834f5 100644 --- a/Source/Core/DolphinWX/Src/Frame.cpp +++ b/Source/Core/DolphinWX/Src/Frame.cpp @@ -468,22 +468,22 @@ void CFrame::OnClose(wxCloseEvent& event) // Input and host messages // ŻŻŻŻŻŻŻŻŻŻŻŻŻŻ #ifdef _WIN32 - WXLRESULT CFrame::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) +WXLRESULT CFrame::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) +{ + switch (nMsg) { - switch (nMsg) + case WM_SYSCOMMAND: + switch (wParam & 0xFFF0) { - case WM_SYSCOMMAND: - switch (wParam) - { - case SC_SCREENSAVE: - case SC_MONITORPOWER: - return 0; - } - default: - // Let wxWidgets process it as normal - return wxFrame::MSWWindowProc(nMsg, wParam, lParam); + case SC_SCREENSAVE: + case SC_MONITORPOWER: + return 0; } + default: + // Let wxWidgets process it as normal + return wxFrame::MSWWindowProc(nMsg, wParam, lParam); } +} #endif void CFrame::OnHostMessage(wxCommandEvent& event) @@ -738,4 +738,3 @@ void CFrame::Update() } } #endif -