diff options
| author | Steve Northover <steve> | 2003-06-24 15:25:45 +0000 |
|---|---|---|
| committer | Steve Northover <steve> | 2003-06-24 15:25:45 +0000 |
| commit | 1f703fec00ae333a3a8886c98258abc9ab260f1c (patch) | |
| tree | d8c6009e28f24a5cb609f3aa0f9f3d15773649a3 | |
| parent | facc1495b2f3b766baff1d3bf2596628b222edbe (diff) | |
| download | eclipse.platform.swt-1f703fec00ae333a3a8886c98258abc9ab260f1c.tar.gz eclipse.platform.swt-1f703fec00ae333a3a8886c98258abc9ab260f1c.tar.xz eclipse.platform.swt-1f703fec00ae333a3a8886c98258abc9ab260f1c.zip | |
14815
3 files changed, 6 insertions, 0 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Text.java b/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Text.java index 957ee42156..0fc75fcc1b 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Text.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Text.java @@ -211,6 +211,7 @@ static int checkStyle (int style) { style = checkBits (style, SWT.LEFT, SWT.CENTER, SWT.RIGHT, 0, 0, 0); if ((style & SWT.SINGLE) != 0) style &= ~(SWT.H_SCROLL | SWT.V_SCROLL | SWT.WRAP); if ((style & SWT.WRAP) != 0) style |= SWT.MULTI; + if ((style & SWT.MULTI) != 0) style &= ~SWT.PASSWORD; if ((style & (SWT.SINGLE | SWT.MULTI)) != 0) return style; if ((style & (SWT.H_SCROLL | SWT.V_SCROLL)) != 0) return style | SWT.MULTI; return style | SWT.SINGLE; @@ -1206,6 +1207,7 @@ public void setDoubleClickEnabled (boolean doubleClick) { */ public void setEchoChar (char echo) { checkWidget(); + if ((style & SWT.MULTI) != 0) return; echoCharacter = echo; OS.TXNEchoMode (txnObject, echo, 0, echo != '\0'); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Text.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Text.java index c466615d98..18756f0cfd 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Text.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Text.java @@ -205,6 +205,7 @@ static int checkStyle (int style) { style = checkBits (style, SWT.LEFT, SWT.CENTER, SWT.RIGHT, 0, 0, 0); if ((style & SWT.SINGLE) != 0) style &= ~(SWT.H_SCROLL | SWT.V_SCROLL | SWT.WRAP); if ((style & SWT.WRAP) != 0) style |= SWT.MULTI; + if ((style & SWT.MULTI) != 0) style &= ~SWT.PASSWORD; if ((style & (SWT.SINGLE | SWT.MULTI)) != 0) return style; if ((style & (SWT.H_SCROLL | SWT.V_SCROLL)) != 0) { return style | SWT.MULTI; @@ -1100,6 +1101,7 @@ public void setDoubleClickEnabled (boolean doubleClick) { */ public void setEchoChar (char echo) { checkWidget(); + if ((style & SWT.MULTI) != 0) return; if (echoCharacter == echo) return; String newText; if (echo == 0) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Text.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Text.java index 185683d093..0e249de24d 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Text.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Text.java @@ -252,6 +252,7 @@ static int checkStyle (int style) { style = checkBits (style, SWT.LEFT, SWT.CENTER, SWT.RIGHT, 0, 0, 0); if ((style & SWT.SINGLE) != 0) style &= ~(SWT.H_SCROLL | SWT.V_SCROLL | SWT.WRAP); if ((style & SWT.WRAP) != 0) style |= SWT.MULTI; + if ((style & SWT.MULTI) != 0) style &= ~SWT.PASSWORD; if ((style & (SWT.SINGLE | SWT.MULTI)) != 0) return style; if ((style & (SWT.H_SCROLL | SWT.V_SCROLL)) != 0) return style | SWT.MULTI; return style | SWT.SINGLE; @@ -1177,6 +1178,7 @@ public void setDoubleClickEnabled (boolean doubleClick) { */ public void setEchoChar (char echo) { checkWidget (); + if ((style & SWT.SINGLE) != 0) return; if (echo != 0) { if ((echo = (char) wcsToMbcs (echo, getCodePage ())) == 0) echo = '*'; } |