X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FPlatform.java;h=a7949b2365ffdcec960f40e20b7a2121b64e0650;hb=4c0fde245156c0b57d95934b9b1a2ec0fd1aa849;hp=80076d3a3202ed5b1fd4e447a9540b17876744f8;hpb=4f7f0b92b26b48cd88f534c5ca29b5bce98929b2;p=org.ibex.core.git

diff --git a/src/org/xwt/Platform.java b/src/org/xwt/Platform.java
index 80076d3..a7949b2 100644
--- a/src/org/xwt/Platform.java
+++ b/src/org/xwt/Platform.java
@@ -57,8 +57,8 @@ public class Platform {
             String os_version = System.getProperty("os.version", "");
             String platform_class = null;
             
-            //if (os_name.startsWith("Mac OS X")) platform_class = "MacOSX";
-            if (vendor.startsWith("Free Software Foundation")) {
+            if (os_name.startsWith("Darwin")) platform_class = "Carbon";
+            else if (vendor.startsWith("Free Software Foundation")) {
                 if (os_name.startsWith("Window")) platform_class = "Win32";
                 else platform_class = "X11";
             } else if (version.startsWith("1.1") && vendor.startsWith("Netscape")) platform_class = "Netscape";
@@ -86,7 +86,6 @@ public class Platform {
             if (Log.on) Log.log(Platform.class, "XWT VM detection:   vendor = " + vendor);
             if (Log.on) Log.log(Platform.class, "                   version = " + version);
             if (Log.on) Log.log(Platform.class, "                        os = " + os_name + " [version " + os_version + "]");
-            if (Log.on && Main.applet != null) Log.log(Platform.class, "                   browser = " + Main.applet.getParameter("browser"));
 
             if (platform_class == null) {
                 if (Log.on) Log.log(Platform.class, "Unable to detect JVM");
@@ -175,17 +174,12 @@ public class Platform {
                 public Object get() { return o; }
             };
     }
+
+	/** Called once XWT is initialized and the application is running. */
+	protected void _running() {}
     
     /** quits XWT */
-    protected void _exit() {
-        if (Main.applet == null) {
-            System.exit(0);
-        } else {
-            // just block ourselves forever
-            // FIXME
-            new Semaphore().block();
-        }
-    }
+    protected void _exit() { System.exit(0); }
 
     /** used to notify the user of very serious failures; usually used when logging is not working or unavailable */
     protected void _criticalAbort(String message) { _exit(); }
@@ -213,6 +207,11 @@ public class Platform {
     /** returns true iff the platform has a case-sensitive filesystem */
     protected boolean _isCaseSensitive() { return true; }
 
+    /** returns an InputStream to the builtin xwar */
+    protected InputStream _getBuiltinInputStream() {
+	return Platform.class.getClassLoader().getResourceAsStream("org/xwt/builtin.xwar");
+    }
+
     /** returns the value of the environment variable key, or null if no such key exists */
     protected String _getEnv(String key) {
         try {
@@ -303,6 +302,9 @@ public class Platform {
     /** creates and returns a picture */
     public static Picture createPicture(int[] data, int w, int h) { return platform._createPicture(data, w, h); }
 
+    /** returns an InputStream to the builtin xwar */
+    public static InputStream getBuiltinInputStream() { return platform._getBuiltinInputStream(); }
+	
     /** creates and returns a picture */
     public static Picture createPicture(ImageDecoder i) { return platform._createPicture(i.getData(), i.getWidth(), i.getHeight()); }
 
@@ -343,6 +345,12 @@ public class Platform {
         platform._newBrowserWindow(url);
     }
 
+	/** Called once XWT is initialized and the application is running. */
+	public static void running() {
+		Log.log(Platform.class, "XWT is running");
+		platform._running();
+	}
+	
     /** quits XWT */
     public static void exit() {
         Log.log(Platform.class, "exiting via Platform.exit()");
@@ -366,10 +374,10 @@ public class Platform {
         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));
 
-        Object titlebar = b.get("titlebar", null, true);
+        Object titlebar = b.get("titlebar", true);
         if (titlebar != null) ret.setTitleBarText(titlebar.toString());
 
-        Object icon = b.get("icon", null, true);
+        Object icon = b.get("icon", true);
         if (icon != null && !"".equals(icon)) {
             Picture pic = Box.getPicture(icon.toString());
             if (pic != null) ret.setIcon(pic);