From df18cb7401b43b30643d9ac1925a7cdc82a2bedb Mon Sep 17 00:00:00 2001 From: Charles Lee Date: Tue, 21 Feb 2012 18:15:14 +0400 Subject: [PATCH] 7146572: enableInputMethod(false) does not work in the TextArea and TextField on the linux platform Peers' constructors shouldn't override user's enableInputMethod() settings Reviewed-by: anthony --- jdk/src/solaris/classes/sun/awt/X11/XTextAreaPeer.java | 2 -- jdk/src/solaris/classes/sun/awt/X11/XTextFieldPeer.java | 2 -- 2 files changed, 4 deletions(-) diff --git a/jdk/src/solaris/classes/sun/awt/X11/XTextAreaPeer.java b/jdk/src/solaris/classes/sun/awt/X11/XTextAreaPeer.java index 972446dc8b3..37b096f8470 100644 --- a/jdk/src/solaris/classes/sun/awt/X11/XTextAreaPeer.java +++ b/jdk/src/solaris/classes/sun/awt/X11/XTextAreaPeer.java @@ -105,7 +105,6 @@ class XTextAreaPeer extends XComponentPeer implements TextAreaPeer { this.target = target; //ComponentAccessor.enableEvents(target,AWTEvent.MOUSE_WHEEL_EVENT_MASK); - target.enableInputMethods(true); firstChangeSkipped = false; String text = ((TextArea)target).getText(); @@ -113,7 +112,6 @@ class XTextAreaPeer extends XComponentPeer implements TextAreaPeer { jtext.setWrapStyleWord(true); jtext.getDocument().addDocumentListener(jtext); XToolkit.specialPeerMap.put(jtext,this); - jtext.enableInputMethods(true); textPane = new AWTTextPane(jtext,this, target.getParent()); setBounds(x, y, width, height, SET_BOUNDS); diff --git a/jdk/src/solaris/classes/sun/awt/X11/XTextFieldPeer.java b/jdk/src/solaris/classes/sun/awt/X11/XTextFieldPeer.java index bb7ac17032b..8a09c90735d 100644 --- a/jdk/src/solaris/classes/sun/awt/X11/XTextFieldPeer.java +++ b/jdk/src/solaris/classes/sun/awt/X11/XTextFieldPeer.java @@ -73,8 +73,6 @@ public class XTextFieldPeer extends XComponentPeer implements TextFieldPeer { xtext = new XAWTTextField(text,this, target.getParent()); xtext.getDocument().addDocumentListener(xtext); xtext.setCursor(target.getCursor()); - target.enableInputMethods(true); - xtext.enableInputMethods(true); XToolkit.specialPeerMap.put(xtext,this); TextField txt = (TextField) target;