diff options
| author | Benjamin Otte <otte@redhat.com> | 2017-11-04 15:08:25 +0100 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2017-11-04 15:22:25 +0100 |
| commit | 4c2bae3a1a50217167c6a02ad1b8a8a911f73192 (patch) | |
| tree | 21739b7b29c5973d2b961b8609209845b44ece35 /gdk/gdktexture.h | |
| parent | a0ff63e162277d4603d90e4db94fcf42cc73eb1a (diff) | |
| download | gtk+-4c2bae3a1a50217167c6a02ad1b8a8a911f73192.tar.gz | |
texture: Add gdk_texture_new_from_file()
and gdk_texture_new_from_resource().
While doing set, turn all GDK_AVAILABLE_IN_3_90 into
GDK_AVAILABLE_IN_3_94 because that's now true after the renaming.
Diffstat (limited to 'gdk/gdktexture.h')
| -rw-r--r-- | gdk/gdktexture.h | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/gdk/gdktexture.h b/gdk/gdktexture.h index 0ac7213ba1..7d61192adc 100644 --- a/gdk/gdktexture.h +++ b/gdk/gdktexture.h @@ -39,23 +39,28 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkTexture, g_object_unref) typedef struct _GdkTextureClass GdkTextureClass; -GDK_AVAILABLE_IN_3_90 -GType gdk_texture_get_type (void) G_GNUC_CONST; +GDK_AVAILABLE_IN_3_94 +GType gdk_texture_get_type (void) G_GNUC_CONST; -GDK_AVAILABLE_IN_3_90 +GDK_AVAILABLE_IN_3_94 GdkTexture * gdk_texture_new_for_data (const guchar *data, int width, int height, int stride); -GDK_AVAILABLE_IN_3_90 +GDK_AVAILABLE_IN_3_94 GdkTexture * gdk_texture_new_for_pixbuf (GdkPixbuf *pixbuf); +GDK_AVAILABLE_IN_3_94 +GdkTexture * gdk_texture_new_from_resource (const char *resource_path); +GDK_AVAILABLE_IN_3_94 +GdkTexture * gdk_texture_new_from_file (GFile *file, + GError **error); -GDK_AVAILABLE_IN_3_90 +GDK_AVAILABLE_IN_3_94 int gdk_texture_get_width (GdkTexture *texture); -GDK_AVAILABLE_IN_3_90 +GDK_AVAILABLE_IN_3_94 int gdk_texture_get_height (GdkTexture *texture); -GDK_AVAILABLE_IN_3_90 +GDK_AVAILABLE_IN_3_94 void gdk_texture_download (GdkTexture *texture, guchar *data, gsize stride); |