2003/09/08 20:00:11

darcs-hash:20040130070556-2ba56-2118518dc83738baa529c058994bde5b43c7d0e7.gz

diff --git a/src/org/xwt/Platform.java b/src/org/xwt/Platform.java
index 8ee8b20..78b5e16 100644 (file)
--- 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";

diff --git a/src/org/xwt/plat/Darwin.java b/src/org/xwt/plat/Darwin.java
index c6ec350..983c42f 100644 (file)
--- a/src/org/xwt/plat/Darwin.java
+++ b/src/org/xwt/plat/Darwin.java
@@ -8,8 +8,8 @@ import org.xwt.util.*;
 import org.xwt.*;
 import java.util.*;
 
-public class Carbon extends POSIX {
-    static Carbon singleton;
+public class Darwin extends POSIX {
+    static Darwin singleton;
     private CarbonOpenGL openGL;
     boolean jaguar; // true if we are on OS X >= 10.2
     
@@ -22,7 +22,7 @@ public class Carbon extends POSIX {
     protected String _getAltKeyName() { return "Option"; }
     protected boolean _needsAutoClick() { return false; }
     protected boolean _needsAutoDoubleClick() { return false; }
-    protected String getDescriptiveName() { return "GCJ Carbon Binary"; }
+    protected String getDescriptiveName() { return "GCJ Darwin Binary"; }
     protected boolean _isCaseSensitive() { return false; /* Well, not always, could be UFS */ }
     
     
@@ -74,9 +74,9 @@ public class Carbon extends POSIX {
         throw new Error(err);
     }
     
-    public Carbon() {
-        synchronized(Carbon.class) {
-            if(singleton != null) abort("Tried to instansiate Carbon more than once");
+    public Darwin() {
+        synchronized(Darwin.class) {
+            if(singleton != null) abort("Tried to instansiate Darwin more than once");
             singleton = this;
         }
     }
@@ -270,8 +270,7 @@ public class Carbon extends POSIX {
         public QZCarbonDoubleBuffer(int width, int height) {
         }
     }
-    
-    private class QZCarbonSurface extends CarbonSurface {
+       private class QZCarbonSurface extends CarbonSurface {
         public QZCarbonSurface(Box root, boolean framed) {
             super(b,root);
         }