callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ensure GtkStyleContext is generated on gtk_widget_render_icon_pixbuf()

Browse Source 
This fixes some warnings seen when this is called early
on non yet styled widgets.
This commit is contained in:
Carlos Garnacho
2011-01-10 03:41:19 +01:00
parent 6f3706ac28
commit 5c3b49ab14
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
gtk/gtkwidget.c
View File

@ -9018,23 +9018,20 @@ gtk_widget_render_icon_pixbuf (GtkWidget *widget,
const gchar *stock_id, const gchar *stock_id,
GtkIconSize size) GtkIconSize size)
{ {
GtkWidgetPrivate *priv; GtkStyleContext *context;
GtkIconSet *icon_set; GtkIconSet *icon_set;
g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL); g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
g_return_val_if_fail (stock_id != NULL, NULL); g_return_val_if_fail (stock_id != NULL, NULL);
g_return_val_if_fail (size > GTK_ICON_SIZE_INVALID || size == -1, NULL); g_return_val_if_fail (size > GTK_ICON_SIZE_INVALID || size == -1, NULL);
priv = widget->priv; context = gtk_widget_get_style_context (widget);
icon_set = gtk_style_context_lookup_icon_set (context, stock_id);
gtk_widget_ensure_style (widget);
icon_set = gtk_style_context_lookup_icon_set (priv->context, stock_id);
if (icon_set == NULL) if (icon_set == NULL)
return NULL; return NULL;
return gtk_icon_set_render_icon_pixbuf (icon_set, priv->context, size); return gtk_icon_set_render_icon_pixbuf (icon_set, context, size);
} }
/** /**