8046239: Build failure in 9-client on all non-Windows platforms
Reviewed-by: anthony, serb, alexp
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/XPStyle.java Mon Jun 09 14:59:45 2014 +0400
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/windows/XPStyle.java Mon Jun 09 18:10:49 2014 +0400
@@ -52,7 +52,6 @@
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 @@
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;
}
--- a/jdk/src/solaris/classes/sun/awt/windows/ThemeReader.java Mon Jun 09 14:59:45 2014 +0400
+++ b/jdk/src/solaris/classes/sun/awt/windows/ThemeReader.java Mon Jun 09 18:10:49 2014 +0400
@@ -45,6 +45,10 @@
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) {
}