- gtk_extended_layout_get_width_for_height (GTK_EXTENDED_LAYOUT (child),
- height, minimum_width, natural_width);
+ if (priv->child && gtk_widget_get_visible (priv->child))
+ {
+ gint child_min, child_nat;
+ gtk_widget_get_preferred_height (priv->child,
+ &child_min, &child_nat);
+ *minimum_height = child_min;
+ *natural_height = child_nat;
+ }
+
+ border_width = gtk_bin_get_effective_border_width (bin);
+ *minimum_height += 2 * border_width;
+ *natural_height += 2 * border_width;
+}
+
+static void
+gtk_bin_get_preferred_width_for_height (GtkWidget *widget,
+ gint height,
+ gint *minimum_width,
+ gint *natural_width)
+{
+ GtkBin *bin = GTK_BIN (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))
+ {
+ gint child_min, child_nat;
+ gtk_widget_get_preferred_width_for_height (priv->child, height - 2 * border_width,
+ &child_min, &child_nat);
+
+ *minimum_width = child_min;
+ *natural_width = child_nat;
+ }
+
+ *minimum_width += 2 * border_width;
+ *natural_width += 2 * border_width;