diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2017-11-14 19:43:13 -0500 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2017-11-15 14:22:17 -0500 |
| commit | dbfaa9910705a35d3017f1e8e65a9cf52e2f7d9b (patch) | |
| tree | a76a5be1cac5ef746c431a00e8b79a93b63f3e10 /gtk/gtkimage.h | |
| parent | 049cc6aa013601c4e662c38df408f8956b155f0a (diff) | |
| download | gtk+-dbfaa9910705a35d3017f1e8e65a9cf52e2f7d9b.tar.gz | |
image: Remove icon-size argument from icon setters
Instead, add a function gtk_image_set_icon_size() for the cases where
overriding the icon size is necessary.
Treat icon sizes the same way as pixel sizes, too. So gtk_image_clear()
no longer unsets the icon size.
Diffstat (limited to 'gtk/gtkimage.h')
| -rw-r--r-- | gtk/gtkimage.h | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/gtk/gtkimage.h b/gtk/gtkimage.h index 9e041c10ee..7f561c8b16 100644 --- a/gtk/gtkimage.h +++ b/gtk/gtkimage.h @@ -113,11 +113,9 @@ GtkWidget* gtk_image_new_from_pixbuf (GdkPixbuf *pixbuf); GDK_AVAILABLE_IN_3_94 GtkWidget* gtk_image_new_from_texture (GdkTexture *texture); GDK_AVAILABLE_IN_ALL -GtkWidget* gtk_image_new_from_icon_name (const gchar *icon_name, - GtkIconSize size); +GtkWidget* gtk_image_new_from_icon_name (const gchar *icon_name); GDK_AVAILABLE_IN_ALL -GtkWidget* gtk_image_new_from_gicon (GIcon *icon, - GtkIconSize size); +GtkWidget* gtk_image_new_from_gicon (GIcon *icon); GDK_AVAILABLE_IN_3_10 GtkWidget* gtk_image_new_from_surface (cairo_surface_t *surface); @@ -137,18 +135,19 @@ void gtk_image_set_from_texture (GtkImage *image, GdkTexture *texture); GDK_AVAILABLE_IN_ALL void gtk_image_set_from_icon_name (GtkImage *image, - const gchar *icon_name, - GtkIconSize size); + const gchar *icon_name); GDK_AVAILABLE_IN_ALL void gtk_image_set_from_gicon (GtkImage *image, - GIcon *icon, - GtkIconSize size); + GIcon *icon); GDK_AVAILABLE_IN_3_10 void gtk_image_set_from_surface (GtkImage *image, cairo_surface_t *surface); GDK_AVAILABLE_IN_ALL void gtk_image_set_pixel_size (GtkImage *image, gint pixel_size); +GDK_AVAILABLE_IN_3_94 +void gtk_image_set_icon_size (GtkImage *image, + GtkIconSize icon_size); GDK_AVAILABLE_IN_ALL GtkImageType gtk_image_get_storage_type (GtkImage *image); |