From b4e2f93248fca0ba280424ca430799dbed7b6dc7 Mon Sep 17 00:00:00 2001
From: David Costanzo <david_costanzo@users.sourceforge.net>
Date: Sun, 17 Jul 2016 14:15:40 +0200
Subject: [PATCH] Don't handle special keys as characters in wxSTC in
 non-Unicode build

Correct the check for non-special keys when wxUSE_UNICODE==0.

Closes #17598.

(cherry picked from commit ab092c8d13312a7b519521bc839441f0c90e716a)
---
 docs/changes.txt   | 1 +
 src/stc/stc.cpp    | 2 +-
 src/stc/stc.cpp.in | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/changes.txt b/docs/changes.txt
index abbadf529d..c9304a16d0 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -613,6 +613,7 @@ All (GUI):
 - Accept wxALIGN_CENTRE_HORIZONTAL in wxStaticText XRC handler (David Hart).
 - Fix appearance after updating a wxGrid with hidden rows/columns (iwbnwif).
 - Make wxAuiNotebookXmlHandler actually work.
+- Fix key handling in wxStyledTextCtrl in non-Unicode build (David Costanzo).
 
 wxGTK:
 
diff --git a/src/stc/stc.cpp b/src/stc/stc.cpp
index 38b9d52e30..e16eaad412 100644
--- a/src/stc/stc.cpp
+++ b/src/stc/stc.cpp
@@ -4749,7 +4749,7 @@ void wxStyledTextCtrl::OnChar(wxKeyEvent& evt) {
         }
 #else
         int key = evt.GetKeyCode();
-        if (key <= WXK_START || key > WXK_COMMAND) {
+        if (key < WXK_START) {
             m_swx->DoAddChar(key);
             return;
         }
diff --git a/src/stc/stc.cpp.in b/src/stc/stc.cpp.in
index cd4ee94e94..50c2dab618 100644
--- a/src/stc/stc.cpp.in
+++ b/src/stc/stc.cpp.in
@@ -887,7 +887,7 @@ void wxStyledTextCtrl::OnChar(wxKeyEvent& evt) {
         }
 #else
         int key = evt.GetKeyCode();
-        if (key <= WXK_START || key > WXK_COMMAND) {
+        if (key < WXK_START) {
             m_swx->DoAddChar(key);
             return;
         }