src/solaris/native/java/lang/java_props_macosx.c

Print this page
rev 5549 : 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

@@ -113,23 +113,18 @@
     if (status != noErr) return false;
     if (!(session_info & sessionHasGraphicAccess)) return false;
     return true;
 }
 
-static bool isXDisplayDefined() {
-    return getenv("DISPLAY") != NULL;
-}
-
 PreferredToolkit getPreferredToolkit() {
     static PreferredToolkit pref = unset;
     if (pref != unset) return pref;
 
     PreferredToolkit prefFromEnv = getPreferredToolkitFromEnv();
     if (prefFromEnv != unset) return pref = prefFromEnv;
 
     if (isInAquaSession()) return pref = CToolkit;
-    if (isXDisplayDefined()) return pref = XToolkit;
     return pref = HToolkit;
 }
 
 void setUnknownOSAndVersion(java_props_t *sprops) {
     sprops->os_name = strdup("Unknown");