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

Reverting patch 1325857

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37222 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2006-01-30 20:04:58 +00:00
parent 03a37db96a
commit 84dc821c24
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gtk/window.cpp
View File

@@ -976,7 +976,12 @@ static gint gtk_window_key_press_callback( GtkWidget *widget,
bool ret = false; bool ret = false;
bool return_after_IM = false; bool return_after_IM = false;
if( wxTranslateGTKKeyEventToWx(event, win, gdk_event) == false ) if( wxTranslateGTKKeyEventToWx(event, win, gdk_event) )
{
// Emit KEY_DOWN event
ret = win->GetEventHandler()->ProcessEvent( event );
}
else
{ {
// Return after IM processing as we cannot do // Return after IM processing as we cannot do
// anything with it anyhow. // anything with it anyhow.
@@ -1011,9 +1016,6 @@ static gint gtk_window_key_press_callback( GtkWidget *widget,
if (return_after_IM) if (return_after_IM)
return false; return false;
// Emit KEY_DOWN event
ret = win->GetEventHandler()->ProcessEvent( event );
#if wxUSE_ACCEL #if wxUSE_ACCEL
if (!ret) if (!ret)
{ {

14
src/gtk1/window.cpp
View File

@@ -1057,18 +1057,17 @@ static gint gtk_window_key_press_callback( GtkWidget *widget,
bool return_after_IM = false; bool return_after_IM = false;
if( wxTranslateGTKKeyEventToWx(event, win, gdk_event) == false ) if( wxTranslateGTKKeyEventToWx(event, win, gdk_event) == false )
{
// Emit KEY_DOWN event
ret = win->GetEventHandler()->ProcessEvent( event );
}
else
{ {
// Return after IM processing as we cannot do // Return after IM processing as we cannot do
// anything with it anyhow. // anything with it anyhow.
return_after_IM = true; return_after_IM = true;
} }
if (return_after_IM)
return false;
// Emit KEY_DOWN event
ret = win->GetEventHandler()->ProcessEvent( event );
// This is for GTK+ 1.2 only. The char event generatation for GTK+ 2.0 is done // This is for GTK+ 1.2 only. The char event generatation for GTK+ 2.0 is done
// in the "commit" handler. // in the "commit" handler.
@@ -1127,6 +1126,9 @@ static gint gtk_window_key_press_callback( GtkWidget *widget,
return true; return true;
} }
if (return_after_IM)
return false;
#if wxUSE_ACCEL #if wxUSE_ACCEL
if (!ret) if (!ret)
{ {