Merged gcj-eclipse branch to trunk.

[pf3gnuchains/gcc-fork.git] / libjava / classpath / native / jni / gtk-peer / gnu_java_awt_peer_gtk_GtkButtonPeer.c

diff --git a/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c b/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c
index 6a9066c..1099287 100644 (file)
--- a/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c
+++ b/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c
@@ -353,7 +353,7 @@ Java_gnu_java_awt_peer_gtk_GtkButtonPeer_setNativeBounds
       /* ...and the label's size request. */
       gtk_widget_set_size_request (gtk_bin_get_child (GTK_BIN (child)), width,
                                                      height);
-      if (widget->parent != NULL)
+      if (widget->parent != NULL && GTK_IS_FIXED (widget->parent))
         gtk_fixed_move (GTK_FIXED (widget->parent), widget, x, y);
     }