diff options
| author | michi_cc <michi_cc@openttd.org> | 2013-08-05 20:36:36 +0000 |
|---|---|---|
| committer | michi_cc <michi_cc@openttd.org> | 2013-08-05 20:36:36 +0000 |
| commit | 019984a14f01e4463ae479765d2340ff26055367 (patch) | |
| tree | 291b47c56523ebef7368f3588e921a1cdb78f331 /src/video/win32_v.cpp | |
| parent | 270d8aa639341f8be7fde9aa6e6f5bb6fa894d4f (diff) | |
| download | openttd-019984a14f01e4463ae479765d2340ff26055367.tar.xz | |
(svn r25671) -Codechange: Pass character and key code separately to the keyboard handler.
Diffstat (limited to 'src/video/win32_v.cpp')
| -rw-r--r-- | src/video/win32_v.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/video/win32_v.cpp b/src/video/win32_v.cpp index 814fdc4b9..7a6e8a866 100644 --- a/src/video/win32_v.cpp +++ b/src/video/win32_v.cpp @@ -447,7 +447,7 @@ static LRESULT HandleCharMsg(uint keycode, uint charcode) charcode = len == 1 ? w : 0; #endif /* UNICODE */ - HandleKeypress(GB(charcode, 0, 16) | (keycode << 16)); + HandleKeypress(keycode, charcode); return 0; } @@ -637,7 +637,7 @@ static LRESULT CALLBACK WndProcGdi(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP /* No character translation? */ if (charcode == 0) { - HandleKeypress(0 | (keycode << 16)); + HandleKeypress(keycode, 0); return 0; } @@ -669,11 +669,11 @@ static LRESULT CALLBACK WndProcGdi(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP return 0; // do nothing case VK_F10: // F10, ignore activation of menu - HandleKeypress(MapWindowsKey(wParam) << 16); + HandleKeypress(MapWindowsKey(wParam), 0); return 0; default: // ALT in combination with something else - HandleKeypress(MapWindowsKey(wParam) << 16); + HandleKeypress(MapWindowsKey(wParam), 0); break; } break; |