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

rev 1379 : [mq]: fontmanager.patch

*** 61,71 ****
  import java.security.AccessController;
  
  import sun.awt.SunToolkit;
  import sun.awt.OSInfo;
  import sun.awt.shell.ShellFolder;
! import sun.font.FontManager;
  import sun.security.action.GetPropertyAction;
  
  import sun.swing.DefaultLayoutStyle;
  import sun.swing.ImageIconUIResource;
  import sun.swing.SwingLazyValue;
--- 61,71 ----
  import java.security.AccessController;
  
  import sun.awt.SunToolkit;
  import sun.awt.OSInfo;
  import sun.awt.shell.ShellFolder;
! import sun.font.FontUtilities;
  import sun.security.action.GetPropertyAction;
  
  import sun.swing.DefaultLayoutStyle;
  import sun.swing.ImageIconUIResource;
  import sun.swing.SwingLazyValue;
*** 2345,2361 ****
                      } else if (size != font.getSize()) {
                          font = new FontUIResource("MS Sans Serif",
                                                    font.getStyle(), size);
                      }
                  }
!                 if (FontManager.fontSupportsDefaultEncoding(font)) {
                      if (!(font instanceof UIResource)) {
                          font = new FontUIResource(font);
                      }
                  }
                  else {
!                     font = FontManager.getCompositeFontUIResource(font);
                  }
                  return font;
  
              }
              return super.configureValue(value);
--- 2345,2362 ----
                      } else if (size != font.getSize()) {
                          font = new FontUIResource("MS Sans Serif",
                                                    font.getStyle(), size);
                      }
                  }
!                 
!                 if (FontUtilities.fontSupportsDefaultEncoding(font)) {
                      if (!(font instanceof UIResource)) {
                          font = new FontUIResource(font);
                      }
                  }
                  else {
!                     font = FontUtilities.getCompositeFontUIResource(font);
                  }
                  return font;
  
              }
              return super.configureValue(value);