Commit 4d86472b authored by Kjell Ahlstedt's avatar Kjell Ahlstedt Committed by Matthias Clasen

Continue the deprecation of GtkIconSet

Deprecate gtk_icon_set_render_icon_surface() and gtk_image_get_icon_set(),
which take parameters of the deprecated GtkIconSet.

https://bugzilla.gnome.org/show_bug.cgi?id=703616
parent 16c08ae1
......@@ -1597,6 +1597,8 @@ gtk_icon_set_render_icon_pixbuf (GtkIconSet *icon_set,
* Return value: (transfer full): a #cairo_surface_t to be displayed
*
* Since: 3.10
*
* Deprecated: 3.10: Use #GtkIconTheme instead.
*/
cairo_surface_t *
gtk_icon_set_render_icon_surface (GtkIconSet *icon_set,
......
......@@ -601,10 +601,12 @@ ensure_surface_for_icon_set (GtkIconHelper *self,
scale = get_scale_factor (self, context);
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
self->priv->rendered_surface =
gtk_icon_set_render_icon_surface (icon_set, context,
self->priv->icon_size,
scale, self->priv->window);
G_GNUC_END_IGNORE_DEPRECATIONS;
if (self->priv->rendered_surface)
get_surface_size (self, context, self->priv->rendered_surface,
......
......@@ -1285,6 +1285,8 @@ gtk_image_get_stock (GtkImage *image,
* Gets the icon set and size being displayed by the #GtkImage.
* The storage type of the image must be %GTK_IMAGE_EMPTY or
* %GTK_IMAGE_ICON_SET (see gtk_image_get_storage_type()).
*
* Deprecated: 3.10: Use gtk_image_get_icon_name() instead.
**/
void
gtk_image_get_icon_set (GtkImage *image,
......
......@@ -182,7 +182,7 @@ GDK_DEPRECATED_IN_3_10_FOR(gtk_image_get_icon_name)
void gtk_image_get_stock (GtkImage *image,
gchar **stock_id,
GtkIconSize *size);
GDK_AVAILABLE_IN_ALL
GDK_DEPRECATED_IN_3_10_FOR(gtk_image_get_icon_name)
void gtk_image_get_icon_set (GtkImage *image,
GtkIconSet **icon_set,
GtkIconSize *size);
......
......@@ -885,7 +885,7 @@ GDK_DEPRECATED_IN_3_10
GdkPixbuf * gtk_icon_set_render_icon_pixbuf (GtkIconSet *icon_set,
GtkStyleContext *context,
GtkIconSize size);
GDK_AVAILABLE_IN_3_10
GDK_DEPRECATED_IN_3_10
cairo_surface_t *
gtk_icon_set_render_icon_surface (GtkIconSet *icon_set,
GtkStyleContext *context,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment