# HG changeset patch # User anthony # Date 1329833714 -14400 # Node ID d300cb62fd4a661486b60ccace4067616765012d # Parent acd4007a7436b9a5cbea448ad3ae6af356c12bcb 7146572: enableInputMethod(false) does not work in the TextArea and TextField on the linux platform Summary: Peers' constructors shouldn't override user's enableInputMethod() settings Reviewed-by: anthony Contributed-by: Charles Lee diff -r acd4007a7436 -r d300cb62fd4a src/solaris/classes/sun/awt/X11/XTextAreaPeer.java --- a/src/solaris/classes/sun/awt/X11/XTextAreaPeer.java Thu Oct 13 13:02:37 2011 +0100 +++ b/src/solaris/classes/sun/awt/X11/XTextAreaPeer.java Tue Feb 21 18:15:14 2012 +0400 @@ -105,7 +105,6 @@ 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 @@ 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 -r acd4007a7436 -r d300cb62fd4a src/solaris/classes/sun/awt/X11/XTextFieldPeer.java --- a/src/solaris/classes/sun/awt/X11/XTextFieldPeer.java Thu Oct 13 13:02:37 2011 +0100 +++ b/src/solaris/classes/sun/awt/X11/XTextFieldPeer.java Tue Feb 21 18:15:14 2012 +0400 @@ -73,8 +73,6 @@ 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;