summaryrefslogtreecommitdiff
path: root/src/swing
diff options
context:
space:
mode:
authorIngo Maier <ingo.maier@epfl.ch>2008-07-11 15:50:49 +0000
committerIngo Maier <ingo.maier@epfl.ch>2008-07-11 15:50:49 +0000
commit21781be0c9dd8e802eb30098828b7f2d6bcd8b4e (patch)
treeec1194fcc0f23622761d14af37d1c5a94d6c1d44 /src/swing
parent39f5c5cb289a945ea1b2b4785932b87bc44df224 (diff)
downloadscala-21781be0c9dd8e802eb30098828b7f2d6bcd8b4e.tar.gz
scala-21781be0c9dd8e802eb30098828b7f2d6bcd8b4e.tar.bz2
scala-21781be0c9dd8e802eb30098828b7f2d6bcd8b4e.zip
Removed some experimental things
Diffstat (limited to 'src/swing')
-rw-r--r--src/swing/scala/swing/ComboBox.scala10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/swing/scala/swing/ComboBox.scala b/src/swing/scala/swing/ComboBox.scala
index 6c2dd4a487..ef290781b0 100644
--- a/src/swing/scala/swing/ComboBox.scala
+++ b/src/swing/scala/swing/ComboBox.scala
@@ -99,7 +99,6 @@ object ComboBox {
})
}
-
override lazy val comboBoxPeer: javax.swing.ComboBoxEditor = new DelegatedEditor(comboBox.peer.getEditor)
def component = Component.wrap(comboBoxPeer.getEditorComponent.asInstanceOf[JComponent])
@@ -123,7 +122,7 @@ object ComboBox {
}
}
- def newMutableModel[A, Self](items: Seq[A] with scala.collection.mutable.Publisher[scala.collection.mutable.Message[A], Self]): ComboBoxModel = {
+ /*def newMutableModel[A, Self](items: Seq[A] with scala.collection.mutable.Publisher[scala.collection.mutable.Message[A], Self]): ComboBoxModel = {
new AbstractListModel with ComboBoxModel {
private var selected = items(0)
def getSelectedItem: AnyRef = selected.asInstanceOf[AnyRef]
@@ -133,7 +132,7 @@ object ComboBox {
}
}
- /*def newConstantModel[A](items: Seq[A]): ComboBoxModel = items match {
+ def newConstantModel[A](items: Seq[A]): ComboBoxModel = items match {
case items: Seq[A] with scala.collection.mutable.Publisher[scala.collection.mutable.Message[A], Self] => newMutableModel
case _ => newConstantModel(items)
}*/
@@ -186,6 +185,11 @@ class ComboBox[A](items: Seq[A]) extends Component with Publisher {
*/
def editable: Boolean = peer.isEditable
+ /**
+ * Makes this combo box editable. In order to do, this combo needs an
+ * editor which is supplied by the implicit argument. For default
+ * editors, see ComboBox companion object.
+ */
def makeEditable()(implicit editor: ComboBox[A] => ComboBox.Editor[A]) {
peer.setEditable(true)
peer.setEditor(editor(this).comboBoxPeer)