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.
This commit is contained in:
Havoc Pennington 2010-09-05 12:14:40 -04:00
parent cf68c2636a
commit 9debfe243f

View File

@ -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;
}
/**