[gtk+/gtk-2.90] Remove deprecated code from GdkPixmap

[Javier Jardón <jjardon src gnome org>]

commit bca73fc5b793b7e67ffef5e49bde65e3f11f00ad
Author: Javier Jardón <javierjc1982 gmail com>
Date:   Fri Oct 9 15:38:19 2009 +0200

    Remove deprecated code from GdkPixmap

 docs/faq/gtk-faq.sgml                |    4 ++--
 docs/reference/gdk/gdk-sections.txt  |    4 ----
 docs/reference/gdk/tmpl/pixmaps.sgml |   32 --------------------------------
 docs/tutorial/gtk_tut.sgml           |    8 ++++----
 docs/tutorial/gtk_tut_12.es.sgml     |    6 +++---
 gdk/gdkpixmap.h                      |    6 ------
 gdk/x11/gdkcursor-x11.c              |    4 ++--
 7 files changed, 11 insertions(+), 53 deletions(-)
---
diff --git a/docs/faq/gtk-faq.sgml b/docs/faq/gtk-faq.sgml
index e1fd893..2aad6fc 100644
--- a/docs/faq/gtk-faq.sgml
+++ b/docs/faq/gtk-faq.sgml
@@ -2307,8 +2307,8 @@ used, as in:</para>
                NULL, gtk_widget_get_colormap(top),
                &amp;pixmap_mask, NULL, pixfile);
   pixw = gtk_pixmap_new (pixmap, pixmap_mask);
-  gdk_pixmap_unref (pixmap);
-  gdk_pixmap_unref (pixmap_mask);
+  gdk_drawable_unref (pixmap);
+  gdk_drawable_unref (pixmap_mask);
 </programlisting>
 
 </sect1>
diff --git a/docs/reference/gdk/gdk-sections.txt b/docs/reference/gdk/gdk-sections.txt
index c58af6f..f4aa42a 100644
--- a/docs/reference/gdk/gdk-sections.txt
+++ b/docs/reference/gdk/gdk-sections.txt
@@ -257,11 +257,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 5831979..71121c8 100644
--- a/docs/reference/gdk/tmpl/pixmaps.sgml
+++ b/docs/reference/gdk/tmpl/pixmaps.sgml
@@ -149,21 +149,6 @@ in which case a default color will be used.
 @Returns: the #GdkPixmap.
 
 
-<!-- ##### 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
@@ -171,20 +156,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/docs/tutorial/gtk_tut.sgml b/docs/tutorial/gtk_tut.sgml
index 8c3357a..62c57b8 100644
--- a/docs/tutorial/gtk_tut.sgml
+++ b/docs/tutorial/gtk_tut.sgml
@@ -4114,7 +4114,7 @@ static const char * xpm_data[] = {
 
 When we're done using a pixmap and not likely to reuse it again soon,
 it is a good idea to release the resource using
-gdk_pixmap_unref(). Pixmaps should be considered a precious resource,
+gdk_drawable_unref(). Pixmaps should be considered a precious resource,
 because they take up memory in the end-user's X server process. Even
 though the X client you write may run on a powerful "server" computer,
 the user may be running the X server on a small personal computer.
@@ -14476,7 +14476,7 @@ static gint
 configure_event (GtkWidget *widget, GdkEventConfigure *event)
 {
   if (pixmap)
-    gdk_pixmap_unref(pixmap);
+    gdk_drawable_unref(pixmap);
 
   pixmap = gdk_pixmap_new(widget->window,
 			  widget->allocation.width,
@@ -17406,7 +17406,7 @@ static gint configure_event( GtkWidget         *widget,
                              GdkEventConfigure *event )
 {
   if (pixmap)
-    gdk_pixmap_unref(pixmap);
+    gdk_drawable_unref(pixmap);
 
   pixmap = gdk_pixmap_new(widget->window,
 			  widget->allocation.width,
@@ -17592,7 +17592,7 @@ static gint
 configure_event (GtkWidget *widget, GdkEventConfigure *event)
 {
   if (pixmap)
-     gdk_pixmap_unref(pixmap);
+     gdk_drawable_unref(pixmap);
 
   pixmap = gdk_pixmap_new(widget->window,
                           widget->allocation.width,
diff --git a/docs/tutorial/gtk_tut_12.es.sgml b/docs/tutorial/gtk_tut_12.es.sgml
index 74b4827..42836e8 100755
--- a/docs/tutorial/gtk_tut_12.es.sgml
+++ b/docs/tutorial/gtk_tut_12.es.sgml
@@ -4061,7 +4061,7 @@ static const char * xpm_data[] = {
 
 Cuando hayamos acabado de usar un <em/pixmap/ y no lo vayamos a usar
 durante un tiempo suele ser conveniente liberar el recurso mediante
-gdk_pixmap_unref(). (Los <em/pixmaps/ deben ser considerados recursos
+gdk_drawable_unref(). (Los <em/pixmaps/ deben ser considerados recursos
 preciosos).
 
 Una vez que hemos creado el <em/pixmap/ lo podemos mostrar como un
@@ -13967,7 +13967,7 @@ static gint
 configure_event (GtkWidget *widget, GdkEventConfigure *event)
 {
   if (pixmap)
-    gdk_pixmap_unref(pixmap);
+    gdk_drawable_unref(pixmap);
 
   pixmap = gdk_pixmap_new(widget->window,
 			  widget->allocation.width,
@@ -16855,7 +16855,7 @@ static gint
 configure_event (GtkWidget *widget, GdkEventConfigure *event)
 {
   if (pixmap)
-    gdk_pixmap_unref(pixmap);
+    gdk_drawable_unref(pixmap);
 
   pixmap = gdk_pixmap_new(widget->window,
 			  widget->allocation.width,
diff --git a/gdk/gdkpixmap.h b/gdk/gdkpixmap.h
index e309038..01c13b4 100644
--- 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                 gdk_drawable_ref
-#define gdk_bitmap_unref               gdk_drawable_unref
-#define gdk_pixmap_ref                 gdk_drawable_ref
-#define gdk_pixmap_unref               gdk_drawable_unref
-#endif /* GDK_DISABLE_DEPRECATED */
 
 G_END_DECLS
 
diff --git a/gdk/x11/gdkcursor-x11.c b/gdk/x11/gdkcursor-x11.c
index 9f72b79..9699680 100644
--- a/gdk/x11/gdkcursor-x11.c
+++ b/gdk/x11/gdkcursor-x11.c
@@ -347,8 +347,8 @@ gdk_cursor_new_for_display (GdkDisplay    *display,
  *  mask = gdk_bitmap_create_from_data (NULL, cursor1mask_bits,
  *                                      cursor1_width, cursor1_height);
  *  cursor = gdk_cursor_new_from_pixmap (source, mask, &amp;fg, &amp;bg, 8, 8);
- *  gdk_pixmap_unref (source);
- *  gdk_pixmap_unref (mask);
+ *  gdk_drawable_unref (source);
+ *  gdk_drawable_unref (mask);
  *  
  *  
  *  gdk_window_set_cursor (widget->window, cursor);