src/share/classes/com/sun/java/swing/plaf/windows/XPStyle.java

*** 50,60 ****
  import javax.swing.plaf.*;
  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;
  
  import static com.sun.java.swing.plaf.windows.TMSchema.*;
  
--- 50,59 ----
*** 98,108 ****
       */
      static synchronized XPStyle getXP() {
          if (themeActive == null) {
              Toolkit toolkit = Toolkit.getDefaultToolkit();
              themeActive =
!                 (Boolean)toolkit.getDesktopProperty(WToolkit.XPSTYLE_THEME_ACTIVE);
              if (themeActive == null) {
                  themeActive = Boolean.FALSE;
              }
              if (themeActive.booleanValue()) {
                  GetPropertyAction propertyAction =
--- 97,107 ----
       */
      static synchronized XPStyle getXP() {
          if (themeActive == null) {
              Toolkit toolkit = Toolkit.getDefaultToolkit();
              themeActive =
!                 (Boolean)toolkit.getDesktopProperty("win.xpstyle.themeActive");
              if (themeActive == null) {
                  themeActive = Boolean.FALSE;
              }
              if (themeActive.booleanValue()) {
                  GetPropertyAction propertyAction =