diff options
| author | Benjamin Otte <otte@redhat.com> | 2018-03-15 03:01:58 +0100 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2018-03-16 06:04:45 +0100 |
| commit | 9e54c22c49062c615f37dbb7f67472f788e0ab5a (patch) | |
| tree | e7379b59dc0b6bcafa262fa247a0c963001522bf /gtk/gtkimage.h | |
| parent | 01f996447e15094f72d14addb1634623bebb61c1 (diff) | |
| download | gtk+-9e54c22c49062c615f37dbb7f67472f788e0ab5a.tar.gz | |
image: Don't handle surfaces anymore
Lots of special cases that are no longer needed because no code uses
surfaces.
Also remove the GdkCellRendererPixbuf:surface property.
Diffstat (limited to 'gtk/gtkimage.h')
| -rw-r--r-- | gtk/gtkimage.h | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/gtk/gtkimage.h b/gtk/gtkimage.h index 10ce7da730..f4390fab18 100644 --- a/gtk/gtkimage.h +++ b/gtk/gtkimage.h @@ -55,8 +55,6 @@ typedef struct _GtkImageClass GtkImageClass; * This image type was added in GTK+ 2.6 * @GTK_IMAGE_GICON: the widget contains a #GIcon. * This image type was added in GTK+ 2.14 - * @GTK_IMAGE_SURFACE: the widget contains a #cairo_surface_t. - * This image type was added in GTK+ 3.10 * @GTK_IMAGE_TEXTURE: the widget contains a #GdkTexture. * This image type was added in GTK+ 3.94 * @GTK_IMAGE_PAINTABLE: the widget contains a #GdkPaintable. @@ -65,8 +63,8 @@ typedef struct _GtkImageClass GtkImageClass; * Describes the image data representation used by a #GtkImage. If you * want to get the image from the widget, you can only get the * currently-stored representation. e.g. if the - * gtk_image_get_storage_type() returns #GTK_IMAGE_SURFACE, then you can - * call gtk_image_get_surface(). For empty images, you can request any + * gtk_image_get_storage_type() returns #GTK_IMAGE_PAINTABLE, then you can + * call gtk_image_get_paintable(). For empty images, you can request any * storage type (call any of the "get" functions), but they will all * return %NULL values. */ @@ -75,7 +73,6 @@ typedef enum GTK_IMAGE_EMPTY, GTK_IMAGE_ICON_NAME, GTK_IMAGE_GICON, - GTK_IMAGE_SURFACE, GTK_IMAGE_TEXTURE, GTK_IMAGE_PAINTABLE } GtkImageType; @@ -121,8 +118,6 @@ GDK_AVAILABLE_IN_ALL GtkWidget* gtk_image_new_from_icon_name (const gchar *icon_name); GDK_AVAILABLE_IN_ALL GtkWidget* gtk_image_new_from_gicon (GIcon *icon); -GDK_AVAILABLE_IN_ALL -GtkWidget* gtk_image_new_from_surface (cairo_surface_t *surface); GDK_AVAILABLE_IN_ALL void gtk_image_clear (GtkImage *image); @@ -148,9 +143,6 @@ GDK_AVAILABLE_IN_ALL void gtk_image_set_from_gicon (GtkImage *image, GIcon *icon); GDK_AVAILABLE_IN_ALL -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_ALL @@ -161,8 +153,6 @@ GDK_AVAILABLE_IN_ALL GtkImageType gtk_image_get_storage_type (GtkImage *image); GDK_AVAILABLE_IN_ALL -cairo_surface_t *gtk_image_get_surface (GtkImage *image); -GDK_AVAILABLE_IN_ALL GdkTexture *gtk_image_get_texture (GtkImage *image); GDK_AVAILABLE_IN_ALL GdkPaintable *gtk_image_get_paintable (GtkImage *image); |