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

iconhelper_ Don't use deprecated functions

Browse Source 
Use gtk_widget_get_direction() instead of
gtk_style_context_get_direction().
This commit is contained in:
Benjamin Otte 2015-12-09 13:29:59 +01:00
parent ccfc4d3f12
commit 861ac8e373
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gtk/gtkiconhelper.c
View File

@ -454,24 +454,22 @@ gtk_icon_helper_load_surface (GtkIconHelper *self,
case GTK_IMAGE_STOCK: case GTK_IMAGE_STOCK:
G_GNUC_BEGIN_IGNORE_DEPRECATIONS; G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
icon_set = gtk_icon_factory_lookup_default (gtk_image_definition_get_stock (self->priv->def)); icon_set = gtk_icon_factory_lookup_default (gtk_image_definition_get_stock (self->priv->def));
G_GNUC_END_IGNORE_DEPRECATIONS;
if (icon_set != NULL) if (icon_set != NULL)
surface = ensure_surface_for_icon_set (self, surface = ensure_surface_for_icon_set (self,
gtk_style_context_lookup_style (context), gtk_style_context_lookup_style (context),
gtk_style_context_get_direction (context), gtk_widget_get_direction (self->priv->owner),
scale, icon_set); scale, icon_set);
else else
surface = NULL; surface = NULL;
G_GNUC_END_IGNORE_DEPRECATIONS;
break; break;
case GTK_IMAGE_ICON_SET: case GTK_IMAGE_ICON_SET:
icon_set = gtk_image_definition_get_icon_set (self->priv->def); icon_set = gtk_image_definition_get_icon_set (self->priv->def);
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
surface = ensure_surface_for_icon_set (self, surface = ensure_surface_for_icon_set (self,
gtk_style_context_lookup_style (context), gtk_style_context_lookup_style (context),
gtk_style_context_get_direction (context), gtk_widget_get_direction (self->priv->owner),
scale, icon_set); scale, icon_set);
G_GNUC_END_IGNORE_DEPRECATIONS;
break; break;
case GTK_IMAGE_ICON_NAME: case GTK_IMAGE_ICON_NAME:
@ -479,24 +477,20 @@ G_GNUC_END_IGNORE_DEPRECATIONS;
gicon = g_themed_icon_new_with_default_fallbacks (gtk_image_definition_get_icon_name (self->priv->def)); gicon = g_themed_icon_new_with_default_fallbacks (gtk_image_definition_get_icon_name (self->priv->def));
else else
gicon = g_themed_icon_new (gtk_image_definition_get_icon_name (self->priv->def)); gicon = g_themed_icon_new (gtk_image_definition_get_icon_name (self->priv->def));
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
surface = ensure_surface_for_gicon (self, surface = ensure_surface_for_gicon (self,
gtk_style_context_lookup_style (context), gtk_style_context_lookup_style (context),
gtk_style_context_get_direction (context), gtk_widget_get_direction (self->priv->owner),
scale, scale,
gicon); gicon);
G_GNUC_END_IGNORE_DEPRECATIONS;
g_object_unref (gicon); g_object_unref (gicon);
break; break;
case GTK_IMAGE_GICON: case GTK_IMAGE_GICON:
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
surface = ensure_surface_for_gicon (self, surface = ensure_surface_for_gicon (self,
gtk_style_context_lookup_style (context), gtk_style_context_lookup_style (context),
gtk_style_context_get_direction (context), gtk_widget_get_direction (self->priv->owner),
scale, scale,
gtk_image_definition_get_gicon (self->priv->def)); gtk_image_definition_get_gicon (self->priv->def));
G_GNUC_END_IGNORE_DEPRECATIONS;
break; break;
case GTK_IMAGE_ANIMATION: case GTK_IMAGE_ANIMATION: