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

blind fix for Unicode key handling (patch 1615989)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45206 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-04-01 15:19:44 +00:00
parent 5c68088294
commit 4358b585f1
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
contrib/src/stc/stc.cpp.in
View File

@@ -756,6 +756,13 @@ void wxStyledTextCtrl::OnChar(wxKeyEvent& evt) {
#endif #endif
bool skip = ((ctrl || alt) && ! (ctrl && alt)); bool skip = ((ctrl || alt) && ! (ctrl && alt));
#if wxUSE_UNICODE
// apparently if we don't do this, Unicode keys pressed after non-char
// ASCII ones (e.g. Enter, Tab) are not taken into account (patch 1615989)
if (m_lastKeyDownConsumed && evt.GetUnicodeKey() > 255)
m_lastKeyDownConsumed = false;
#endif
if (!m_lastKeyDownConsumed && !skip) { if (!m_lastKeyDownConsumed && !skip) {
#if wxUSE_UNICODE #if wxUSE_UNICODE
int key = evt.GetUnicodeKey(); int key = evt.GetUnicodeKey();

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

@@ -756,6 +756,13 @@ void wxStyledTextCtrl::OnChar(wxKeyEvent& evt) {
#endif #endif
bool skip = ((ctrl || alt) && ! (ctrl && alt)); bool skip = ((ctrl || alt) && ! (ctrl && alt));
#if wxUSE_UNICODE
// apparently if we don't do this, Unicode keys pressed after non-char
// ASCII ones (e.g. Enter, Tab) are not taken into account (patch 1615989)
if (m_lastKeyDownConsumed && evt.GetUnicodeKey() > 255)
m_lastKeyDownConsumed = false;
#endif
if (!m_lastKeyDownConsumed && !skip) { if (!m_lastKeyDownConsumed && !skip) {
#if wxUSE_UNICODE #if wxUSE_UNICODE
int key = evt.GetUnicodeKey(); int key = evt.GetUnicodeKey();