From b3d048558793dabae39a695115cc97383650df5a Mon Sep 17 00:00:00 2001 From: zeromus Date: Wed, 11 Feb 2009 04:45:08 +0000 Subject: [PATCH] win32: fix some hotkey bugs. change how the main wndproc works, because it was working in a lame way before. this might have some subtle undesired effects but none of them serious --- desmume/src/windows/hotkey.cpp | Bin 24890 -> 24882 bytes desmume/src/windows/main.cpp | 10 ++++------ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/desmume/src/windows/hotkey.cpp b/desmume/src/windows/hotkey.cpp index d21f7d93a6164f3cd3a90b2c6c08977911b21a8d..d6464de96be16d190e47cd1e0399b2629cf0fd80 100644 GIT binary patch delta 30 mcmdmWh;h>)#tlCVHyM3koLr(UGTBUDVDdU6j?FSAa=HN2RtvZQ delta 35 rcmdmVh;i2;#tlCV*%cUc859@{C$HDn+^k@9f^qUBL#54JCK|c`<>w2R diff --git a/desmume/src/windows/main.cpp b/desmume/src/windows/main.cpp index cc04f7901..a4211cbac 100644 --- a/desmume/src/windows/main.cpp +++ b/desmume/src/windows/main.cpp @@ -1789,7 +1789,9 @@ int HandleKeyMessage(WPARAM wParam, LPARAM lParam, int modifiers) // don't pull down menu if alt is a hotkey or the menu isn't there, unless no game is running //if(!Settings.StopEmulation && ((wParam == VK_MENU || wParam == VK_F10) && (hitHotKey || GetMenu (GUI.hWnd) == NULL) && !GetAsyncKeyState(VK_F4))) - // return 0; + /*if(((wParam == VK_MENU || wParam == VK_F10) && (hitHotKey || GetMenu (MainWindow->getHWnd()) == NULL) && !GetAsyncKeyState(VK_F4))) + return 0;*/ + return 1; } return 1; @@ -2637,13 +2639,9 @@ LRESULT CALLBACK WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM break; } - - // return 0; - default: /* for messages that we don't deal with */ - return DefWindowProc (hwnd, message, wParam, lParam); } - return 0; + return DefWindowProc (hwnd, message, wParam, lParam); } LRESULT CALLBACK GFX3DSettingsDlgProc(HWND hw, UINT msg, WPARAM wp, LPARAM lp)