# HG changeset patch
# User lana
# Date 1239662030 25200
# Node ID 8aec9567a7a3fef32dda20d7b5b048aa3ed7356c
# Parent  f6d72be571ab6296d1fa37ee7baa147d6c66e0f0# Parent  a7e3157c1867fd3e67bf9acd408a854a26a0b411
Merge

diff -r f6d72be571ab -r 8aec9567a7a3 jdk/src/windows/classes/sun/awt/windows/WFileDialogPeer.java
--- a/jdk/src/windows/classes/sun/awt/windows/WFileDialogPeer.java	Thu Apr 09 13:12:58 2009 -0700
+++ b/jdk/src/windows/classes/sun/awt/windows/WFileDialogPeer.java	Mon Apr 13 15:33:50 2009 -0700
@@ -225,6 +225,7 @@
     public void addDropTarget(DropTarget dt) {}
     public void removeDropTarget(DropTarget dt) {}
     public void updateFocusableWindowState() {}
+    public void setZOrder(ComponentPeer above) {}
 
     /**
      * Initialize JNI field and method ids
diff -r f6d72be571ab -r 8aec9567a7a3 jdk/src/windows/classes/sun/awt/windows/WPrintDialogPeer.java
--- a/jdk/src/windows/classes/sun/awt/windows/WPrintDialogPeer.java	Thu Apr 09 13:12:58 2009 -0700
+++ b/jdk/src/windows/classes/sun/awt/windows/WPrintDialogPeer.java	Mon Apr 13 15:33:50 2009 -0700
@@ -27,6 +27,7 @@
 
 import java.awt.*;
 import java.awt.peer.DialogPeer;
+import java.awt.peer.ComponentPeer;
 import java.awt.dnd.DropTarget;
 import java.util.Vector;
 import sun.awt.AppContext;
@@ -137,6 +138,7 @@
     void invalidate(int x, int y, int width, int height) {}
     public void addDropTarget(DropTarget dt) {}
     public void removeDropTarget(DropTarget dt) {}
+    public void setZOrder(ComponentPeer above) {}
 
     /**
      * Initialize JNI field and method ids