Applied patch [ 1325857 ] CJK input method doesn't work properly(GTK, CVS)

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

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 36ac106b2010f45093a1242f73c25bc1d0abe14e..29faacac74e9c7ecd4b415bca7dc0c543179d5c2 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -1163,12 +1163,7 @@ static gint gtk_window_key_press_callback( GtkWidget *widget,
     bool ret = false;
     bool return_after_IM = false;
 
-    if( wxTranslateGTKKeyEventToWx(event, win, gdk_event) )
-    {
-        // Emit KEY_DOWN event
-        ret = win->GetEventHandler()->ProcessEvent( event );
-    }
-    else
+    if( wxTranslateGTKKeyEventToWx(event, win, gdk_event) == false )
     {
         // Return after IM processing as we cannot do
         // anything with it anyhow.
@@ -1203,6 +1198,9 @@ static gint gtk_window_key_press_callback( GtkWidget *widget,
 #endif
     if (return_after_IM)
         return false;
+        
+    // Emit KEY_DOWN event
+    ret = win->GetEventHandler()->ProcessEvent( event );
 
 #ifndef __WXGTK20__
     // This is for GTK+ 1.2 only. The char event generatation for GTK+ 2.0 is done

diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp
index 36ac106b2010f45093a1242f73c25bc1d0abe14e..29faacac74e9c7ecd4b415bca7dc0c543179d5c2 100644 (file)
--- a/src/gtk1/window.cpp
+++ b/src/gtk1/window.cpp
@@ -1163,12 +1163,7 @@ static gint gtk_window_key_press_callback( GtkWidget *widget,
     bool ret = false;
     bool return_after_IM = false;
 
-    if( wxTranslateGTKKeyEventToWx(event, win, gdk_event) )
-    {
-        // Emit KEY_DOWN event
-        ret = win->GetEventHandler()->ProcessEvent( event );
-    }
-    else
+    if( wxTranslateGTKKeyEventToWx(event, win, gdk_event) == false )
     {
         // Return after IM processing as we cannot do
         // anything with it anyhow.
@@ -1203,6 +1198,9 @@ static gint gtk_window_key_press_callback( GtkWidget *widget,
 #endif
     if (return_after_IM)
         return false;
+        
+    // Emit KEY_DOWN event
+    ret = win->GetEventHandler()->ProcessEvent( event );
 
 #ifndef __WXGTK20__
     // This is for GTK+ 1.2 only. The char event generatation for GTK+ 2.0 is done