Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rapicault2010-02-25 21:40:31 -0500
committerPascal Rapicault2010-02-25 21:40:31 -0500
commit48169e6c57d3154f0bca66b3e11fd268a6c2ad3e (patch)
tree7b590575ce17ef71f3844687491acae7fe4605e5
parent2efa032c6a0899dc8084839de9e9e1f8f7547482 (diff)
downloadrt.equinox.framework-48169e6c57d3154f0bca66b3e11fd268a6c2ad3e.tar.gz
rt.equinox.framework-48169e6c57d3154f0bca66b3e11fd268a6c2ad3e.tar.xz
rt.equinox.framework-48169e6c57d3154f0bca66b3e11fd268a6c2ad3e.zip
Bug 303907 - Update the default WS on Mac to be Cocoa
-rw-r--r--bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java2
-rw-r--r--bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseEnvironmentInfo.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java b/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java
index 14faff12d..13a084af6 100644
--- a/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java
+++ b/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java
@@ -306,7 +306,7 @@ public class Main {
if (osName.equals(Constants.OS_LINUX))
return Constants.WS_GTK;
if (osName.equals(Constants.OS_MACOSX))
- return Constants.WS_CARBON;
+ return Constants.WS_COCOA;
if (osName.equals(Constants.OS_HPUX))
return Constants.WS_MOTIF;
if (osName.equals(Constants.OS_AIX))
diff --git a/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseEnvironmentInfo.java b/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseEnvironmentInfo.java
index bbaf08644..d3a710b12 100644
--- a/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseEnvironmentInfo.java
+++ b/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseEnvironmentInfo.java
@@ -193,7 +193,7 @@ public class EclipseEnvironmentInfo implements EnvironmentInfo {
if (os.equals(Constants.OS_LINUX))
return Constants.WS_GTK;
if (os.equals(Constants.OS_MACOSX))
- return Constants.WS_CARBON;
+ return Constants.WS_COCOA;
if (os.equals(Constants.OS_HPUX))
return Constants.WS_MOTIF;
if (os.equals(Constants.OS_AIX))

Back to the top