]> git.saurik.com Git - wxWidgets.git/commitdiff
Keep the key up/down event consistency without relying on toupper()
authorRobin Dunn <robin@alldunn.com>
Thu, 9 Mar 2006 02:20:39 +0000 (02:20 +0000)
committerRobin Dunn <robin@alldunn.com>
Thu, 9 Mar 2006 02:20:39 +0000 (02:20 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37917 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/gtk/window.cpp

index eda96a1e107c1b46e243f464da55b5dff1cf7b84..ae474682b58687147b9cceeacdca626af19e728c 100644 (file)
@@ -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;
 }