Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't handle special keys as characters in wxSTC in non-Unicode build

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

Closes #17598.

(cherry picked from commit ab092c8d13)
This commit is contained in:
David Costanzo
2016-07-17 14:15:40 +02:00
committed by Vadim Zeitlin
parent bca90fc95f
commit b4e2f93248
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changes.txt
View File

@@ -613,6 +613,7 @@ All (GUI):
- Accept wxALIGN_CENTRE_HORIZONTAL in wxStaticText XRC handler (David Hart). - Accept wxALIGN_CENTRE_HORIZONTAL in wxStaticText XRC handler (David Hart).
- Fix appearance after updating a wxGrid with hidden rows/columns (iwbnwif). - Fix appearance after updating a wxGrid with hidden rows/columns (iwbnwif).
- Make wxAuiNotebookXmlHandler actually work. - Make wxAuiNotebookXmlHandler actually work.
- Fix key handling in wxStyledTextCtrl in non-Unicode build (David Costanzo).
wxGTK: wxGTK:

2
src/stc/stc.cpp
View File

@@ -4749,7 +4749,7 @@ void wxStyledTextCtrl::OnChar(wxKeyEvent& evt) {
} }
#else #else
int key = evt.GetKeyCode(); int key = evt.GetKeyCode();
if (key <= WXK_START || key > WXK_COMMAND) { if (key < WXK_START) {
m_swx->DoAddChar(key); m_swx->DoAddChar(key);
return; return;
} }

2
src/stc/stc.cpp.in
View File

@@ -887,7 +887,7 @@ void wxStyledTextCtrl::OnChar(wxKeyEvent& evt) {
} }
#else #else
int key = evt.GetKeyCode(); int key = evt.GetKeyCode();
if (key <= WXK_START || key > WXK_COMMAND) { if (key < WXK_START) {
m_swx->DoAddChar(key); m_swx->DoAddChar(key);
return; return;
} }