2006-03-02 Lillian Angel <langel@redhat.com>

        * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c
        (Java_gnu_java_awt_peer_gtk_GtkMenuPeer_delItem): Changed to
        use the submenu to get the list of children. This now works
        in the same way as addItem.

2 files changed, 13 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 227210ee7..8ae9dcc5e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-03-02  Lillian Angel <langel@redhat.com>
+
+	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c
+	(Java_gnu_java_awt_peer_gtk_GtkMenuPeer_delItem): Changed to 
+	use the submenu to get the list of children. This now works
+	in the same way as addItem.
+
 2006-03-02  Anthony Balkissoon  <abalkiss@redhat.com>
 
 	* java/lang/StringBuilder.java:
diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c
index b61a55bee..5489fbc4a 100644
--- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c
+++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c
@@ -160,14 +160,17 @@ Java_gnu_java_awt_peer_gtk_GtkMenuPeer_delItem
 {
   void *ptr;
   GList *list;
-
+  GtkMenu *menu;
+  
   gdk_threads_enter ();
 
   ptr = NSA_GET_PTR (env, obj);
 
-  list = gtk_container_get_children (GTK_CONTAINER (ptr));
+  menu = GTK_MENU (gtk_menu_item_get_submenu(GTK_MENU_ITEM(ptr)));
+
+  list = gtk_container_get_children (GTK_CONTAINER (menu));
   list = g_list_nth (list, index);
-  gtk_container_remove (GTK_CONTAINER (ptr), GTK_WIDGET (list->data));
+  gtk_container_remove (GTK_CONTAINER (menu), GTK_WIDGET (list->data));
 
   gdk_threads_leave ();
 }