diff options
author | NAME <USER@epfl.ch> | 2008-04-21 13:49:55 +0000 |
---|---|---|
committer | NAME <USER@epfl.ch> | 2008-04-21 13:49:55 +0000 |
commit | f18b805841c2562bd5007e319ed3d5905a734a3d (patch) | |
tree | c093de42c8aea49f7ca6ea9108ca72664e03fc8b /src | |
parent | 9c55c50d4b30620d2dd3eb3f23c508651940243a (diff) | |
download | scala-f18b805841c2562bd5007e319ed3d5905a734a3d.tar.gz scala-f18b805841c2562bd5007e319ed3d5905a734a3d.tar.bz2 scala-f18b805841c2562bd5007e319ed3d5905a734a3d.zip |
scala.swing update for rc2, second try
Diffstat (limited to 'src')
-rw-r--r-- | src/swing/scala/swing/Button.scala | 31 | ||||
-rw-r--r-- | src/swing/scala/swing/test/TableSelection.scala | 1 |
2 files changed, 20 insertions, 12 deletions
diff --git a/src/swing/scala/swing/Button.scala b/src/swing/scala/swing/Button.scala index f00d23474f..233b293742 100644 --- a/src/swing/scala/swing/Button.scala +++ b/src/swing/scala/swing/Button.scala @@ -1,21 +1,30 @@ package scala.swing -import javax.swing._ +import javax.swing.{AbstractButton => JAbstractButton,Icon} import event._ -/** A class for buttons; standard constructor wraps around a swing button */ -class Button(override val peer: JButton) extends Component with Publisher { - def this(txt: String) = this(new JButton(txt)) - def this() = this(new JButton) +/** + * @see javax.swing.AbstractButton + */ +abstract class Button(override val peer: JAbstractButton) extends Component(peer) with Action.Trigger with Publisher { def text: String = peer.getText def text_=(s: String) = peer.setText(s) def icon: Icon = peer.getIcon def icon_=(i: Icon) = peer.setIcon(i) - peer.addActionListener { - new java.awt.event.ActionListener { - def actionPerformed(e: java.awt.event.ActionEvent) { - publish(ButtonPressed(Button.this)) - } + + 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(new java.awt.event.ActionListener { + def actionPerformed(e: java.awt.event.ActionEvent) { + publish(ButtonClicked(Button.this)) } - } + }) + + def selected: Boolean = peer.isSelected + def selected_=(b: Boolean) = peer.setSelected(b) } diff --git a/src/swing/scala/swing/test/TableSelection.scala b/src/swing/scala/swing/test/TableSelection.scala index 9a4843d66c..6a967bc0cc 100644 --- a/src/swing/scala/swing/test/TableSelection.scala +++ b/src/swing/scala/swing/test/TableSelection.scala @@ -3,7 +3,6 @@ package scala.swing.test import java.awt.Dimension import swing._ import swing.event._ -import swing.geometry._ object TableSelection extends SimpleGUIApplication { val model = Array[Array[AnyRef]](Array[AnyRef]("Mary", "Campione", "Snowboarding", new java.lang.Integer(5), new java.lang.Boolean(false)), |