diff options
| author | Benjamin Otte <otte@redhat.com> | 2013-05-11 14:29:29 +0200 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2013-05-11 14:48:01 +0200 |
| commit | bd4d00918ed6293f7b45921ee4a52068aa78aa44 (patch) | |
| tree | e9552ed115a66a6a46c2a7833d49101328e07c75 /gtk/gtksizerequest.c | |
| parent | 205c16df322706264464cd86d71ef41ff4338fb2 (diff) | |
| download | gtk+-bd4d00918ed6293f7b45921ee4a52068aa78aa44.tar.gz | |
API: Don't export gtk_widget_preferred_size_and_baseline()
gtk_widget_preferred_size() is only useful if you want to quickly port a
widget from GTK2 sizing code to GTK3 but does not properly work with
height-for-width as used in GTK. So we don't want to encourage people to
use it. In particular we want people to convert to height-for-width
before adding baseline support to their widgets.
Diffstat (limited to 'gtk/gtksizerequest.c')
| -rw-r--r-- | gtk/gtksizerequest.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/gtk/gtksizerequest.c b/gtk/gtksizerequest.c index ed30f9515d..3bdff2094e 100644 --- a/gtk/gtksizerequest.c +++ b/gtk/gtksizerequest.c @@ -646,8 +646,8 @@ gtk_widget_get_preferred_height_and_baseline_for_width (GtkWidget *widget, natural_baseline); } -/** - * gtk_widget_get_preferred_size_and_baseline: +/* + * _gtk_widget_get_preferred_size_and_baseline: * @widget: a #GtkWidget instance * @minimum_size: (out) (allow-none): location for storing the minimum size, or %NULL * @natural_size: (out) (allow-none): location for storing the natural size, or %NULL @@ -665,15 +665,13 @@ gtk_widget_get_preferred_height_and_baseline_for_width (GtkWidget *widget, * widget will generally be a smaller size than the minimum height, since the required * height for the natural width is generally smaller than the required height for * the minimum width.</para></note> - * - * Since: 3.10 */ void -gtk_widget_get_preferred_size_and_baseline (GtkWidget *widget, - GtkRequisition *minimum_size, - GtkRequisition *natural_size, - gint *minimum_baseline, - gint *natural_baseline) +_gtk_widget_get_preferred_size_and_baseline (GtkWidget *widget, + GtkRequisition *minimum_size, + GtkRequisition *natural_size, + gint *minimum_baseline, + gint *natural_baseline) { gint min_width, nat_width; gint min_height, nat_height; @@ -747,8 +745,8 @@ gtk_widget_get_preferred_size (GtkWidget *widget, GtkRequisition *minimum_size, GtkRequisition *natural_size) { - gtk_widget_get_preferred_size_and_baseline (widget, minimum_size, natural_size, - NULL, NULL); + _gtk_widget_get_preferred_size_and_baseline (widget, minimum_size, natural_size, + NULL, NULL); } static gint |