aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKim Ho <kho@redhat.com>2004-01-19 18:41:52 +0000
committerKim Ho <kho@gcc.gnu.org>2004-01-19 18:41:52 +0000
commita2708c12b2750f147aa434e30c8af349330a5b28 (patch)
tree6f21499d39d92938edbb77a3078fca2458f8ea6e
parent6fdab8ccdb27688b53e0b219482c9ee3de361e54 (diff)
downloadgcc-a2708c12b2750f147aa434e30c8af349330a5b28.zip
gcc-a2708c12b2750f147aa434e30c8af349330a5b28.tar.gz
gcc-a2708c12b2750f147aa434e30c8af349330a5b28.tar.bz2
2004-01-19 Kim Ho <kho@redhat.com>
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c (connectJObject): Iterate through the vbox's children to find layout. From-SVN: r76166
-rw-r--r--libjava/ChangeLog5
-rw-r--r--libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c7
2 files changed, 11 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 3c779dd..c2aad9b 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-19 Kim Ho <kho@redhat.com>
+
+ * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
+ (connectJObject): Iterate through the vbox's children to find layout.
+
2004-01-19 Fernando Nasser <fnasser@redhat.com>
* java/awt/EventQueue.java (invokeAndWait): Use list-aware
diff --git a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
index 8ad7a2c..32c536f 100644
--- a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
+++ b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
@@ -196,7 +196,12 @@ Java_gnu_java_awt_peer_gtk_GtkWindowPeer_connectJObject
printf("*** this is not a vbox\n");
}
children = gtk_container_get_children(GTK_CONTAINER(vbox));
- layout = children->data;
+ do
+ {
+ layout = children->data;
+ children = children->next;
+ }
+ while (!GTK_IS_LAYOUT (layout) && children != NULL);
if(!GTK_IS_LAYOUT(layout))
{