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/gtknotebook.c | |
| parent | c8ae0b92cae360316fe30f40e738bdf5a93c31b9 (diff) | |
| download | gdk-pixbuf-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/gtknotebook.c')
| -rw-r--r-- | gtk/gtknotebook.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c index 1432ea976..eea6d90a3 100644 --- a/gtk/gtknotebook.c +++ b/gtk/gtknotebook.c @@ -823,17 +823,17 @@ gtk_notebook_size_allocate (GtkWidget *widget, { child_allocation.x = GTK_CONTAINER (widget)->border_width; child_allocation.y = GTK_CONTAINER (widget)->border_width; - child_allocation.width = MAX (1, allocation->width - child_allocation.x * 2); - child_allocation.height = MAX (1, allocation->height - child_allocation.y * 2); + child_allocation.width = MAX (1, (gint)allocation->width - child_allocation.x * 2); + child_allocation.height = MAX (1, (gint)allocation->height - child_allocation.y * 2); if (notebook->show_tabs || notebook->show_border) { child_allocation.x += widget->style->klass->xthickness; child_allocation.y += widget->style->klass->ythickness; - child_allocation.width = MAX (1, child_allocation.width - - widget->style->klass->xthickness * 2); - child_allocation.height = MAX (1, child_allocation.height - - widget->style->klass->ythickness * 2); + child_allocation.width = MAX (1, (gint)child_allocation.width - + (gint) widget->style->klass->xthickness * 2); + child_allocation.height = MAX (1, (gint)child_allocation.height - + (gint) widget->style->klass->ythickness * 2); if (notebook->show_tabs && notebook->children && notebook->cur_page) { @@ -843,15 +843,15 @@ gtk_notebook_size_allocate (GtkWidget *widget, child_allocation.y += notebook->cur_page->requisition.height; case GTK_POS_BOTTOM: child_allocation.height = - MAX (1, child_allocation.height - - notebook->cur_page->requisition.height); + MAX (1, (gint)child_allocation.height - + (gint)notebook->cur_page->requisition.height); break; case GTK_POS_LEFT: child_allocation.x += notebook->cur_page->requisition.width; case GTK_POS_RIGHT: child_allocation.width = - MAX (1, child_allocation.width - - notebook->cur_page->requisition.width); + MAX (1, (gint)child_allocation.width - + (gint)notebook->cur_page->requisition.width); break; } } |