diff options
| author | Ingo Maier <ingo.maier@epfl.ch> | 2010-03-28 13:56:18 +0000 |
|---|---|---|
| committer | Ingo Maier <ingo.maier@epfl.ch> | 2010-03-28 13:56:18 +0000 |
| commit | 59da69b707e2e79fbaad4aae7fc347ca1b66a34b (patch) | |
| tree | 37848bc16151410cd585a301ef67c1249f87181f /src/swing | |
| parent | ee813239083af64a0c532026c39f21283a54d3d7 (diff) | |
| download | scala-59da69b707e2e79fbaad4aae7fc347ca1b66a34b.tar.gz scala-59da69b707e2e79fbaad4aae7fc347ca1b66a34b.tar.bz2 scala-59da69b707e2e79fbaad4aae7fc347ca1b66a34b.zip | |
Fixed #2242. No review.
Diffstat (limited to 'src/swing')
| -rw-r--r-- | src/swing/scala/swing/AbstractButton.scala | 10 | ||||
| -rw-r--r-- | src/swing/scala/swing/Action.scala | 12 | ||||
| -rw-r--r-- | src/swing/scala/swing/TextField.scala | 2 |
3 files changed, 12 insertions, 12 deletions
diff --git a/src/swing/scala/swing/AbstractButton.scala b/src/swing/scala/swing/AbstractButton.scala index 9335eaf706..5de0283e22 100644 --- a/src/swing/scala/swing/AbstractButton.scala +++ b/src/swing/scala/swing/AbstractButton.scala @@ -20,7 +20,7 @@ import javax.swing.{AbstractButton => JAbstractButton, Icon} * * @see javax.swing.AbstractButton */ -abstract class AbstractButton extends Component with Action.Trigger with Publisher { +abstract class AbstractButton extends Component with Action.Trigger.Wrapper with Publisher { override lazy val peer: JAbstractButton = new JAbstractButton with SuperMixin {} def text: String = peer.getText @@ -41,14 +41,6 @@ abstract class AbstractButton extends Component with Action.Trigger with Publish def rolloverSelectedIcon: Icon = peer.getRolloverSelectedIcon def rolloverSelectedIcon_=(b: Icon) = peer.setRolloverSelectedIcon(b) - // TODO: we need an action cache - private var _action: Action = Action.NoAction - def action: Action = _action - def action_=(a: Action) { _action = a; peer.setAction(a.peer) } - - //1.6: def hideActionText: Boolean = peer.getHideActionText - //def hideActionText_=(b: Boolean) = peer.setHideActionText(b) - peer.addActionListener(Swing.ActionListener { e => publish(ButtonClicked(AbstractButton.this)) }) diff --git a/src/swing/scala/swing/Action.scala b/src/swing/scala/swing/Action.scala index c9a23e1e24..613038abe2 100644 --- a/src/swing/scala/swing/Action.scala +++ b/src/swing/scala/swing/Action.scala @@ -29,9 +29,17 @@ object Action { def peer: javax.swing.JComponent { def addActionListener(a: ActionListener) def removeActionListener(a: ActionListener) - def setAction(a: Action): javax.swing.Action - def getAction: javax.swing.Action + def setAction(a: javax.swing.Action) + def getAction(): javax.swing.Action } + + // TODO: we need an action cache + private var _action: Action = Action.NoAction + def action: Action = _action + def action_=(a: Action) { _action = a; peer.setAction(a.peer) } + + //1.6: def hideActionText: Boolean = peer.getHideActionText + //def hideActionText_=(b: Boolean) = peer.setHideActionText(b) } } diff --git a/src/swing/scala/swing/TextField.scala b/src/swing/scala/swing/TextField.scala index 9b6e5c50dd..2f63da7f00 100644 --- a/src/swing/scala/swing/TextField.scala +++ b/src/swing/scala/swing/TextField.scala @@ -30,7 +30,7 @@ import java.awt.event._ * * @see javax.swing.JTextField */ -class TextField(text0: String, columns0: Int) extends TextComponent with TextComponent.HasColumns { +class TextField(text0: String, columns0: Int) extends TextComponent with TextComponent.HasColumns with Action.Trigger.Wrapper { override lazy val peer: JTextField = new JTextField(text0, columns0) with SuperMixin def this(text: String) = this(text, 0) def this(columns: Int) = this("", columns) |