summaryrefslogtreecommitdiff
path: root/src/swing
diff options
context:
space:
mode:
authorIngo Maier <ingo.maier@epfl.ch>2011-08-12 16:38:52 +0000
committerIngo Maier <ingo.maier@epfl.ch>2011-08-12 16:38:52 +0000
commitacb91674c864d158f992f24c9cb1ff8e5575cc00 (patch)
treeec403eaa8748f0eb8a4d1f755a64bfc7832fa39d /src/swing
parent8b4d5de0b6326b2377e6822bdc03275fa4c13682 (diff)
downloadscala-acb91674c864d158f992f24c9cb1ff8e5575cc00.tar.gz
scala-acb91674c864d158f992f24c9cb1ff8e5575cc00.tar.bz2
scala-acb91674c864d158f992f24c9cb1ff8e5575cc00.zip
Allow null components in split pane. Closes #3929.
Diffstat (limited to 'src/swing')
-rw-r--r--src/swing/scala/swing/SplitPane.scala8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/swing/scala/swing/SplitPane.scala b/src/swing/scala/swing/SplitPane.scala
index 9d1b228590..c94a846ec9 100644
--- a/src/swing/scala/swing/SplitPane.scala
+++ b/src/swing/scala/swing/SplitPane.scala
@@ -28,16 +28,16 @@ class SplitPane(o: Orientation.Value, left: Component, right: Component) extends
def contents: Seq[Component] = List(leftComponent, rightComponent)
def contents_=(left: Component, right: Component) {
- peer.setLeftComponent(left.peer)
- peer.setRightComponent(right.peer)
+ peer.setLeftComponent(nullPeer(left))
+ peer.setRightComponent(nullPeer(right))
}
def topComponent: Component =
UIElement.cachedWrapper[Component](peer.getTopComponent.asInstanceOf[javax.swing.JComponent])
- def topComponent_=(c: Component) { peer.setTopComponent(c.peer) }
+ def topComponent_=(c: Component) { peer.setTopComponent(nullPeer(c)) }
def bottomComponent: Component =
UIElement.cachedWrapper[Component](peer.getBottomComponent.asInstanceOf[javax.swing.JComponent])
- def bottomComponent_=(c: Component) { peer.setBottomComponent(c.peer) }
+ def bottomComponent_=(c: Component) { peer.setBottomComponent(nullPeer(c)) }
def leftComponent: Component = topComponent
def leftComponent_=(c: Component) { topComponent = c }