changeset 10163:5553ba6d75a2

8046239: Build failure in 9-client on all non-Windows platforms Reviewed-by: anthony, serb, alexp
author aivanov
date Mon, 09 Jun 2014 18:10:49 +0400
parents f51d560f6190
children 749dca473202
files src/share/classes/com/sun/java/swing/plaf/windows/XPStyle.java src/solaris/classes/sun/awt/windows/ThemeReader.java
diffstat 2 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/com/sun/java/swing/plaf/windows/XPStyle.java	Mon Jun 09 14:59:45 2014 +0400
+++ b/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/src/solaris/classes/sun/awt/windows/ThemeReader.java	Mon Jun 09 14:59:45 2014 +0400
+++ b/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) {
     }