2005-01-14 Andrew John Hughes <gnu_andrew@member.fsf.org>

        * Merge of September 2004 HEAD patches to generics branch.

1 files changed, 30 insertions, 1 deletions

diff --git a/javax/swing/JRootPane.java b/javax/swing/JRootPane.java
index 5414e8a59..12df42990 100644
--- a/javax/swing/JRootPane.java
+++ b/javax/swing/JRootPane.java
@@ -63,7 +63,9 @@ public class JRootPane extends JComponent
   //  The class used to obtain the accessible role for this object.
   protected static class AccessibleJRootPane
   {
-    /** DOCUMENT ME! */
+    /**
+     * For compatability with Sun's JDK
+     */
     private static final long serialVersionUID = 1082432482784468088L;
 
     /**
@@ -307,6 +309,16 @@ public class JRootPane extends JComponent
   /** DOCUMENT ME! */
   private static final long serialVersionUID = 8690748000348575668L;
 
+  public static final int NONE = 0;
+  public static final int FRAME = 1;
+  public static final int PLAIN_DIALOG = 2;
+  public static final int INFORMATION_DIALOG = 3;
+  public static final int ERROR_DIALOG = 4;
+  public static final int COLOR_CHOOSER_DIALOG = 5;
+  public static final int FILE_CHOOSER_DIALOG = 6;
+  public static final int QUESTION_DIALOG = 7;
+  public static final int WARNING_DIALOG = 8;
+	  
   /** DOCUMENT ME! */
   protected Component glassPane;
 
@@ -319,6 +331,8 @@ public class JRootPane extends JComponent
   /** DOCUMENT ME! */
   protected Container contentPane;
 
+  protected JButton defaultButton;
+  
   /**
    * DOCUMENT ME!
    *
@@ -539,4 +553,19 @@ public class JRootPane extends JComponent
   {
     return "RootPaneUI";
   }
+
+  public JButton getDefaultButton()
+  {
+    return defaultButton;
+  }
+  
+  public void setDefaultButton(JButton newButton)
+  {
+    if (defaultButton == newButton)
+      return;
+    
+    JButton oldButton = defaultButton;
+    defaultButton = newButton;
+    firePropertyChange("defaultButton", oldButton, newButton);
+  }
 }