Don't adjust the keycode for Ctrl-Backspace

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

diff --git a/contrib/src/stc/ScintillaWX.cpp b/contrib/src/stc/ScintillaWX.cpp
index 25edc65c6d58f0167ffa3e563081c759e9e3990b..97173fd4f7c4122a2005499eeebfb4a1789b83b7 100644 (file)
--- a/contrib/src/stc/ScintillaWX.cpp
+++ b/contrib/src/stc/ScintillaWX.cpp
@@ -851,7 +851,7 @@ int  ScintillaWX::DoKeyDown(const wxKeyEvent& evt, bool* consumed)
          ctrl  = evt.ControlDown(),
          alt   = evt.AltDown();
 
          ctrl  = evt.ControlDown(),
          alt   = evt.AltDown();
 

-    if (ctrl && key >= 1 && key <= 26)
+    if (ctrl && key >= 1 && key <= 26 && key != WXK_BACK)

         key += 'A' - 1;
 
     switch (key) {
         key += 'A' - 1;
 
     switch (key) {

diff --git a/src/stc/ScintillaWX.cpp b/src/stc/ScintillaWX.cpp
index 25edc65c6d58f0167ffa3e563081c759e9e3990b..97173fd4f7c4122a2005499eeebfb4a1789b83b7 100644 (file)
--- a/src/stc/ScintillaWX.cpp
+++ b/src/stc/ScintillaWX.cpp
@@ -851,7 +851,7 @@ int  ScintillaWX::DoKeyDown(const wxKeyEvent& evt, bool* consumed)
          ctrl  = evt.ControlDown(),
          alt   = evt.AltDown();
 
          ctrl  = evt.ControlDown(),
          alt   = evt.AltDown();
 

-    if (ctrl && key >= 1 && key <= 26)
+    if (ctrl && key >= 1 && key <= 26 && key != WXK_BACK)

         key += 'A' - 1;
 
     switch (key) {
         key += 'A' - 1;
 
     switch (key) {