search last visible column instead of using clist->columns.

[~andy/gtk] / gtk / gtkvbox.c

diff --git a/gtk/gtkvbox.c b/gtk/gtkvbox.c
index be40bdb7ca43076dfd9ca9fabcdc7ace29e104dc..a4b8d031f9719b1e1ea412d0a016109414a7ed77 100644 (file)
--- a/gtk/gtkvbox.c
+++ b/gtk/gtkvbox.c
@@ -34,7 +34,7 @@ gtk_vbox_get_type (void)
 
   if (!vbox_type)
     {
-      GtkTypeInfo vbox_info =
+      static const GtkTypeInfo vbox_info =
       {
        "GtkVBox",
        sizeof (GtkVBox),
@@ -69,7 +69,7 @@ gtk_vbox_init (GtkVBox *vbox)
 }
 
 GtkWidget*
-gtk_vbox_new (gint homogeneous,
+gtk_vbox_new (gboolean homogeneous,
              gint spacing)
 {
   GtkVBox *vbox;
@@ -200,7 +200,7 @@ gtk_vbox_size_allocate (GtkWidget     *widget,
 
       y = allocation->y + GTK_CONTAINER (box)->border_width;
       child_allocation.x = allocation->x + GTK_CONTAINER (box)->border_width;
-      child_allocation.width = MAX (1, allocation->width - GTK_CONTAINER (box)->border_width * 2);
+      child_allocation.width = MAX (1, (gint)allocation->width - (gint)GTK_CONTAINER (box)->border_width * 2);
 
       children = box->children;
       while (children)
@@ -238,7 +238,7 @@ gtk_vbox_size_allocate (GtkWidget     *widget,
 
              if (child->fill)
                {
-                 child_allocation.height = MAX (1, child_height - child->padding * 2);
+                 child_allocation.height = MAX (1, child_height - (gint)child->padding * 2);
                  child_allocation.y = y + child->padding;
                }
              else
@@ -291,7 +291,7 @@ gtk_vbox_size_allocate (GtkWidget     *widget,
 
               if (child->fill)
                 {
-                  child_allocation.height = MAX (1, child_height - child->padding * 2);
+                  child_allocation.height = MAX (1, child_height - (gint)child->padding * 2);
                   child_allocation.y = y + child->padding - child_height;
                 }
               else