diff options
author | Owen Taylor <otaylor@redhat.com> | 1999-01-14 06:04:55 +0000 |
---|---|---|
committer | Owen Taylor <otaylor@src.gnome.org> | 1999-01-14 06:04:55 +0000 |
commit | 467e0fcb24cc2ddb78b4251ff587c3269f578563 (patch) | |
tree | 15de3d3cbd74ad8074d363d1a9e84a31b71357cc /gtk/gtkframe.c | |
parent | c8ae0b92cae360316fe30f40e738bdf5a93c31b9 (diff) | |
download | gtk+-467e0fcb24cc2ddb78b4251ff587c3269f578563.tar.gz |
gtk/gtkbutton.c gtk/gtkclist.c gtk/gtkhandlebox.c gtk/gtkframe.c
Wed Jan 13 22:34:29 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkbutton.c gtk/gtkclist.c gtk/gtkhandlebox.c
gtk/gtkframe.c gtk/gtk[hv]box.c gtk[hv]paned.c gtk/gtklist.c
gtkmenu.c gtkmenuitem.c gtkmenubar.c gtknotebook.c
gtk/gtkscrolledwindow.c gtk/gtktable.c gtk/gtktree.c
gtk/gtktreeeitem.c gtk/gtkviewport.c
Fix up comparisons of signed and unsigned ints to avoid
assigning negative widths/heigths.
Diffstat (limited to 'gtk/gtkframe.c')
-rw-r--r-- | gtk/gtkframe.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gtk/gtkframe.c b/gtk/gtkframe.c index 5831382da6..789d158deb 100644 --- a/gtk/gtkframe.c +++ b/gtk/gtkframe.c @@ -497,13 +497,13 @@ gtk_frame_size_allocate (GtkWidget *widget, { child_allocation.x = (GTK_CONTAINER (frame)->border_width + GTK_WIDGET (frame)->style->klass->xthickness); - child_allocation.width = MAX(0, allocation->width - child_allocation.x * 2); + child_allocation.width = MAX(1, (gint)allocation->width - child_allocation.x * 2); child_allocation.y = (GTK_CONTAINER (frame)->border_width + MAX (frame->label_height, GTK_WIDGET (frame)->style->klass->ythickness)); - child_allocation.height = MAX (1, (allocation->height - child_allocation.y - - GTK_CONTAINER (frame)->border_width - - GTK_WIDGET (frame)->style->klass->ythickness)); + child_allocation.height = MAX (1, ((gint)allocation->height - child_allocation.y - + (gint)GTK_CONTAINER (frame)->border_width - + (gint)GTK_WIDGET (frame)->style->klass->ythickness)); child_allocation.x += allocation->x; child_allocation.y += allocation->y; |