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

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 3c779ddbdcb069934936e949d6aede5b20034726..c2aad9b1830293253fcea128a6f15b2d72fa9ff9 100644 (file)
--- 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 8ad7a2cdcecd4a08541ed65f42e181deff07b26c..32c536f2dcd19eac092e5697a8abf98ccdeb5392 100644 (file)
--- 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))
     {