From 8f523f3a1047919d3563daf1ef47ba87336ebe89 Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mark@gcc.gnu.org>
Date: Tue, 15 Nov 2005 23:20:01 +0000
Subject: Imported GNU Classpath 0.19 + gcj-import-20051115.

       * sources.am: Regenerated.
       * Makefile.in: Likewise.
       * scripts/makemake.tcl: Use glob -nocomplain.

From-SVN: r107049
---
 libjava/classpath/javax/swing/JButton.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'libjava/classpath/javax/swing/JButton.java')

diff --git a/libjava/classpath/javax/swing/JButton.java b/libjava/classpath/javax/swing/JButton.java
index 5653fbf..ff0ecfc 100644
--- a/libjava/classpath/javax/swing/JButton.java
+++ b/libjava/classpath/javax/swing/JButton.java
@@ -75,9 +75,6 @@ public class JButton extends AbstractButton
   boolean def;
   boolean is_def;
 
-  /** The AccessibleContext for this JButton. */
-  AccessibleJButton accessibleContext;
-
   public JButton()
   {
     this(null, null);
@@ -166,6 +163,10 @@ public class JButton extends AbstractButton
    */
   public void removeNotify()
   {
+    JRootPane root = SwingUtilities.getRootPane(this);
+    if (root != null && root.getDefaultButton() == this)
+      root.setDefaultButton(null);
+    super.removeNotify();
   }
 
   public void setDefaultCapable(boolean defaultCapable)
-- 
cgit v1.1