src/java.desktop/windows/classes/sun/awt/windows/WWindowPeer.java

*** 292,301 ****
--- 292,307 ----
      native void setIconImagesData(int[] iconRaster, int w, int h,
                                    int[] smallIconRaster, int smw, int smh);
  
      synchronized native void reshapeFrame(int x, int y, int width, int height);
  
+     native Dimension getNativeWindowSize();
+ 
+     public Dimension getScaledWindowSize() {
+         return getNativeWindowSize();
+     }
+ 
      public boolean requestWindowFocus(CausedFocusEvent.Cause cause) {
          if (!focusAllowedFor()) {
              return false;
          }
          return requestWindowFocus(cause == CausedFocusEvent.Cause.MOUSE_EVENT);
*** 488,499 ****
          if (screenLog.isLoggable(PlatformLogger.Level.FINER)) {
              log.finer("Screen number: " + scrn);
          }
  
          // get current GD
!         Win32GraphicsDevice oldDev = (Win32GraphicsDevice)winGraphicsConfig
!                                      .getDevice();
  
          Win32GraphicsDevice newDev;
          GraphicsDevice devs[] = GraphicsEnvironment
              .getLocalGraphicsEnvironment()
              .getScreenDevices();
--- 494,504 ----
          if (screenLog.isLoggable(PlatformLogger.Level.FINER)) {
              log.finer("Screen number: " + scrn);
          }
  
          // get current GD
!         Win32GraphicsDevice oldDev = winGraphicsConfig.getDevice();
  
          Win32GraphicsDevice newDev;
          GraphicsDevice devs[] = GraphicsEnvironment
              .getLocalGraphicsEnvironment()
              .getScreenDevices();