From: Kim Ho <kho@redhat.com>
Date: Mon, 19 Jan 2004 18:41:52 +0000 (+0000)
Subject: 2004-01-19  Kim Ho  <kho@redhat.com>
X-Git-Tag: releases/gcc-4.0.0~10924
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a2708c12b2750f147aa434e30c8af349330a5b28;p=thirdparty%2Fgcc.git

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 3c779ddbdcb0..c2aad9b18302 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 8ad7a2cdcecd..32c536f2dcd1 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))
     {