From 0b187670897ab1a29e609b581f44344d367c55d6 Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Wed, 1 Dec 2004 18:29:13 +0000 Subject: [PATCH] Applied patch to correct EVT-CHAR git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30830 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/window.cpp | 11 ++++++----- src/gtk1/window.cpp | 11 ++++++----- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp index 8878e9dbba..11167b3844 100644 --- a/src/gtk/window.cpp +++ b/src/gtk/window.cpp @@ -1203,15 +1203,16 @@ static gint gtk_window_key_press_callback( GtkWidget *widget, key_code = wxTranslateKeySymToWXKey(keysym, TRUE /* isChar */); if ( !key_code ) { - if ( gdk_event->length == 1 ) - { - key_code = (unsigned char)gdk_event->string[0]; - } - else if ( wxIsAsciiKeysym(keysym) ) + if ( wxIsAsciiKeysym(keysym) ) { // ASCII key key_code = (unsigned char)keysym; } + // gdk_event->string is actually deprecated + else if ( gdk_event->length == 1 ) + { + key_code = (unsigned char)gdk_event->string[0]; + } } if ( key_code ) diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp index 8878e9dbba..11167b3844 100644 --- a/src/gtk1/window.cpp +++ b/src/gtk1/window.cpp @@ -1203,15 +1203,16 @@ static gint gtk_window_key_press_callback( GtkWidget *widget, key_code = wxTranslateKeySymToWXKey(keysym, TRUE /* isChar */); if ( !key_code ) { - if ( gdk_event->length == 1 ) - { - key_code = (unsigned char)gdk_event->string[0]; - } - else if ( wxIsAsciiKeysym(keysym) ) + if ( wxIsAsciiKeysym(keysym) ) { // ASCII key key_code = (unsigned char)keysym; } + // gdk_event->string is actually deprecated + else if ( gdk_event->length == 1 ) + { + key_code = (unsigned char)gdk_event->string[0]; + } } if ( key_code ) -- 2.45.2