Workaround for Ctrl-A giving a keycode of 1 in EVT_KEY_DOWN on wxGTK

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11840 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/contrib/src/stc/ScintillaWX.cpp b/contrib/src/stc/ScintillaWX.cpp
index 2add87761f10187c878ddd179827472d420887b3..62d53360e554278171c136d233e6f321eb4d2b47 100644 (file)
--- a/contrib/src/stc/ScintillaWX.cpp
+++ b/contrib/src/stc/ScintillaWX.cpp
@@ -428,6 +428,12 @@ void ScintillaWX::DoAddChar(char ch) {
 }
 
 int  ScintillaWX::DoKeyDown(int key, bool shift, bool ctrl, bool alt, bool* consumed) {
+#ifdef __WXGTK__
+    // Ctrl chars (A-Z) end up with the wrong keycode on wxGTK...
+    if (ctrl && key >= 1 && key <= 26)
+        key += 'A' - 1;
+#endif
+
     switch (key) {
     case WXK_DOWN: key = SCK_DOWN; break;
     case WXK_UP: key = SCK_UP; break;

diff --git a/src/stc/ScintillaWX.cpp b/src/stc/ScintillaWX.cpp
index 2add87761f10187c878ddd179827472d420887b3..62d53360e554278171c136d233e6f321eb4d2b47 100644 (file)
--- a/src/stc/ScintillaWX.cpp
+++ b/src/stc/ScintillaWX.cpp
@@ -428,6 +428,12 @@ void ScintillaWX::DoAddChar(char ch) {
 }
 
 int  ScintillaWX::DoKeyDown(int key, bool shift, bool ctrl, bool alt, bool* consumed) {
+#ifdef __WXGTK__
+    // Ctrl chars (A-Z) end up with the wrong keycode on wxGTK...
+    if (ctrl && key >= 1 && key <= 26)
+        key += 'A' - 1;
+#endif
+
     switch (key) {
     case WXK_DOWN: key = SCK_DOWN; break;
     case WXK_UP: key = SCK_UP; break;