summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHavoc Pennington <hp@pobox.com>2010-09-05 12:14:40 -0400
committerHavoc Pennington <hp@pobox.com>2010-09-12 13:12:16 -0400
commitd2243056e5ecea620359d097375622ff1ffcdc9e (patch)
tree9f1bb0a7e1cace997cd5513c508a7bf704ab5645
parent6c780fa93b592dbca39207353204e873a0a98ad5 (diff)
downloadgtk+-d2243056e5ecea620359d097375622ff1ffcdc9e.tar.gz
Use _gtk_widget_get_aux_info_or_defaults() when possible in gtkwidget.c
Did not update uses in other files because the plan is to get rid of those other uses anyhow. So don't want to make this function available in the header.
-rw-r--r--gtk/gtkwidget.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index cd6404ac31..cbb568fa03 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -8018,17 +8018,17 @@ gtk_widget_get_size_request (GtkWidget *widget,
gint *width,
gint *height)
{
- GtkWidgetAuxInfo *aux_info;
+ const GtkWidgetAuxInfo *aux_info;
g_return_if_fail (GTK_IS_WIDGET (widget));
- aux_info = _gtk_widget_get_aux_info (widget, FALSE);
+ aux_info = _gtk_widget_get_aux_info_or_defaults (widget);
if (width)
- *width = aux_info ? aux_info->width : -1;
+ *width = aux_info->width;
if (height)
- *height = aux_info ? aux_info->height : -1;
+ *height = aux_info->height;
}
/**