Remove deprecated GtkImage functions

diff --git a/gtk/gtkimage.c b/gtk/gtkimage.c
index 87e0b08245c8952effd8dee29d23a156786b5311..9edae99a168b1926ed46124d8399df9bf83c74a4 100644 (file)
--- a/gtk/gtkimage.c
+++ b/gtk/gtkimage.c
@@ -1526,46 +1526,6 @@ gtk_image_new (void)
   return g_object_new (GTK_TYPE_IMAGE, NULL);
 }
 
-/**
- * gtk_image_set:
- * @image: a #GtkImage
- * @val: a #GdkImage
- * @mask: a #GdkBitmap that indicates which parts of the image should be transparent.
- *
- * Sets the #GtkImage.
- *
- * Deprecated: 2.0: Use gtk_image_set_from_image() instead.
- */
-void
-gtk_image_set (GtkImage  *image,
-              GdkImage  *val,
-              GdkBitmap *mask)
-{
-  g_return_if_fail (GTK_IS_IMAGE (image));
-
-  gtk_image_set_from_image (image, val, mask);
-}
-
-/**
- * gtk_image_get:
- * @image: a #GtkImage
- * @val: return location for a #GdkImage
- * @mask: a #GdkBitmap that indicates which parts of the image should be transparent.
- *
- * Gets the #GtkImage.
- *
- * Deprecated: 2.0: Use gtk_image_get_image() instead.
- */
-void
-gtk_image_get (GtkImage   *image,
-              GdkImage  **val,
-              GdkBitmap **mask)
-{
-  g_return_if_fail (GTK_IS_IMAGE (image));
-
-  gtk_image_get_image (image, val, mask);
-}
-
 static void
 gtk_image_reset_anim_iter (GtkImage *image)
 {

diff --git a/gtk/gtkimage.h b/gtk/gtkimage.h
index dd6153c44c07a60a2c72280539350becf292f929..2170ff7358efe9cfa80e647b1a04c078c4a97a66 100644 (file)
--- a/gtk/gtkimage.h
+++ b/gtk/gtkimage.h
@@ -258,17 +258,6 @@ void       gtk_image_get_gicon     (GtkImage              *image,
                                    GtkIconSize           *size);
 gint       gtk_image_get_pixel_size (GtkImage             *image);
 
-#ifndef GTK_DISABLE_DEPRECATED
-/* These three are deprecated */
-
-void       gtk_image_set      (GtkImage   *image,
-                              GdkImage   *val,
-                              GdkBitmap  *mask);
-void       gtk_image_get      (GtkImage   *image,
-                              GdkImage  **val,
-                              GdkBitmap **mask);
-#endif /* GTK_DISABLE_DEPRECATED */
-
 G_END_DECLS
 
 #endif /* __GTK_IMAGE_H__ */