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

Applied patch to correct EVT-CHAR

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30830 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2004-12-01 18:29:13 +00:00
parent c86abb56d5
commit 0b18767089
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/gtk/window.cpp
View File

@@ -1203,15 +1203,16 @@ static gint gtk_window_key_press_callback( GtkWidget *widget,
key_code = wxTranslateKeySymToWXKey(keysym, TRUE /* isChar */); key_code = wxTranslateKeySymToWXKey(keysym, TRUE /* isChar */);
if ( !key_code ) if ( !key_code )
{ {
if ( gdk_event->length == 1 ) if ( wxIsAsciiKeysym(keysym) )
{
key_code = (unsigned char)gdk_event->string[0];
}
else if ( wxIsAsciiKeysym(keysym) )
{ {
// ASCII key // ASCII key
key_code = (unsigned char)keysym; 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 ) if ( key_code )

11
src/gtk1/window.cpp
View File

@@ -1203,15 +1203,16 @@ static gint gtk_window_key_press_callback( GtkWidget *widget,
key_code = wxTranslateKeySymToWXKey(keysym, TRUE /* isChar */); key_code = wxTranslateKeySymToWXKey(keysym, TRUE /* isChar */);
if ( !key_code ) if ( !key_code )
{ {
if ( gdk_event->length == 1 ) if ( wxIsAsciiKeysym(keysym) )
{
key_code = (unsigned char)gdk_event->string[0];
}
else if ( wxIsAsciiKeysym(keysym) )
{ {
// ASCII key // ASCII key
key_code = (unsigned char)keysym; 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 ) if ( key_code )