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/gtkbbox.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/gtkbbox.c')
| -rw-r--r-- | gtk/gtkbbox.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/gtk/gtkbbox.c b/gtk/gtkbbox.c index 638959f740..b4348f1a66 100644 --- a/gtk/gtkbbox.c +++ b/gtk/gtkbbox.c @@ -56,6 +56,7 @@ #include "gtktypebuiltins.h" #include "gtkprivate.h" #include "gtksizerequest.h" +#include "gtkwidgetprivate.h" #include "gtkintl.h" @@ -507,8 +508,8 @@ gtk_button_box_child_requisition (GtkWidget *widget, if (gtk_widget_get_visible (child)) { nchildren += 1; - gtk_widget_get_preferred_size_and_baseline (child, - &child_requisition, NULL, &child_baseline, NULL); + _gtk_widget_get_preferred_size_and_baseline (child, + &child_requisition, NULL, &child_baseline, NULL); if (orientation == GTK_ORIENTATION_HORIZONTAL && gtk_widget_get_valign_with_baseline (child) == GTK_ALIGN_BASELINE && child_baseline != -1) @@ -552,8 +553,8 @@ gtk_button_box_child_requisition (GtkWidget *widget, if (is_secondary) nsecondaries++; - gtk_widget_get_preferred_size_and_baseline (child, - &child_requisition, NULL, &child_baseline, NULL); + _gtk_widget_get_preferred_size_and_baseline (child, + &child_requisition, NULL, &child_baseline, NULL); if (homogeneous || (!non_homogeneous && (child_requisition.width + ipad_w < avg_w * 1.5))) |