From 6103201406b4a529407aa6b175b7207742a38f10 Mon Sep 17 00:00:00 2001 From: Ivan Sorokin Date: Thu, 30 Mar 2023 18:37:11 +0200 Subject: [PATCH] key_code here represents WX key code, not windows virtual key code. so lets use wx codes to avoid double wx->vkc translations --- WinPort/src/Backend/WX/wxWinTranslations.cpp | 22 ++++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/WinPort/src/Backend/WX/wxWinTranslations.cpp b/WinPort/src/Backend/WX/wxWinTranslations.cpp index d5dd2747a..473f17ebb 100644 --- a/WinPort/src/Backend/WX/wxWinTranslations.cpp +++ b/WinPort/src/Backend/WX/wxWinTranslations.cpp @@ -447,17 +447,17 @@ static int X11KeyCodeLookupUncached(wxUint32 keyflags) key_code = toupper(*keysymstr); } switch (ks) { - case XK_minus: key_code = VK_OEM_MINUS; break; - case XK_equal: key_code = VK_OEM_PLUS; break; - case XK_bracketleft: key_code = VK_OEM_4; break; - case XK_bracketright: key_code = VK_OEM_6; break; - case XK_semicolon: key_code = VK_OEM_1; break; - case XK_apostrophe: key_code = VK_OEM_7; break; - case XK_grave: key_code = VK_OEM_3; break; - case XK_backslash: key_code = VK_OEM_5; break; - case XK_comma: key_code = VK_OEM_COMMA; break; - case XK_period: key_code = VK_OEM_PERIOD; break; - case XK_slash: key_code = VK_OEM_2; break; + case XK_minus: key_code = '-'; break; + case XK_equal: key_code = '='; break; + case XK_bracketleft: key_code = '['; break; + case XK_bracketright: key_code = ']'; break; + case XK_semicolon: key_code = ';'; break; + case XK_apostrophe: key_code = '\''; break; + case XK_grave: key_code = '`'; break; + case XK_backslash: key_code = '\\'; break; + case XK_comma: key_code = ','; break; + case XK_period: key_code = '.'; break; + case XK_slash: key_code = '/'; break; } } XkbFreeKeyboard(xkb, 0, True);