From 71403278987eb60355c3a6b3f13f1f62f9cced8f Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 22 Jun 2006 18:31:43 +0000 Subject: [PATCH] recognize WXK_NUMPAD_XXX keys in wxCharCodeWXToMSW(): it's better to map them to VK_XXX then to some random junk git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39821 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/window.cpp | 59 ++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 49 insertions(+), 10 deletions(-) diff --git a/src/msw/window.cpp b/src/msw/window.cpp index 1bc66a85eb..9bf5f2e47a 100644 --- a/src/msw/window.cpp +++ b/src/msw/window.cpp @@ -5558,16 +5558,55 @@ WXWORD wxCharCodeWXToMSW(int wxk, bool *isVirtual) WXWORD vk; switch ( wxk ) { - case WXK_PAGEUP: vk = VK_PRIOR; break; - case WXK_PAGEDOWN: vk = VK_NEXT; break; - case WXK_END: vk = VK_END; break; - case WXK_HOME : vk = VK_HOME; break; - case WXK_LEFT : vk = VK_LEFT; break; - case WXK_UP: vk = VK_UP; break; - case WXK_RIGHT: vk = VK_RIGHT; break; - case WXK_DOWN : vk = VK_DOWN; break; - case WXK_INSERT: vk = VK_INSERT; break; - case WXK_DELETE: vk = VK_DELETE; break; + case WXK_PAGEUP: + case WXK_NUMPAD_PAGEUP: + vk = VK_PRIOR; + break; + + case WXK_PAGEDOWN: + case WXK_NUMPAD_PAGEDOWN: + vk = VK_NEXT; + break; + + case WXK_END: + case WXK_NUMPAD_END: + vk = VK_END; + break; + + case WXK_HOME: + case WXK_NUMPAD_HOME: + vk = VK_HOME; + break; + + case WXK_LEFT: + case WXK_NUMPAD_LEFT: + vk = VK_LEFT; + break; + + case WXK_UP: + case WXK_NUMPAD_UP: + vk = VK_UP; + break; + + case WXK_RIGHT: + case WXK_NUMPAD_RIGHT: + vk = VK_RIGHT; + break; + + case WXK_DOWN: + case WXK_NUMPAD_DOWN: + vk = VK_DOWN; + break; + + case WXK_INSERT: + case WXK_NUMPAD_INSERT: + vk = VK_INSERT; + break; + + case WXK_DELETE: + case WXK_NUMPAD_DELETE: + vk = VK_DELETE; + break; default: if ( isVirtual ) -- 2.45.2