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

Don't set Unicode key code in key events to non-Unicode values in wxGTK.

Browse Source 
Only assign the wx key code wxKeyEvent::m_uniChar if it's a key corresponding
to an ASCII symbol, don't do it for the values outside of ASCII range such as
all the special WXK_ constants. It doesn't make sense to generate Unicode key
codes for e.g. cursor key presses.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65240 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2010-08-10 22:38:54 +00:00
parent 27607839f1
commit 276f883f7a
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/gtk/window.cpp
View File

@@ -688,7 +688,14 @@ static void wxFillOtherKeyEventFields(wxKeyEvent& event,
event.m_rawFlags = 0; event.m_rawFlags = 0;
#if wxUSE_UNICODE #if wxUSE_UNICODE
event.m_uniChar = gdk_keyval_to_unicode(gdk_event->keyval); event.m_uniChar = gdk_keyval_to_unicode(gdk_event->keyval);
#endif if ( !event.m_uniChar && event.m_keyCode <= WXK_DELETE )
{
// Set Unicode key code to the ASCII equivalent for compatibility. E.g.
// let RETURN generate the key event with both key and Unicode key
// codes of 13.
event.m_uniChar = event.m_keyCode;
}
#endif // wxUSE_UNICODE
wxGetMousePosition( &x, &y ); wxGetMousePosition( &x, &y );
win->ScreenToClient( &x, &y ); win->ScreenToClient( &x, &y );
event.m_x = x; event.m_x = x;
@@ -791,17 +798,11 @@ wxTranslateGTKKeyEventToWx(wxKeyEvent& event,
if ( !key_code ) if ( !key_code )
return false; return false;
event.m_keyCode = key_code;
// now fill all the other fields // now fill all the other fields
wxFillOtherKeyEventFields(event, win, gdk_event); wxFillOtherKeyEventFields(event, win, gdk_event);
event.m_keyCode = key_code;
#if wxUSE_UNICODE
if ( gdk_event->type == GDK_KEY_PRESS || gdk_event->type == GDK_KEY_RELEASE )
{
event.m_uniChar = key_code;
}
#endif
return true; return true;
} }