Remove deprecated code from GdkPixmap

diff --git a/docs/reference/gdk/gdk-sections.txt b/docs/reference/gdk/gdk-sections.txt
index 184b1a59afa5a162d432e63ce13f68aa5ba25a38..ba7b6fe51bc57e5b6806fb90f60ec60687ed2b14 100644 (file)
--- a/docs/reference/gdk/gdk-sections.txt
+++ b/docs/reference/gdk/gdk-sections.txt
@@ -258,11 +258,7 @@ gdk_pixmap_create_from_xpm
 gdk_pixmap_colormap_create_from_xpm
 gdk_pixmap_create_from_xpm_d
 gdk_pixmap_colormap_create_from_xpm_d
-gdk_pixmap_ref
-gdk_pixmap_unref
 GdkBitmap
-gdk_bitmap_ref
-gdk_bitmap_unref
 
 <SUBSECTION Standard>
 GDK_PIXMAP

diff --git a/docs/reference/gdk/tmpl/pixmaps.sgml b/docs/reference/gdk/tmpl/pixmaps.sgml
index 6d210d39f387698393174e4a12821fcea1acd682..d64418f7a5faa1d500eb8ba10acfdd4fef4be040 100644 (file)
--- a/docs/reference/gdk/tmpl/pixmaps.sgml
+++ b/docs/reference/gdk/tmpl/pixmaps.sgml
@@ -118,21 +118,6 @@ for the new pixmap. Can be %NULL, if the depth is given.
 @Returns: 
 
 
-<!-- ##### MACRO gdk_pixmap_ref ##### -->
-<para>
-Deprecated equivalent of g_object_ref().
-</para>
-
-@Returns: @pixmap
-
-
-<!-- ##### MACRO gdk_pixmap_unref ##### -->
-<para>
-Deprecated equivalent of g_object_unref().
-</para>
-
-
-
 <!-- ##### TYPEDEF GdkBitmap ##### -->
 <para>
 An opaque structure representing an offscreen drawable of depth
@@ -140,20 +125,3 @@ An opaque structure representing an offscreen drawable of depth
 #GdkWindow, can often be used interchangeably.  The type #GdkDrawable
 refers generically to any of these types.
 </para>
-
-
-<!-- ##### MACRO gdk_bitmap_ref ##### -->
-<para>
-Deprecated equivalent of g_object_ref().
-</para>
-
-@Returns: @pixmap
-
-
-<!-- ##### MACRO gdk_bitmap_unref ##### -->
-<para>
-Deprecated equivalent of g_object_unref().
-</para>
-
-
-

diff --git a/gdk/gdkpixmap.h b/gdk/gdkpixmap.h
index 470a9e54503cf6985e3b1f7f9e71acce5254381f..01c13b4524c665bbfe1d2c5d3a742534930c95a3 100644 (file)
--- a/gdk/gdkpixmap.h
+++ b/gdk/gdkpixmap.h
@@ -118,12 +118,6 @@ GdkPixmap*    gdk_pixmap_foreign_new_for_screen  (GdkScreen       *screen,
                                                   gint             height,
                                                   gint             depth);
 
-#ifndef GDK_DISABLE_DEPRECATED
-#define gdk_bitmap_ref                 g_object_ref
-#define gdk_bitmap_unref               g_object_unref
-#define gdk_pixmap_ref                 g_object_ref
-#define gdk_pixmap_unref               g_object_unref
-#endif /* GDK_DISABLE_DEPRECATED */
 
 G_END_DECLS