AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-26 13:41:07 +00:00
Code Issues Projects Releases Wiki Activity

Deprecate from-pixbuf apis for widgets

Browse Source 
We want to drop GdkPixbuf from our apis.
These have easy replacements already, so
lets deprecate them.
This commit is contained in:
Matthias Clasen 2023-05-15 21:40:54 -04:00
parent 0b59290bad
commit 4bede73f62
5 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gtk/gtkimage.c
View File

@ -475,6 +475,9 @@ gtk_image_new_from_resource (const char *resource_path)
* want that, you should use [ctor@Gtk.Image.new_from_icon_name]. * want that, you should use [ctor@Gtk.Image.new_from_icon_name].
* *
* Returns: a new `GtkImage` * Returns: a new `GtkImage`
*
* Deprecated: 4.12: Use [ctor@Gtk.Image.new_from_paintable] and
* [ctor@Gdk.Texture.new_for_pixbuf] instead
*/ */
GtkWidget* GtkWidget*
gtk_image_new_from_pixbuf (GdkPixbuf *pixbuf) gtk_image_new_from_pixbuf (GdkPixbuf *pixbuf)
@ -483,7 +486,9 @@ gtk_image_new_from_pixbuf (GdkPixbuf *pixbuf)
image = g_object_new (GTK_TYPE_IMAGE, NULL); image = g_object_new (GTK_TYPE_IMAGE, NULL);
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gtk_image_set_from_pixbuf (image, pixbuf); gtk_image_set_from_pixbuf (image, pixbuf);
G_GNUC_END_IGNORE_DEPRECATIONS
return GTK_WIDGET (image); return GTK_WIDGET (image);
} }
@ -711,6 +716,8 @@ gtk_image_set_from_resource (GtkImage *image,
* Note: This is a helper for [method@Gtk.Image.set_from_paintable], * Note: This is a helper for [method@Gtk.Image.set_from_paintable],
* and you can't get back the exact pixbuf once this is called, * and you can't get back the exact pixbuf once this is called,
* only a paintable. * only a paintable.
*
* Deprecated: 4.12: Use [method@Gtk.Image.set_from_paintable] instead
*/ */
void void
gtk_image_set_from_pixbuf (GtkImage *image, gtk_image_set_from_pixbuf (GtkImage *image,

4
gtk/gtkimage.h
View File

@ -74,7 +74,7 @@ GDK_AVAILABLE_IN_ALL
GtkWidget* gtk_image_new_from_file (const char *filename); GtkWidget* gtk_image_new_from_file (const char *filename);
GDK_AVAILABLE_IN_ALL GDK_AVAILABLE_IN_ALL
GtkWidget* gtk_image_new_from_resource (const char *resource_path); GtkWidget* gtk_image_new_from_resource (const char *resource_path);
GDK_AVAILABLE_IN_ALL GDK_DEPRECATED_IN_4_12_FOR(gtk_image_new_from_paintable)
GtkWidget* gtk_image_new_from_pixbuf (GdkPixbuf *pixbuf); GtkWidget* gtk_image_new_from_pixbuf (GdkPixbuf *pixbuf);
GDK_AVAILABLE_IN_ALL GDK_AVAILABLE_IN_ALL
GtkWidget* gtk_image_new_from_paintable (GdkPaintable *paintable); GtkWidget* gtk_image_new_from_paintable (GdkPaintable *paintable);
@ -91,7 +91,7 @@ void gtk_image_set_from_file (GtkImage *image,
GDK_AVAILABLE_IN_ALL GDK_AVAILABLE_IN_ALL
void gtk_image_set_from_resource (GtkImage *image, void gtk_image_set_from_resource (GtkImage *image,
const char *resource_path); const char *resource_path);
GDK_AVAILABLE_IN_ALL GDK_DEPRECATED_IN_4_12_FOR(gtk_image_set_from_paintable)
void gtk_image_set_from_pixbuf (GtkImage *image, void gtk_image_set_from_pixbuf (GtkImage *image,
GdkPixbuf *pixbuf); GdkPixbuf *pixbuf);
GDK_AVAILABLE_IN_ALL GDK_AVAILABLE_IN_ALL

5
gtk/gtkpicture.c
View File

@ -525,6 +525,9 @@ gtk_picture_new_for_paintable (GdkPaintable *paintable)
* The pixbuf must not be modified after passing it to this function. * The pixbuf must not be modified after passing it to this function.
* *
* Returns: a new `GtkPicture` * Returns: a new `GtkPicture`
*
* Deprecated: 4.12: Use [ctor@Gtk.Picture.new_for_paintable] and
* [ctor@Gdk.Texture.new_for_pixbuf] instead
*/ */
GtkWidget* GtkWidget*
gtk_picture_new_for_pixbuf (GdkPixbuf *pixbuf) gtk_picture_new_for_pixbuf (GdkPixbuf *pixbuf)
@ -779,6 +782,8 @@ gtk_picture_set_resource (GtkPicture *self,
* See [ctor@Gtk.Picture.new_for_pixbuf] for details. * See [ctor@Gtk.Picture.new_for_pixbuf] for details.
* *
* This is a utility function that calls [method@Gtk.Picture.set_paintable]. * This is a utility function that calls [method@Gtk.Picture.set_paintable].
*
* Deprecated: 4.12: Use [method@Gtk.Picture.set_paintable] instead
*/ */
void void
gtk_picture_set_pixbuf (GtkPicture *self, gtk_picture_set_pixbuf (GtkPicture *self,

4
gtk/gtkpicture.h
View File

@ -39,7 +39,7 @@ GDK_AVAILABLE_IN_ALL
GtkWidget* gtk_picture_new (void); GtkWidget* gtk_picture_new (void);
GDK_AVAILABLE_IN_ALL GDK_AVAILABLE_IN_ALL
GtkWidget* gtk_picture_new_for_paintable (GdkPaintable *paintable); GtkWidget* gtk_picture_new_for_paintable (GdkPaintable *paintable);
GDK_AVAILABLE_IN_ALL GDK_DEPRECATED_IN_4_12_FOR(gtk_pixbuf_new_for_paintable)
GtkWidget* gtk_picture_new_for_pixbuf (GdkPixbuf *pixbuf); GtkWidget* gtk_picture_new_for_pixbuf (GdkPixbuf *pixbuf);
GDK_AVAILABLE_IN_ALL GDK_AVAILABLE_IN_ALL
GtkWidget* gtk_picture_new_for_file (GFile *file); GtkWidget* gtk_picture_new_for_file (GFile *file);
@ -64,7 +64,7 @@ void gtk_picture_set_filename (GtkPicture
GDK_AVAILABLE_IN_ALL GDK_AVAILABLE_IN_ALL
void gtk_picture_set_resource (GtkPicture *self, void gtk_picture_set_resource (GtkPicture *self,
const char *resource_path); const char *resource_path);
GDK_AVAILABLE_IN_ALL GDK_DEPRECATED_IN_4_12_FOR(gtk_picture_set_paintable)
void gtk_picture_set_pixbuf (GtkPicture *self, void gtk_picture_set_pixbuf (GtkPicture *self,
GdkPixbuf *pixbuf); GdkPixbuf *pixbuf);

2
gtk/inspector/gtkdataviewer.c
View File

@ -261,7 +261,9 @@ gtk_data_viewer_load_value (GtkDataViewer *self,
} }
else if (g_type_is_a (G_VALUE_TYPE (value), GDK_TYPE_PIXBUF)) else if (g_type_is_a (G_VALUE_TYPE (value), GDK_TYPE_PIXBUF))
{ {
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
self->contents = gtk_picture_new_for_pixbuf (g_value_get_object (value)); self->contents = gtk_picture_new_for_pixbuf (g_value_get_object (value));
G_GNUC_END_IGNORE_DEPRECATIONS
gtk_widget_set_size_request (self->contents, 256, 256); gtk_widget_set_size_request (self->contents, 256, 256);
gtk_widget_set_parent (self->contents, GTK_WIDGET (self)); gtk_widget_set_parent (self->contents, GTK_WIDGET (self));
} }