diff options
| author | Mark Wielaard <mark@klomp.org> | 2006-12-08 08:46:31 +0000 |
|---|---|---|
| committer | Mark Wielaard <mark@klomp.org> | 2006-12-08 08:46:31 +0000 |
| commit | 7239524f011fcdd11f1b9da4d299496d8e91830e (patch) | |
| tree | b1af5fcf132b520540817a5fa5207540f4fa5615 /native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkLabelPeer.c | |
| parent | 3ffa3b8a898b92413c2f8af27158fe3f1e4ec5e7 (diff) | |
| download | classpath-7239524f011fcdd11f1b9da4d299496d8e91830e.tar.gz | |
2006-12-06 Thomas Fitzsimmons <fitzsim@redhat.com>
* java/awt/ScrollPane.java (addNotify): Add a parent panel for any
lightweight component, not just for non-Panel components.
(addImpl): Do not call doLayout.
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c
(setNativeBounds): Ensure widget parent is a GtkFixed before
calling gtk_fixed_move.
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkLabelPeer.c
(setNativeBounds): Likewise.
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
(setNativeBounds): Likewise.
2006-12-04 Thomas Fitzsimmons <fitzsim@redhat.com>
* java/awt/Component.java (getFontImpl): Return a default font if
topmost parent's font is null.
Diffstat (limited to 'native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkLabelPeer.c')
| -rw-r--r-- | native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkLabelPeer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkLabelPeer.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkLabelPeer.c index 77021ceec..13473a9a8 100644 --- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkLabelPeer.c +++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkLabelPeer.c @@ -213,7 +213,7 @@ Java_gnu_java_awt_peer_gtk_GtkLabelPeer_setNativeBounds gtk_widget_set_size_request (gtk_bin_get_child (GTK_BIN (widget)), 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); } |