2003/09/25 10:56:08

[org.ibex.core.git] / src / org / xwt / Box.java.pp

diff --git a/src/org/xwt/Box.java.pp b/src/org/xwt/Box.java.pp
index 4a1c07a..f2c45a0 100644 (file)
--- a/src/org/xwt/Box.java.pp
+++ b/src/org/xwt/Box.java.pp
@@ -1096,8 +1096,8 @@ public final class Box extends JS.Scope {
                         } else {
                             // FIXME
                         }
-                        b.minwidth = Math.min(b.maxwidth, Math.max(b.minwidth, b.image == null ? 0 : b.image.getWidth()));
-                        b.minheight = Math.min(b.maxheight, Math.max(b.minheight, b.image == null ? 0 : b.image.getHeight()));
+                        b.minwidth = min(b.maxwidth, max(b.minwidth, b.image == null ? 0 : b.image.getWidth()));
+                        b.minheight = min(b.maxheight, max(b.minheight, b.image == null ? 0 : b.image.getHeight()));
                         MARK_FOR_REFLOW_b;
                         b.dirty();
                     }
@@ -1140,10 +1140,6 @@ public final class Box extends JS.Scope {
                 });
             //#end
         
-            specialBoxProperties.put("xwt", new SpecialBoxProperty() {
-                    public Object get(Box b) { return XWT.singleton; }
-                });
-        
             specialBoxProperties.put("mouseinside", new SpecialBoxProperty() {
                     public Object get(Box b) {
                         return ((b.flags & MOUSEINSIDE_FLAG) != 0) ? Boolean.TRUE : Boolean.FALSE; }