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/gtkscrolledwindow.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/gtkscrolledwindow.c')
| -rw-r--r-- | gtk/gtkscrolledwindow.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c index 760964c520..d994449a46 100644 --- a/gtk/gtkscrolledwindow.c +++ b/gtk/gtkscrolledwindow.c @@ -676,8 +676,8 @@ gtk_scrolled_window_relative_allocation (GtkWidget *widget, allocation->x = GTK_CONTAINER (widget)->border_width; allocation->y = GTK_CONTAINER (widget)->border_width; - allocation->width = MAX (1, widget->allocation.width - allocation->x * 2); - allocation->height = MAX (1, widget->allocation.height - allocation->y * 2); + allocation->width = MAX (1, (gint)widget->allocation.width - allocation->x * 2); + allocation->height = MAX (1, (gint)widget->allocation.height - allocation->y * 2); if (scrolled_window->vscrollbar_visible) { @@ -686,9 +686,9 @@ gtk_scrolled_window_relative_allocation (GtkWidget *widget, allocation->x += (scrolled_window->vscrollbar->requisition.width + SCROLLBAR_SPACING (scrolled_window)); - allocation->width = MAX (1, allocation->width - - (scrolled_window->vscrollbar->requisition.width + - SCROLLBAR_SPACING (scrolled_window))); + allocation->width = MAX (1, (gint)allocation->width - + ((gint)scrolled_window->vscrollbar->requisition.width + + (gint)SCROLLBAR_SPACING (scrolled_window))); } if (scrolled_window->hscrollbar_visible) { @@ -697,9 +697,9 @@ gtk_scrolled_window_relative_allocation (GtkWidget *widget, allocation->y += (scrolled_window->hscrollbar->requisition.height + SCROLLBAR_SPACING (scrolled_window)); - allocation->height = MAX (1, allocation->height - - (scrolled_window->hscrollbar->requisition.height + - SCROLLBAR_SPACING (scrolled_window))); + allocation->height = MAX (1, (gint)allocation->height - + ((gint)scrolled_window->hscrollbar->requisition.height + + (gint)SCROLLBAR_SPACING (scrolled_window))); } } |