* java/awt/Container.java (remove(int)): Always call removeNotify()

       on removed Component.

2 files changed, 6 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index d1993d226..92aec294e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2006-03-04  Mark Wielaard  <mark@klomp.org>
 
+	* java/awt/Container.java (remove(int)): Always call removeNotify()
+	on removed Component.
+
+2006-03-04  Mark Wielaard  <mark@klomp.org>
+
 	Fixes bug #26460 reported by Beat Wolf <asraniel@fryx.ch>.
 	* javax/swing/JEditorPane.java (setText): Check for empty String
 	with equals(), not equality (==).
diff --git a/java/awt/Container.java b/java/awt/Container.java
index 3cb245043..41892caea 100644
--- a/java/awt/Container.java
+++ b/java/awt/Container.java
@@ -410,8 +410,7 @@ public class Container extends Component
         for (int j = 0; j < list.length; j++)
               r.removeComponentListener(list[j]);
         
-        if (r.isShowing())
-          r.removeNotify();
+        r.removeNotify();
 
         System.arraycopy(component, index + 1, component, index,
                          ncomponents - index - 1);