Index: javax/swing/JButton.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JButton.java,v
retrieving revision 1.22
diff -u -r1.22 JButton.java
--- javax/swing/JButton.java	22 Sep 2005 14:48:05 -0000	1.22
+++ javax/swing/JButton.java	19 Oct 2005 15:15:59 -0000
@@ -163,6 +163,10 @@
    */
   public void removeNotify()
   {
+    JRootPane root = SwingUtilities.getRootPane(this);
+    if (root != null && root.getDefaultButton() == this)
+      root.setDefaultButton(null);
+    super.removeNotify();
   }
 
   public void setDefaultCapable(boolean defaultCapable)