diff options
author | Jakob Odersky <jodersky@gmail.com> | 2009-12-20 17:53:45 +0000 |
---|---|---|
committer | Jakob Odersky <jodersky@gmail.com> | 2009-12-20 17:53:45 +0000 |
commit | e87fcc40f9a2e8624d3260abf8180596de79b152 (patch) | |
tree | a3052eb7b657099e2bd616ce74b903f6250527e5 /src/graphyx/gui | |
parent | 66d338aec5d632927fa561a68310c8931938e9e0 (diff) | |
download | sims-e87fcc40f9a2e8624d3260abf8180596de79b152.tar.gz sims-e87fcc40f9a2e8624d3260abf8180596de79b152.tar.bz2 sims-e87fcc40f9a2e8624d3260abf8180596de79b152.zip |
Made code fully compatible with scala 2.8.
Diffstat (limited to 'src/graphyx/gui')
-rw-r--r-- | src/graphyx/gui/InfoPanel.scala | 6 | ||||
-rw-r--r-- | src/graphyx/gui/MainFrame.scala | 3 | ||||
-rw-r--r-- | src/graphyx/gui/WorldPanel.scala | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/src/graphyx/gui/InfoPanel.scala b/src/graphyx/gui/InfoPanel.scala index 6e58ba3..d9dad43 100644 --- a/src/graphyx/gui/InfoPanel.scala +++ b/src/graphyx/gui/InfoPanel.scala @@ -7,9 +7,11 @@ package graphyx.gui import scala.swing._ +import scala.swing._ + class InfoPanel(container: Container) extends BoxPanel(Orientation.Vertical){ - preferredSize = (200, 50) - + preferredSize = new java.awt.Dimension(200, 50) + val out = new TextArea out.editable = false contents += out diff --git a/src/graphyx/gui/MainFrame.scala b/src/graphyx/gui/MainFrame.scala index 6b1f2fe..4fdc9a2 100644 --- a/src/graphyx/gui/MainFrame.scala +++ b/src/graphyx/gui/MainFrame.scala @@ -13,7 +13,8 @@ import scala.swing._ class MainFrame(container: Container) extends Frame{ super.background = java.awt.Color.WHITE title = "graphyx" - preferredSize = (1000,800) + preferredSize = new java.awt.Dimension(1000,800) + reactions += { case event.WindowClosing(w) => Graphyx.exit() } diff --git a/src/graphyx/gui/WorldPanel.scala b/src/graphyx/gui/WorldPanel.scala index 7f9fbee..ad14726 100644 --- a/src/graphyx/gui/WorldPanel.scala +++ b/src/graphyx/gui/WorldPanel.scala @@ -128,7 +128,7 @@ class WorldPanel(container: Container) extends BoxPanel(Orientation.Vertical){ grabbedBody = None } - listenTo(Mouse.clicks, Mouse.moves, Mouse.wheel) + listenTo(mouse.clicks, mouse.moves, mouse.wheel) reactions += { case MousePressed(c,p,x,y,b) => { mousePressed = true; startPoint = p; endPoint = p |