AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Deprecate gtk_icon_info_load_symbolic_for_style

Browse Source 
We might end removing it altogether since it is a bit silly to have
Since: 3.0
Deprecated: 3.0
This commit is contained in:
Matthias Clasen 2010-11-24 19:57:10 -05:00 committed by Carlos Garnacho
parent e9ef162d4c
commit 53c2114356
3 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtk/gtkicontheme.c
View File

@ -3273,7 +3273,7 @@ gtk_icon_info_load_symbolic_for_context (GtkIconInfo *icon_info,
GError **error)
{
GdkPixbuf *pixbuf;
GdkRGBA *color;
GdkRGBA *color = NULL;
gchar *css_fg, *css_success;
gchar *css_warning, *css_error;
@ -3348,6 +3348,8 @@ gtk_icon_info_load_symbolic_for_context (GtkIconInfo *icon_info,
* Return value: (transfer full): a #GdkPixbuf representing the loaded icon
*
* Since: 3.0
*
* Deprecated: 3.0: Use gtk_icon_info_load_symbolic_for_context() instead
**/
GdkPixbuf *
gtk_icon_info_load_symbolic_for_style (GtkIconInfo *icon_info,

2
gtk/gtkicontheme.h
View File

@ -183,11 +183,13 @@ GdkPixbuf * gtk_icon_info_load_symbolic_for_context (GtkIconInfo
GtkStyleContext *context,
gboolean *was_symbolic,
GError **error);
#ifndef GTK_DISABLE_DEPRECATED
GdkPixbuf * gtk_icon_info_load_symbolic_for_style (GtkIconInfo *icon_info,
GtkStyle *style,
GtkStateType state,
gboolean *was_symbolic,
GError **error);
#endif
void gtk_icon_info_set_raw_coordinates (GtkIconInfo *icon_info,
gboolean raw_coordinates);

24
gtk/gtkimage.c
View File

@ -1469,15 +1469,15 @@ ensure_pixbuf_for_icon_name (GtkImage *image,
MIN (width, height), flags);
if (info)
{
GtkStyle *style;
GtkStyleContext *context;
gboolean was_symbolic;
style = gtk_widget_get_style (GTK_WIDGET (image));
context = gtk_widget_get_style_context (GTK_WIDGET (image));
priv->data.name.pixbuf =
gtk_icon_info_load_symbolic_for_style (info,
style, state,
&was_symbolic,
NULL);
gtk_icon_info_load_symbolic_for_context (info,
context,
&was_symbolic,
NULL);
priv->was_symbolic = was_symbolic;
gtk_icon_info_free (info);
}
@ -1544,15 +1544,15 @@ ensure_pixbuf_for_gicon (GtkImage *image,
MIN (width, height), flags);
if (info)
{
GtkStyle *style;
GtkStyleContext *context;
gboolean was_symbolic;
style = gtk_widget_get_style (GTK_WIDGET (image));
context = gtk_widget_get_style_context (GTK_WIDGET (image));
priv->data.gicon.pixbuf =
gtk_icon_info_load_symbolic_for_style (info,
style, state,
&was_symbolic,
NULL);
gtk_icon_info_load_symbolic_for_context (info,
context,
&was_symbolic,
NULL);
priv->was_symbolic = was_symbolic;
gtk_icon_info_free (info);
}