From: Julian Smart <julian@anthemion.co.uk>
Date: Mon, 30 Jan 2006 20:04:58 +0000 (+0000)
Subject: Reverting patch 1325857
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/84dc821c24896242031726bd1f1a9aca2a37eb2b

Reverting patch 1325857


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37222 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 60eb991902..681e5e82a3 100644
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -976,7 +976,12 @@ static gint gtk_window_key_press_callback( GtkWidget *widget,
     bool ret = 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
         // anything with it anyhow.
@@ -1011,9 +1016,6 @@ static gint gtk_window_key_press_callback( GtkWidget *widget,
     if (return_after_IM)
         return false;
 
-    // Emit KEY_DOWN event
-    ret = win->GetEventHandler()->ProcessEvent( event );
-
 #if wxUSE_ACCEL
     if (!ret)
     {
diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp
index eebfa24d1e..f7dd7acaeb 100644
--- a/src/gtk1/window.cpp
+++ b/src/gtk1/window.cpp
@@ -1057,18 +1057,17 @@ static gint gtk_window_key_press_callback( GtkWidget *widget,
     bool return_after_IM = 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
         // anything with it anyhow.
         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
     // in the "commit" handler.
 
@@ -1127,6 +1126,9 @@ static gint gtk_window_key_press_callback( GtkWidget *widget,
         return true;
     }
 
+    if (return_after_IM)
+        return false;
+
 #if wxUSE_ACCEL
     if (!ret)
     {