1 files changed, 10 insertions, 3 deletions
diff --git a/libjava/java/awt/Menu.java b/libjava/java/awt/Menu.java
index 6fdc22c8ccd..74478fbca75 100644
--- a/libjava/java/awt/Menu.java
+++ b/libjava/java/awt/Menu.java
@@ -41,6 +41,7 @@ package java.awt;
 import java.awt.peer.MenuPeer;
 import java.io.Serializable;
 import java.util.Vector;
+import java.util.Enumeration;
 
 /**
   * This class represents a pull down or tear off menu in Java's AWT.
@@ -170,7 +171,7 @@ isTearOff()
 public int
 getItemCount()
 {
-  return(items.size());
+  return countItems ();
 }
 
 /**
@@ -182,7 +183,7 @@ getItemCount()
  */
 public int countItems ()
 {
-  return getItemCount ();
+  return items.size ();
 }
  
 /*************************************************************************/
@@ -379,7 +380,7 @@ addNotify()
 {
   if (peer == null)
     peer = getToolkit().createMenu(this);
-  java.util.Enumeration e = items.elements();
+  Enumeration e = items.elements();
   while (e.hasMoreElements())
   {
     MenuItem mi = (MenuItem)e.nextElement();
@@ -396,6 +397,12 @@ addNotify()
 public void
 removeNotify()
 {
+  Enumeration e = items.elements();
+  while (e.hasMoreElements())
+  {
+    MenuItem mi = (MenuItem) e.nextElement();
+    mi.removeNotify();
+  }
   super.removeNotify();
 }