OpenJDK / jdk7u / jdk7u-dev / jdk
changeset 5657:7b745514284a
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
| author | uta |
|---|---|
| date | Fri, 23 Nov 2012 13:07:54 +0400 |
| parents | c067e1ad8778 |
| children | 92ccf8f59530 |
| files | src/solaris/native/java/lang/java_props_macosx.c |
| diffstat | 1 files changed, 0 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/solaris/native/java/lang/java_props_macosx.c Fri Jan 25 20:56:41 2013 +0400 +++ b/src/solaris/native/java/lang/java_props_macosx.c Fri Nov 23 13:07:54 2012 +0400 @@ -115,10 +115,6 @@ return true; } -static bool isXDisplayDefined() { - return getenv("DISPLAY") != NULL; -} - PreferredToolkit getPreferredToolkit() { static PreferredToolkit pref = unset; if (pref != unset) return pref; @@ -127,7 +123,6 @@ if (prefFromEnv != unset) return pref = prefFromEnv; if (isInAquaSession()) return pref = CToolkit; - if (isXDisplayDefined()) return pref = XToolkit; return pref = HToolkit; }