ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
zeromus 2009-02-11 04:45:08 +00:00
parent cfdc18fa53
commit b3d0485587
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
desmume/src/windows/hotkey.cpp
View File

Binary file not shown.

10
desmume/src/windows/main.cpp
View File

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