Deprecate.

        * gdk/gdkdrawable.h (gdk_drawable_ref, gdk_drawable_unref),
        gdk/gdkcolor.h (gdk_colormap_ref, gdk_colormap_unref),
        gdk/gdkdnd.h (gdk_drag_context_ref, gdk_drag_context_unref),
        gdk/gdkgc.h (gdk_gc_ref, gdk_gc_unref):  Deprecate.

        * gdk/gdkvisual.h: Use GDK_DISABLE_DEPRECATED, not
        GTK_DISABLE_DEPRECATED.

        * gdk/gdkcolor.c (gdk_colormap_ref, gdk_colormap_unref),
        gdk/gdkgc.c (gdk_gc_ref, gdk_gc_unref): Document.

        * gdk/tmpl/colors.sgml, gdk/tmpl/pixmaps.sgml, gdk/tmpl/dnd.sgml,
        gdk/tmpl/gcs.sgml: Document ref and unref functions as deprecated.

7 files changed, 47 insertions, 2 deletions

diff --git a/gdk/gdkcolor.c b/gdk/gdkcolor.c
index 9323e3385..fdf7ae0e0 100644
--- a/gdk/gdkcolor.c
+++ b/gdk/gdkcolor.c
@@ -29,12 +29,28 @@
 #include "gdkcolor.h"
 #include "gdkinternals.h"
 
+/**
+ * gdk_colormap_ref:
+ * @image: a #GdkColormap
+ *
+ * Deprecated function; use g_object_ref() instead.
+ *
+ * Return value: the colormap
+ **/
 GdkColormap*
 gdk_colormap_ref (GdkColormap *cmap)
 {
   return (GdkColormap *) g_object_ref (G_OBJECT (cmap));
 }
 
+/**
+ * gdk_colormap_unref:
+ * @image: a #GdkColormap
+ *
+ * Deprecated function; use g_object_ref() instead.
+ *
+ * Return value: the colormap
+ **/
 void
 gdk_colormap_unref (GdkColormap *cmap)
 {
diff --git a/gdk/gdkcolor.h b/gdk/gdkcolor.h
index 569aff64d..e432c9894 100644
--- a/gdk/gdkcolor.h
+++ b/gdk/gdkcolor.h
@@ -60,13 +60,16 @@ GType        gdk_colormap_get_type (void) G_GNUC_CONST;
 
 GdkColormap* gdk_colormap_new	  (GdkVisual   *visual,
 				   gboolean	allocate);
+
+#ifndef GDK_DISABLE_DEPRECATED
 GdkColormap* gdk_colormap_ref	  (GdkColormap *cmap);
 void	     gdk_colormap_unref	  (GdkColormap *cmap);
+#endif 
 
 GdkColormap* gdk_colormap_get_system	   (void);
 #ifndef GDK_DISABLE_DEPRECATED
 gint	     gdk_colormap_get_system_size  (void);
-#endif
+#endif 
 
 void gdk_colormap_change (GdkColormap	*colormap,
 			  gint		 ncolors);
diff --git a/gdk/gdkdnd.h b/gdk/gdkdnd.h
index 1eefec430..c3dd4d1c3 100644
--- a/gdk/gdkdnd.h
+++ b/gdk/gdkdnd.h
@@ -78,8 +78,11 @@ struct _GdkDragContextClass {
 
 GType            gdk_drag_context_get_type   (void) G_GNUC_CONST;
 GdkDragContext * gdk_drag_context_new        (void);
+
+#ifndef GDK_DISABLE_DEPRECATED
 void             gdk_drag_context_ref        (GdkDragContext *context);
 void             gdk_drag_context_unref      (GdkDragContext *context);
+#endif
 
 /* Destination side */
 
diff --git a/gdk/gdkdrawable.h b/gdk/gdkdrawable.h
index 9a529c83a..e343d8ae6 100644
--- a/gdk/gdkdrawable.h
+++ b/gdk/gdkdrawable.h
@@ -161,8 +161,11 @@ void	        gdk_drawable_set_colormap (GdkDrawable	  *drawable,
 GdkColormap*    gdk_drawable_get_colormap (GdkDrawable	  *drawable);
 GdkVisual*      gdk_drawable_get_visual   (GdkDrawable	  *drawable);
 gint            gdk_drawable_get_depth    (GdkDrawable	  *drawable);
+
+#ifndef GDK_DISABLE_DEPRECATED
 GdkDrawable*    gdk_drawable_ref          (GdkDrawable    *drawable);
 void            gdk_drawable_unref        (GdkDrawable    *drawable);
+#endif /* GDK_DISABLE_DEPRECATED */
 
 /* Drawing
  */
diff --git a/gdk/gdkgc.c b/gdk/gdkgc.c
index dac4d0798..e1033abfb 100644
--- a/gdk/gdkgc.c
+++ b/gdk/gdkgc.c
@@ -122,12 +122,28 @@ gdk_gc_finalize (GObject *object)
   parent_class->finalize (object);
 }
 
+/**
+ * gdk_gc_ref:
+ * @gc: a #GdkGC
+ *
+ * Deprecated function; use g_object_ref() instead.
+ *
+ * Return value: the gc.
+ **/
 GdkGC *
 gdk_gc_ref (GdkGC *gc)
 {
   return (GdkGC *) g_object_ref (G_OBJECT (gc));
 }
 
+/**
+ * gdk_gc_unref:
+ * @gc: a #GdkGC
+ *
+ * Deprecated function; use g_object_unref() instead.
+ *
+ * Return value: the gc.
+ **/
 void
 gdk_gc_unref (GdkGC *gc)
 {
diff --git a/gdk/gdkgc.h b/gdk/gdkgc.h
index 997809fc9..4773b40f3 100644
--- a/gdk/gdkgc.h
+++ b/gdk/gdkgc.h
@@ -191,8 +191,12 @@ GdkGC *gdk_gc_new		  (GdkDrawable	    *drawable);
 GdkGC *gdk_gc_new_with_values	  (GdkDrawable	    *drawable,
 				   GdkGCValues	    *values,
 				   GdkGCValuesMask   values_mask);
+
+#ifndef GDK_DISABLE_DEPRECATED
 GdkGC *gdk_gc_ref		  (GdkGC	    *gc);
 void   gdk_gc_unref		  (GdkGC	    *gc);
+#endif
+
 void   gdk_gc_get_values	  (GdkGC	    *gc,
 				   GdkGCValues	    *values);
 void   gdk_gc_set_values          (GdkGC           *gc,
diff --git a/gdk/gdkvisual.h b/gdk/gdkvisual.h
index bcae03b43..68334855f 100644
--- a/gdk/gdkvisual.h
+++ b/gdk/gdkvisual.h
@@ -80,7 +80,7 @@ GdkVisual*    gdk_visual_get_best_with_type  (GdkVisualType  visual_type);
 GdkVisual*    gdk_visual_get_best_with_both  (gint	     depth,
 					      GdkVisualType  visual_type);
 
-#ifndef GTK_DISABLE_DEPRECATED
+#ifndef GDK_DISABLE_DEPRECATED
 #define gdk_visual_ref(v) g_object_ref(v)
 #define gdk_visual_unref(v) g_object_unref(v)
 #endif