[gtk+] widget: Make gtk_widget_get_aux_info() private
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] widget: Make gtk_widget_get_aux_info() private
- Date: Tue, 19 Apr 2011 20:25:53 +0000 (UTC)
commit b5dc24fd28716ad25c75a904f3d88c53137ddfed
Author: Benjamin Otte <otte redhat com>
Date: Sun Apr 17 20:30:41 2011 +0200
widget: Make gtk_widget_get_aux_info() private
gtk/gtkwidget.c | 30 ++++++++++++++++--------------
gtk/gtkwidget.h | 2 --
2 files changed, 16 insertions(+), 16 deletions(-)
---
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 5f1a1c5..98f9528 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -619,6 +619,8 @@ static void gtk_widget_real_get_width_for_height (GtkWidget
gint *minimum_width,
gint *natural_width);
static const GtkWidgetAuxInfo* _gtk_widget_get_aux_info_or_defaults (GtkWidget *widget);
+static GtkWidgetAuxInfo* gtk_widget_get_aux_info (GtkWidget *widget,
+ gboolean create);
static void gtk_widget_aux_info_destroy (GtkWidgetAuxInfo *aux_info);
static AtkObject* gtk_widget_real_get_accessible (GtkWidget *widget);
static void gtk_widget_accessible_interface_init (AtkImplementorIface *iface);
@@ -3460,7 +3462,7 @@ gtk_widget_get_property (GObject *object,
break;
case PROP_MARGIN:
{
- GtkWidgetAuxInfo *aux_info = _gtk_widget_get_aux_info (widget, FALSE);
+ GtkWidgetAuxInfo *aux_info = gtk_widget_get_aux_info (widget, FALSE);
if (aux_info == NULL)
{
g_value_set_int (value, 0);
@@ -9644,7 +9646,7 @@ gtk_widget_set_usize_internal (GtkWidget *widget,
g_object_freeze_notify (G_OBJECT (widget));
- aux_info = _gtk_widget_get_aux_info (widget, TRUE);
+ aux_info = gtk_widget_get_aux_info (widget, TRUE);
if (width > -2 && aux_info->width != width)
{
@@ -10631,7 +10633,7 @@ gtk_widget_finalize (GObject *object)
g_free (priv->name);
- aux_info =_gtk_widget_get_aux_info (widget, FALSE);
+ aux_info = gtk_widget_get_aux_info (widget, FALSE);
if (aux_info)
gtk_widget_aux_info_destroy (aux_info);
@@ -11293,7 +11295,7 @@ static const GtkWidgetAuxInfo default_aux_info = {
};
/*
- * _gtk_widget_get_aux_info:
+ * gtk_widget_get_aux_info:
* @widget: a #GtkWidget
* @create: if %TRUE, create the structure if it doesn't exist
*
@@ -11302,9 +11304,9 @@ static const GtkWidgetAuxInfo default_aux_info = {
* Return value: the #GtkAuxInfo structure for the widget, or
* %NULL if @create is %FALSE and one doesn't already exist.
*/
-GtkWidgetAuxInfo*
-_gtk_widget_get_aux_info (GtkWidget *widget,
- gboolean create)
+static GtkWidgetAuxInfo *
+gtk_widget_get_aux_info (GtkWidget *widget,
+ gboolean create)
{
GtkWidgetAuxInfo *aux_info;
@@ -11326,7 +11328,7 @@ _gtk_widget_get_aux_info_or_defaults (GtkWidget *widget)
{
GtkWidgetAuxInfo *aux_info;
- aux_info = _gtk_widget_get_aux_info (widget, FALSE);
+ aux_info = gtk_widget_get_aux_info (widget, FALSE);
if (aux_info == NULL)
{
return &default_aux_info;
@@ -13057,7 +13059,7 @@ gtk_widget_set_halign (GtkWidget *widget,
g_return_if_fail (GTK_IS_WIDGET (widget));
- aux_info = _gtk_widget_get_aux_info (widget, TRUE);
+ aux_info = gtk_widget_get_aux_info (widget, TRUE);
if (aux_info->halign == align)
return;
@@ -13098,7 +13100,7 @@ gtk_widget_set_valign (GtkWidget *widget,
g_return_if_fail (GTK_IS_WIDGET (widget));
- aux_info = _gtk_widget_get_aux_info (widget, TRUE);
+ aux_info = gtk_widget_get_aux_info (widget, TRUE);
if (aux_info->valign == align)
return;
@@ -13145,7 +13147,7 @@ gtk_widget_set_margin_left (GtkWidget *widget,
g_return_if_fail (GTK_IS_WIDGET (widget));
g_return_if_fail (margin <= G_MAXINT16);
- aux_info = _gtk_widget_get_aux_info (widget, TRUE);
+ aux_info = gtk_widget_get_aux_info (widget, TRUE);
if (aux_info->margin.left == margin)
return;
@@ -13192,7 +13194,7 @@ gtk_widget_set_margin_right (GtkWidget *widget,
g_return_if_fail (GTK_IS_WIDGET (widget));
g_return_if_fail (margin <= G_MAXINT16);
- aux_info = _gtk_widget_get_aux_info (widget, TRUE);
+ aux_info = gtk_widget_get_aux_info (widget, TRUE);
if (aux_info->margin.right == margin)
return;
@@ -13239,7 +13241,7 @@ gtk_widget_set_margin_top (GtkWidget *widget,
g_return_if_fail (GTK_IS_WIDGET (widget));
g_return_if_fail (margin <= G_MAXINT16);
- aux_info = _gtk_widget_get_aux_info (widget, TRUE);
+ aux_info = gtk_widget_get_aux_info (widget, TRUE);
if (aux_info->margin.top == margin)
return;
@@ -13286,7 +13288,7 @@ gtk_widget_set_margin_bottom (GtkWidget *widget,
g_return_if_fail (GTK_IS_WIDGET (widget));
g_return_if_fail (margin <= G_MAXINT16);
- aux_info = _gtk_widget_get_aux_info (widget, TRUE);
+ aux_info = gtk_widget_get_aux_info (widget, TRUE);
if (aux_info->margin.bottom == margin)
return;
diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h
index 9c1dec9..078de3e 100644
--- a/gtk/gtkwidget.h
+++ b/gtk/gtkwidget.h
@@ -953,8 +953,6 @@ void _gtk_widget_set_is_toplevel (GtkWidget *widget,
void _gtk_widget_grab_notify (GtkWidget *widget,
gboolean was_grabbed);
-GtkWidgetAuxInfo *_gtk_widget_get_aux_info (GtkWidget *widget,
- gboolean create);
void _gtk_widget_propagate_hierarchy_changed (GtkWidget *widget,
GtkWidget *previous_toplevel);
void _gtk_widget_propagate_screen_changed (GtkWidget *widget,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]