2002/04/30 01:41:01

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

diff --git a/src/org/xwt/Box.java b/src/org/xwt/Box.java
index acb4cac..f3c92d6 100644 (file)
--- a/src/org/xwt/Box.java
+++ b/src/org/xwt/Box.java
@@ -969,15 +969,15 @@ public final class Box extends JSObject {
 
         if (font.lastIndexOf('d') > i) {
             for(int j = pos(0) + pad(0); j < pos(0) + pad(0) + textdim(0); j += 2)
-                buf.fillRect(j, pos(1) + pad(1) + (xwf == null ? Platform.getMaxAscent(font) : xwf.getMaxAscent()) + 3,
-                             j + 1, pos(1) + pad(1) + (xwf == null ? Platform.getMaxAscent(font) : xwf.getMaxAscent()) + 3 + 1,
+                buf.fillRect(j, pos(1) + pad(1) + (xwf == null ? Platform.getMaxAscent(font) : xwf.getMaxAscent()) + 2,
+                             j + 1, pos(1) + pad(1) + (xwf == null ? Platform.getMaxAscent(font) : xwf.getMaxAscent()) + 2 + 1,
                              textcolor);
 
         } else if (font.lastIndexOf('u') > i) {
             buf.fillRect(pos(0) + pad(0),
-                        pos(1) + pad(1) + (xwf == null ? Platform.getMaxAscent(font) : xwf.getMaxAscent()) + 3,
+                        pos(1) + pad(1) + (xwf == null ? Platform.getMaxAscent(font) : xwf.getMaxAscent()) + 2,
                         pos(0) + pad(0) + textdim(0),
-                        pos(1) + pad(1) + (xwf == null ? Platform.getMaxAscent(font) : xwf.getMaxAscent()) + 3 + 1,
+                        pos(1) + pad(1) + (xwf == null ? Platform.getMaxAscent(font) : xwf.getMaxAscent()) + 2 + 1,
                         textcolor);
         }
 
@@ -1079,6 +1079,7 @@ public final class Box extends JSObject {
         if (name.equals("Array")) return JSObject.defaultObjects.get("Array", null);
         if (name.equals("Function")) return JSObject.defaultObjects.get("Function", null);
         if (name.equals("TypeError")) return JSObject.defaultObjects.get("TypeError", null);
+        if (name.equals("ConversionError")) return JSObject.defaultObjects.get("ConversionError", null);
 
         // See if we're reading back the function value of a trap
         if (name.charAt(0) == '_') {
@@ -1105,7 +1106,8 @@ public final class Box extends JSObject {
         if (traps != null && traps.get(name) != null) return true;
         if (name.charAt(0) == '_') return true;
         if (SpecialBoxProperty.specialBoxProperties.get(name) != null) return true;
-        if (name.equals("Function") || name.equals("Array") || name.equals("Object") || name.equals("TypeError")) return true;
+        if (name.equals("Function") || name.equals("Array") || name.equals("Object") ||
+            name.equals("TypeError") || name.equals("ConversionError")) return true;
         return super.has(name, start);
     }