2003/08/10 20:33:06

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

diff --git a/src/org/xwt/Platform.java b/src/org/xwt/Platform.java
index 6ee700e..a64a515 100644 (file)
--- a/src/org/xwt/Platform.java
+++ b/src/org/xwt/Platform.java
@@ -65,8 +65,10 @@ public class Platform {
             else if (version.startsWith("1.1") && vendor.startsWith("Microsoft")) platform_class = "Microsoft";
             else if (!version.startsWith("1.0") && !version.startsWith("1.1")) platform_class = "Java2";
 
+            /*
         // Disable 2d hardware acceleration on Jaguar
         if (os_name.equals("Mac OS X") && os_version.equals("10.2"))
+            */
         System.setProperty("com.apple.hwaccel", "false");
 
             if (platform_class != null) {
@@ -371,20 +373,20 @@ public class Platform {
     public static Surface createSurface(Box b, boolean framed, boolean refreshable) {
         Surface ret = platform._createSurface(b, framed);
         ret.setInvisible(b.invisible);
-        b.set(Box.size, 0, b.size(0) < Surface.scarPicture.getWidth() ? Surface.scarPicture.getWidth() : b.size(0));
-        b.set(Box.size, 1, b.size(1) < Surface.scarPicture.getHeight() ? Surface.scarPicture.getHeight() : b.size(1));
+        b.width = b.height < Surface.scarPicture.getWidth() ? Surface.scarPicture.getWidth() : b.width;
+        b.height = b.height < Surface.scarPicture.getHeight() ? Surface.scarPicture.getHeight() : b.height;
 
         Object titlebar = b.get("titlebar", true);
         if (titlebar != null) ret.setTitleBarText(titlebar.toString());
 
         Object icon = b.get("icon", true);
         if (icon != null && !"".equals(icon)) {
-            Picture pic = Box.getPicture(icon.toString());
+            Picture pic = ImageDecoder.getPicture(icon.toString());
             if (pic != null) ret.setIcon(pic);
             else if (Log.on) Log.log(Platform.class, "unable to load icon " + icon);
         }
 
-        ret.setLimits(b.dmin(0), b.dmin(1), b.dmax(0), b.dmax(1));
+        ret.setLimits(b.minwidth, b.minheight, b.maxwidth, b.maxheight);
 
         if (refreshable) {
             Surface.refreshableSurfaceWasCreated = true;