[gtk+] API: Don't export gtk_widget_preferred_size_and_baseline()
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] API: Don't export gtk_widget_preferred_size_and_baseline()
- Date: Sat, 11 May 2013 13:12:52 +0000 (UTC)
commit bd4d00918ed6293f7b45921ee4a52068aa78aa44
Author: Benjamin Otte <otte redhat com>
Date: Sat May 11 14:29:29 2013 +0200
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.
gtk/gtkbbox.c | 9 +++++----
gtk/gtksizerequest.c | 20 +++++++++-----------
gtk/gtkwidget.h | 6 ------
gtk/gtkwidgetprivate.h | 5 +++++
4 files changed, 19 insertions(+), 21 deletions(-)
---
diff --git a/gtk/gtkbbox.c b/gtk/gtkbbox.c
index 638959f..b4348f1 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)))
diff --git a/gtk/gtksizerequest.c b/gtk/gtksizerequest.c
index ed30f95..3bdff20 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
diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h
index 25247d5..49008cf 100644
--- a/gtk/gtkwidget.h
+++ b/gtk/gtkwidget.h
@@ -566,12 +566,6 @@ GDK_AVAILABLE_IN_ALL
void gtk_widget_get_preferred_size (GtkWidget *widget,
GtkRequisition *minimum_size,
GtkRequisition *natural_size);
-GDK_AVAILABLE_IN_3_10
-void gtk_widget_get_preferred_size_and_baseline (GtkWidget *widget,
- GtkRequisition *minimum_size,
- GtkRequisition *natural_size,
- gint *minimum_baseline,
- gint *natural_baseline);
GDK_DEPRECATED_IN_3_0_FOR(gtk_widget_get_preferred_size)
void gtk_widget_get_child_requisition (GtkWidget *widget,
diff --git a/gtk/gtkwidgetprivate.h b/gtk/gtkwidgetprivate.h
index 8794390..7f48a7c 100644
--- a/gtk/gtkwidgetprivate.h
+++ b/gtk/gtkwidgetprivate.h
@@ -81,6 +81,11 @@ void _gtk_widget_get_preferred_size_for_size (GtkWidget *widget,
gint *natural,
gint *minimum_baseline,
gint *natural_baseline);
+void _gtk_widget_get_preferred_size_and_baseline(GtkWidget *widget,
+ GtkRequisition *minimum_size,
+ GtkRequisition *natural_size,
+ gint *minimum_baseline,
+ gint *natural_baseline);
gboolean _gtk_widget_has_baseline_support (GtkWidget *widget);
gboolean _gtk_widget_get_translation_to_window (GtkWidget *widget,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]