8003898: X11 toolkit can be chosen as the default toolkit
Summary: XToolkit is not selected for any values of system-wide environment variables (ex. DISPLAY).
Reviewed-by: anthony, art
--- a/jdk/src/solaris/native/java/lang/java_props_macosx.c Tue Nov 20 21:35:18 2012 -0800
+++ b/jdk/src/solaris/native/java/lang/java_props_macosx.c Fri Nov 23 13:07:54 2012 +0400
@@ -129,10 +129,6 @@
return true;
}
-static bool isXDisplayDefined() {
- return getenv("DISPLAY") != NULL;
-}
-
PreferredToolkit getPreferredToolkit() {
static PreferredToolkit pref = unset;
if (pref != unset) return pref;
@@ -141,7 +137,6 @@
if (prefFromEnv != unset) return pref = prefFromEnv;
if (isInAquaSession()) return pref = CToolkit;
- if (isXDisplayDefined()) return pref = XToolkit;
return pref = HToolkit;
}