X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkbin.c;h=b64f54156d58a124a8252eaa76807d1ea7f9b675;hb=aa08f4d8f5ed60e3fe9e4bd970493582411c25c4;hp=c52ca37fe8feaffc6308668b178b1e4c0af67976;hpb=d98b4fd0b433d56f7b2148f617baf212014a3b3e;p=~andy%2Fgtk diff --git a/gtk/gtkbin.c b/gtk/gtkbin.c index c52ca37fe..b64f54156 100644 --- a/gtk/gtkbin.c +++ b/gtk/gtkbin.c @@ -198,6 +198,9 @@ gtk_bin_get_preferred_width (GtkWidget *widget, GtkBinPrivate *priv = bin->priv; gint border_width; + *minimum_width = 0; + *natural_width = 0; + if (priv->child && gtk_widget_get_visible (priv->child)) { gint child_min, child_nat; @@ -221,6 +224,9 @@ gtk_bin_get_preferred_height (GtkWidget *widget, GtkBinPrivate *priv = bin->priv; gint border_width; + *minimum_height = 0; + *natural_height = 0; + if (priv->child && gtk_widget_get_visible (priv->child)) { gint child_min, child_nat; @@ -245,6 +251,9 @@ gtk_bin_get_preferred_width_for_height (GtkWidget *widget, GtkBinPrivate *priv = bin->priv; gint border_width; + *minimum_width = 0; + *natural_width = 0; + border_width = gtk_bin_get_effective_border_width (bin); if (priv->child && gtk_widget_get_visible (priv->child)) @@ -271,6 +280,9 @@ gtk_bin_get_preferred_height_for_width (GtkWidget *widget, GtkBinPrivate *priv = bin->priv; gint border_width; + *minimum_height = 0; + *natural_height = 0; + border_width = gtk_bin_get_effective_border_width (bin); if (priv->child && gtk_widget_get_visible (priv->child))