Skip to content

Commit

Permalink
fix: correct unicode text entry behavior (fixes twanvl#121)
Browse files Browse the repository at this point in the history
GetKeyCode doesn't handle unicode, so it returns 0 for cyrillic (and other) characters, which was getting rejected as invalid input. I'm assuming this broke on some wxWidgets upgrade, as the MSE code for this hasn't changed in over a decade?
  • Loading branch information
haganbmj committed Jul 21, 2022
1 parent b7b85ce commit f6e8a81
Showing 1 changed file with 9 additions and 2 deletions.
11 changes: 9 additions & 2 deletions src/gui/value/text.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -482,8 +482,15 @@ bool TextValueEditor::onChar(wxKeyEvent& ev) {
}
}
return true;
default:
#ifdef __WXMSW__
default:
#if defined UNICODE
// I think in theory this works because the UnicodeKey is intended to be only character values.
// See the following link for pretty much an exact example of this type of handling.
// https://docs.wxwidgets.org/3.0/classwx_key_event.html#a3dccc5a254770931e5d8066ef47e7fb0
// Most of the special keys (<32) are handled in the case structure above anyways.
// I tried to replicate the Numpad issue mentioned below, but couldn't - so unclear if that's still relevant.
if (ev.GetUnicodeKey() >= WXK_SPACE) {
#elif defined __WXMSW__
if (ev.GetKeyCode() >= _(' ') && ev.GetKeyCode() == (int)ev.GetRawKeyCode()) {
// This check is need, otherwise pressing a key, say "0" on the numpad produces "a0"
// (don't ask me why)
Expand Down

0 comments on commit f6e8a81

Please sign in to comment.