diff options
| author | Ingo Maier <ingo.maier@epfl.ch> | 2010-03-28 11:34:48 +0000 |
|---|---|---|
| committer | Ingo Maier <ingo.maier@epfl.ch> | 2010-03-28 11:34:48 +0000 |
| commit | f349e24ea0e386fc8ad4a768251454256fb34dc0 (patch) | |
| tree | 99e5d27a55524ed572dda9af1b476381922638d2 | |
| parent | 0c8e2195960d47e5b9be93efb7c95802ae40dca6 (diff) | |
| download | scala-f349e24ea0e386fc8ad4a768251454256fb34dc0.tar.gz scala-f349e24ea0e386fc8ad4a768251454256fb34dc0.tar.bz2 scala-f349e24ea0e386fc8ad4a768251454256fb34dc0.zip | |
Fixed #3090
| -rw-r--r-- | src/swing/scala/swing/Font.scala | 4 | ||||
| -rw-r--r-- | src/swing/scala/swing/TextField.scala | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/swing/scala/swing/Font.scala b/src/swing/scala/swing/Font.scala index 73862e666d..a58c8967d7 100644 --- a/src/swing/scala/swing/Font.scala +++ b/src/swing/scala/swing/Font.scala @@ -1,6 +1,6 @@ package scala.swing -object Font { +/*object Font { def apply(fontFormat: Int, fontFile: java.io.File) = java.awt.Font.createFont(fontFormat, fontFile) def apply(fontFormat: Int, fontStream: java.io.InputStream) = java.awt.Font.createFont(fontFormat, fontStream) def decode(str: String) = java.awt.Font.decode(str) @@ -67,4 +67,4 @@ object Font { def Rectangle(x: Int, y: Int, width: Int, height: Int) = new Insets(x, y, width, height) def Point(x: Int, y: Int) = new Point(x, y) def Dimension(x: Int, y: Int) = new Dimension(x, y) -}
\ No newline at end of file +}*/
\ No newline at end of file diff --git a/src/swing/scala/swing/TextField.scala b/src/swing/scala/swing/TextField.scala index 437871f9f3..9b6e5c50dd 100644 --- a/src/swing/scala/swing/TextField.scala +++ b/src/swing/scala/swing/TextField.scala @@ -64,15 +64,16 @@ class TextField(text0: String, columns0: Int) extends TextComponent with TextCom def verifier: String => Boolean = s => peer.getInputVerifier.verify(peer) def verifier_=(v: String => Boolean) { peer.setInputVerifier(new InputVerifier { + private val old = peer.getInputVerifier def verify(c: JComponent) = v(text) - override def shouldYieldFocus(c: JComponent) = - peer.getInputVerifier.shouldYieldFocus(c) + override def shouldYieldFocus(c: JComponent) = old.shouldYieldFocus(c) }) } def shouldYieldFocus: String=>Boolean = s => peer.getInputVerifier.shouldYieldFocus(peer) def shouldYieldFocus_=(y: String=>Boolean) { peer.setInputVerifier(new InputVerifier { - def verify(c: JComponent) = peer.getInputVerifier.verify(c) + private val old = peer.getInputVerifier + def verify(c: JComponent) = old.verify(c) override def shouldYieldFocus(c: JComponent) = y(text) }) } |