summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLillian Angel <langel@redhat.com>2006-03-02 22:28:07 +0000
committerLillian Angel <langel@redhat.com>2006-03-02 22:28:07 +0000
commitb08924dea2b4cb116f7792a893c9369d82f8f691 (patch)
treef78a84fdfe1e14743b7d95cc682c59cd011e87a6
parent1dd8882c403c3638f1691cf4c40b844866051621 (diff)
downloadclasspath-b08924dea2b4cb116f7792a893c9369d82f8f691.tar.gz
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): Fixed to use GtkWidget instead of GTKMenu.
-rw-r--r--ChangeLog6
-rw-r--r--native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 8ae9dcc5e..edf398e23 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
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): Fixed
+ to use GtkWidget instead of GTKMenu.
+
+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.
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 5489fbc4a..c23fc5bd6 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,13 +160,13 @@ Java_gnu_java_awt_peer_gtk_GtkMenuPeer_delItem
{
void *ptr;
GList *list;
- GtkMenu *menu;
+ GtkWidget *menu;
gdk_threads_enter ();
ptr = NSA_GET_PTR (env, obj);
- menu = GTK_MENU (gtk_menu_item_get_submenu(GTK_MENU_ITEM(ptr)));
+ menu = gtk_menu_item_get_submenu(GTK_MENU_ITEM(ptr));
list = gtk_container_get_children (GTK_CONTAINER (menu));
list = g_list_nth (list, index);