2003/02/06 19:07:15

[org.ibex.core.git] / src / org / xwt / Surface.java

diff --git a/src/org/xwt/Surface.java b/src/org/xwt/Surface.java
index 167a5f4..66d0457 100644 (file)
--- a/src/org/xwt/Surface.java
+++ b/src/org/xwt/Surface.java
@@ -54,9 +54,6 @@ public abstract class Surface {
 
     // Public Members and State Variables /////////////////////////////////////////////////////////
 
-    /** this is the box on this surface which the mouse was inside at the time that the currently-executing event was enqueued */
-    public Box boxContainingMouse = null;
-
     /** false if the surface has never been rendered; used to determine if the surface should be repositioned to be centered on the screen */
     public boolean centerSurfaceOnRender = true;
 
@@ -159,7 +156,6 @@ public abstract class Surface {
         else if (button == 3) {
             final Box who = root.whoIs(mousex, mousey);
             MessageQueue.add(new Message() { public void perform() {
-                Surface.this.boxContainingMouse = who;
                 Platform.clipboardReadEnabled = true;
                 root.put("Press3", null, Boolean.TRUE);
                 Platform.clipboardReadEnabled = false;
@@ -292,13 +288,13 @@ public abstract class Surface {
     protected final void PosChange(int x, int y) {
         root.set(Box.abs, 0, x);
         root.set(Box.abs, 1, y);
-        new SimpleMessage("PosChange", Boolean.TRUE, null);
+        new SimpleMessage("PosChange", Boolean.TRUE, root);
     }
 
-    protected final void Close() { new SimpleMessage("Close", Boolean.TRUE, null); }
-    protected final void Minimized(boolean b) { minimized = b; new SimpleMessage("Minimized", b ? Boolean.TRUE : Boolean.FALSE, null); }
-    protected final void Maximized(boolean b) { maximized = b; new SimpleMessage("Maximized", b ? Boolean.TRUE : Boolean.FALSE, null); }
-    protected final void Focused(boolean b) { new SimpleMessage("Focused", b ? Boolean.TRUE : Boolean.FALSE, null); }
+    protected final void Close() { new SimpleMessage("Close", Boolean.TRUE, root); }
+    protected final void Minimized(boolean b) { minimized = b; new SimpleMessage("Minimized", b ? Boolean.TRUE : Boolean.FALSE, root); }
+    protected final void Maximized(boolean b) { maximized = b; new SimpleMessage("Maximized", b ? Boolean.TRUE : Boolean.FALSE, root); }
+    protected final void Focused(boolean b) { new SimpleMessage("Focused", b ? Boolean.TRUE : Boolean.FALSE, root); }
     public static void Refresh() { MessageQueue.refresh(); }
 
     // the following value is split into two int's to work around GCJ bug java/6393
@@ -433,8 +429,8 @@ public abstract class Surface {
                                scarPicture.getWidth(), scarPicture.getHeight());
 
             // sort of ugly; we can't use set() here because it will cause an infinite mutual recursion
-            root._size_0 = (short)width;
-            root._size_1 = (short)height;
+            root._size_0 = (int)width;
+            root._size_1 = (int)height;
 
             root.mark_for_prerender();
             root.put("SizeChange", null, Boolean.TRUE);
@@ -589,14 +585,8 @@ public abstract class Surface {
             MessageQueue.add(this);
         }
         
-        public void perform() {
-            Surface.this.boxContainingMouse = this.boxContainingMouse;
-            root.put(name, root, value);
-        }
-
-        public String toString() {
-            return "SimpleMessage [name=" + name + ", value=" + value + "]";
-        }
+        public void perform() { boxContainingMouse.put(name, root, value); }
+        public String toString() { return "SimpleMessage [name=" + name + ", value=" + value + "]"; }
         
     }