From 48b2a7c0c73db372164e6a4f507bfdda7852ab21 Mon Sep 17 00:00:00 2001 From: Alexey Ivanov Date: Mon, 9 Jun 2014 18:10:49 +0400 Subject: [PATCH] 8046239: Build failure in 9-client on all non-Windows platforms Reviewed-by: anthony, serb, alexp --- .../classes/com/sun/java/swing/plaf/windows/XPStyle.java | 3 +-- jdk/src/solaris/classes/sun/awt/windows/ThemeReader.java | 4 ++++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/XPStyle.java b/jdk/src/share/classes/com/sun/java/swing/plaf/windows/XPStyle.java index 7765145eff1..baeca8c29ca 100644 --- a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/XPStyle.java +++ b/jdk/src/share/classes/com/sun/java/swing/plaf/windows/XPStyle.java @@ -52,7 +52,6 @@ import javax.swing.text.JTextComponent; import sun.awt.image.SunWritableRaster; import sun.awt.windows.ThemeReader; -import sun.awt.windows.WToolkit; import sun.security.action.GetPropertyAction; import sun.swing.CachedPainter; @@ -100,7 +99,7 @@ class XPStyle { if (themeActive == null) { Toolkit toolkit = Toolkit.getDefaultToolkit(); themeActive = - (Boolean)toolkit.getDesktopProperty(WToolkit.XPSTYLE_THEME_ACTIVE); + (Boolean)toolkit.getDesktopProperty("win.xpstyle.themeActive"); if (themeActive == null) { themeActive = Boolean.FALSE; } diff --git a/jdk/src/solaris/classes/sun/awt/windows/ThemeReader.java b/jdk/src/solaris/classes/sun/awt/windows/ThemeReader.java index 7445cc2f5ff..5bd2f7ec0b8 100644 --- a/jdk/src/solaris/classes/sun/awt/windows/ThemeReader.java +++ b/jdk/src/solaris/classes/sun/awt/windows/ThemeReader.java @@ -45,6 +45,10 @@ public final class ThemeReader { return false; } + public static boolean isXPStyleEnabled() { + return false; + } + public static void paintBackground(int[] buffer, String widget, int part, int state, int x, int y, int w, int h, int stride) { }