From: Robin Dunn Date: Thu, 9 Mar 2006 02:20:39 +0000 (+0000) Subject: Keep the key up/down event consistency without relying on toupper() X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/61f0bec0cd812de8ed7e50dff6a269043e49c7a2 Keep the key up/down event consistency without relying on toupper() git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37917 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp index eda96a1e10..ae474682b5 100644 --- a/src/gtk/window.cpp +++ b/src/gtk/window.cpp @@ -844,10 +844,6 @@ static void wxFillOtherKeyEventFields(wxKeyEvent& event, event.m_rawFlags = 0; #if wxUSE_UNICODE event.m_uniChar = gdk_keyval_to_unicode(gdk_event->keyval); - if ( gdk_event->type == GDK_KEY_PRESS || gdk_event->type == GDK_KEY_RELEASE ) - { - event.m_uniChar = toupper(event.m_uniChar); - } #endif wxGetMousePosition( &x, &y ); win->ScreenToClient( &x, &y ); @@ -955,6 +951,12 @@ wxTranslateGTKKeyEventToWx(wxKeyEvent& 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; }