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

Continue the deprecation of GtkIconSet

Browse Source 
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
This commit is contained in:
Kjell Ahlstedt 2013-07-05 15:42:31 +02:00 committed by Matthias Clasen
parent 16c08ae135
commit 4d86472b92
5 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk/gtkiconfactory.c
View File

@ -1597,6 +1597,8 @@ gtk_icon_set_render_icon_pixbuf (GtkIconSet *icon_set,
* Return value: (transfer full): a #cairo_surface_t to be displayed * Return value: (transfer full): a #cairo_surface_t to be displayed
* *
* Since: 3.10 * Since: 3.10
*
* Deprecated: 3.10: Use #GtkIconTheme instead.
*/ */
cairo_surface_t * cairo_surface_t *
gtk_icon_set_render_icon_surface (GtkIconSet *icon_set, gtk_icon_set_render_icon_surface (GtkIconSet *icon_set,

2
gtk/gtkiconhelper.c
View File

@ -601,10 +601,12 @@ ensure_surface_for_icon_set (GtkIconHelper *self,
scale = get_scale_factor (self, context); scale = get_scale_factor (self, context);
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
self->priv->rendered_surface = self->priv->rendered_surface =
gtk_icon_set_render_icon_surface (icon_set, context, gtk_icon_set_render_icon_surface (icon_set, context,
self->priv->icon_size, self->priv->icon_size,
scale, self->priv->window); scale, self->priv->window);
G_GNUC_END_IGNORE_DEPRECATIONS;
if (self->priv->rendered_surface) if (self->priv->rendered_surface)
get_surface_size (self, context, self->priv->rendered_surface, get_surface_size (self, context, self->priv->rendered_surface,

2
gtk/gtkimage.c
View File

@ -1285,6 +1285,8 @@ gtk_image_get_stock (GtkImage *image,
* Gets the icon set and size being displayed by the #GtkImage. * Gets the icon set and size being displayed by the #GtkImage.
* The storage type of the image must be %GTK_IMAGE_EMPTY or * The storage type of the image must be %GTK_IMAGE_EMPTY or
* %GTK_IMAGE_ICON_SET (see gtk_image_get_storage_type()). * %GTK_IMAGE_ICON_SET (see gtk_image_get_storage_type()).
*
* Deprecated: 3.10: Use gtk_image_get_icon_name() instead.
**/ **/
void void
gtk_image_get_icon_set (GtkImage *image, gtk_image_get_icon_set (GtkImage *image,

2
gtk/gtkimage.h
View File

@ -182,7 +182,7 @@ GDK_DEPRECATED_IN_3_10_FOR(gtk_image_get_icon_name)
void gtk_image_get_stock (GtkImage *image, void gtk_image_get_stock (GtkImage *image,
gchar **stock_id, gchar **stock_id,
GtkIconSize *size); 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, void gtk_image_get_icon_set (GtkImage *image,
GtkIconSet **icon_set, GtkIconSet **icon_set,
GtkIconSize *size); GtkIconSize *size);

2
gtk/gtkstylecontext.h
View File

@ -885,7 +885,7 @@ GDK_DEPRECATED_IN_3_10
GdkPixbuf * gtk_icon_set_render_icon_pixbuf (GtkIconSet *icon_set, GdkPixbuf * gtk_icon_set_render_icon_pixbuf (GtkIconSet *icon_set,
GtkStyleContext *context, GtkStyleContext *context,
GtkIconSize size); GtkIconSize size);
GDK_AVAILABLE_IN_3_10 GDK_DEPRECATED_IN_3_10
cairo_surface_t * cairo_surface_t *
gtk_icon_set_render_icon_surface (GtkIconSet *icon_set, gtk_icon_set_render_icon_surface (GtkIconSet *icon_set,
GtkStyleContext *context, GtkStyleContext *context,