summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBogdan Gheorghe <gheorghe@ca.ibm.com>2012-07-30 11:00:48 -0400
committerBogdan Gheorghe <gheorghe@ca.ibm.com>2012-07-30 11:00:48 -0400
commit3025d237f680a2e072fde4f6a213f48f2a5248fa (patch)
tree12814c40f709e331b269765b81004a8c327c9fd8
parentde6fbaaec46412d3fdef0c01810182c0b01cafbd (diff)
downloadeclipse.platform.swt-3025d237f680a2e072fde4f6a213f48f2a5248fa.tar.gz
eclipse.platform.swt-3025d237f680a2e072fde4f6a213f48f2a5248fa.tar.xz
eclipse.platform.swt-3025d237f680a2e072fde4f6a213f48f2a5248fa.zip
Bug 381974 - DBCS4.2: Can not choose Hanzi on Text editor with AIX T/S-Chinese IME
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java11
1 files changed, 6 insertions, 5 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java
index ed2c7673d2..d65604cdec 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java
@@ -3032,18 +3032,19 @@ int /*long*/ gtk_focus_out_event (int /*long*/ widget, int /*long*/ event) {
}
int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ event) {
- if (!hasFocus ()) return 0;
GdkEventKey gdkEvent = new GdkEventKey ();
OS.memmove (gdkEvent, event, GdkEventKey.sizeof);
+
+ if (filterKey (gdkEvent.keyval, event)) return 1;
+ // widget could be disposed at this point
+ if (isDisposed ()) return 0;
+
+ if (!hasFocus ()) return 0;
if (translateMnemonic (gdkEvent.keyval, gdkEvent)) return 1;
// widget could be disposed at this point
if (isDisposed ()) return 0;
- if (filterKey (gdkEvent.keyval, event)) return 1;
- // widget could be disposed at this point
- if (isDisposed ()) return 0;
-
if (translateTraversal (gdkEvent)) return 1;
// widget could be disposed at this point
if (isDisposed ()) return 0;