X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FPlatform.java;h=fcdc9d974c5240acb2bdb24faf11f8fbdaec6f67;hb=ec7cc30e6ed3955adabba46e519ebd1d6fd281bb;hp=6f7771f2c77d0d2b22bec365662ab964037695e2;hpb=ac49a62b989af76577f5b62e5afd58e7972623b4;p=org.ibex.core.git

diff --git a/src/org/xwt/Platform.java b/src/org/xwt/Platform.java
index 6f7771f..fcdc9d9 100644
--- a/src/org/xwt/Platform.java
+++ b/src/org/xwt/Platform.java
@@ -57,7 +57,7 @@ public class Platform {
             String os_version = System.getProperty("os.version", "");
             String platform_class = null;
             
-            if (os_name.startsWith("Darwin")) platform_class = "Carbon";
+            if (os_name.startsWith("Darwin")) platform_class = "Darwin";
             else if (vendor.startsWith("Free Software Foundation")) {
                 if (os_name.startsWith("Window")) platform_class = "Win32";
                 else platform_class = "X11";
@@ -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) {
@@ -209,7 +211,15 @@ public class Platform {
 
     /** returns an InputStream to the builtin xwar */
     protected InputStream _getBuiltinInputStream() {
-        return Platform.class.getClassLoader().getResourceAsStream("org/xwt/builtin.xwar");
+	try {
+	    return new FileInputStream("builtin.xwar");
+	    /*
+	    return new ByteArrayInputStream(org.bouncycastle.util.encoders.Base64.decode(org.xwt.Builtin.encoded));
+	    */
+	} catch (Exception e) {
+	    Log.log(this, e);
+	    return null;
+	}
     }
 
     /** returns the value of the environment variable key, or null if no such key exists */
@@ -389,7 +399,7 @@ public class Platform {
         if (refreshable) {
             Surface.refreshableSurfaceWasCreated = true;
             Surface.allSurfaces.addElement(ret);
-            ret.dirty(0, 0, ret.width, ret.height);
+            ret.dirty(0, 0, b.width, b.height);
             ret.Refresh();
         }
         return ret;