[pygtk/gtk-3.0: 41/55] Deprecated: Remove gdk_xxx functions

[John Stowers <jstowers src gnome org>]

commit ccbea88cf965339fc0b5f8de752c9490adee1dae
Author: John Stowers <john stowers gmail com>
Date:   Sun Jul 11 14:48:54 2010 +1200

    Deprecated: Remove gdk_xxx functions

 gtk/gdk-base.defs      |  148 ------------------------------------------------
 gtk/gdkpixbuf.override |    2 +-
 2 files changed, 1 insertions(+), 149 deletions(-)
---
diff --git a/gtk/gdk-base.defs b/gtk/gdk-base.defs
index f3d38e3..dd744b8 100644
--- a/gtk/gdk-base.defs
+++ b/gtk/gdk-base.defs
@@ -326,16 +326,6 @@
   (return-type "none")
 )
 
-(define-method change
-  (of-object "GdkColormap")
-  (deprecated "deprecated")
-  (c-name "gdk_colormap_change")
-  (return-type "none")
-  (parameters
-    '("gint" "ncolors")
-  )
-)
-
 (define-method alloc_colors
   (of-object "GdkColormap")
   (c-name "gdk_colormap_alloc_colors")
@@ -451,12 +441,6 @@
   (return-type "GdkColormap*")
 )
 
-(define-function colormap_get_system_size
-  (deprecated "deprecated")
-  (c-name "gdk_colormap_get_system_size")
-  (return-type "gint")
-)
-
 (define-method alloc_color
   (of-object "GdkColormap")
   (c-name "gdk_colormap_alloc_color")
@@ -498,48 +482,6 @@
   )
 )
 
-(define-method white
-  (deprecated "deprecated")
-  (of-object "GdkColormap")
-  (c-name "gdk_color_white")
-  (return-type "gint")
-  (parameters
-    '("GdkColor*" "color")
-  )
-)
-
-(define-method black
-  (deprecated "deprecated")
-  (of-object "GdkColormap")
-  (c-name "gdk_color_black")
-  (return-type "gint")
-  (parameters
-    '("GdkColor*" "color")
-  )
-)
-
-(define-method alloc
-  (deprecated "deprecated")
-  (of-object "GdkColormap")
-  (c-name "gdk_color_alloc")
-  (return-type "gint")
-  (parameters
-    '("GdkColor*" "color")
-  )
-)
-
-(define-function color_change
-  (deprecated "deprecated")
-  (c-name "gdk_color_change")
-  (return-type "gint")
-  (parameters
-    '("GdkColormap*" "colormap")
-    '("GdkColor*" "color")
-  )
-)
-
-
-
 ;; From /opt/gtk2/include/gtk-2.0/gdk/gdkcursor.h
 
 ;; From gdkcursor.h
@@ -1438,21 +1380,6 @@
   )
 )
 
-(define-function draw_layout_with_colors
-  (deprecated "use gtk.gdk.Drawable.draw_layout instead")
-  (c-name "gdk_draw_layout_with_colors")
-  (return-type "none")
-  (parameters
-    '("GdkDrawable*" "drawable")
-    '("GdkGC*" "gc")
-    '("gint" "x")
-    '("gint" "y")
-    '("PangoLayout*" "layout")
-    '("GdkColor*" "foreground")
-    '("GdkColor*" "background")
-  )
-)
-
 (define-function draw_glyphs_transformed
   (c-name "gdk_draw_glyphs_transformed")
   (return-type "none")
@@ -1932,15 +1859,6 @@
   )
 )
 
-(define-function gc_new
-  (deprecated "use gdk.GC")
-  (c-name "gdk_gc_new2")
-  (return-type "GdkGC*")
-  (parameters
-    '("GdkDrawable*" "drawable")
-  )
-)
-
 (define-method new_gc
   (of-object "GdkDrawable")
   (c-name "gdk_gc_new_with_values")
@@ -2242,19 +2160,6 @@
   )
 )
 
-(define-method image_get
-  (of-object "GdkDrawable")
-  (deprecated "use GdkDrawable.get_image")
-  (c-name "gdk_image_get")
-  (return-type "GdkImage*")
-  (parameters
-    '("gint" "x")
-    '("gint" "y")
-    '("gint" "width")
-    '("gint" "height")
-  )
-)
-
 (define-method put_pixel
   (of-object "GdkImage")
   (c-name "gdk_image_put_pixel")
@@ -2724,47 +2629,6 @@
   )
 )
 
-(define-method render_to_drawable
-  (deprecated "use gtk.gdk.Drawable.draw_pixbuf")
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_render_to_drawable")
-  (return-type "none")
-  (parameters
-    '("GdkDrawable*" "drawable")
-    '("GdkGC*" "gc")
-    '("int" "src_x")
-    '("int" "src_y")
-    '("int" "dest_x")
-    '("int" "dest_y")
-    '("int" "width")
-    '("int" "height")
-    '("GdkRgbDither" "dither" (default "GDK_RGB_DITHER_NORMAL"))
-    '("gint" "x_dither" (default "0"))
-    '("gint" "y_dither" (default "0"))
-  )
-)
-
-(define-method render_to_drawable_alpha
-  (deprecated "use gtk.gdk.Drawable.draw_pixbuf")
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_render_to_drawable_alpha")
-  (return-type "none")
-  (parameters
-    '("GdkDrawable*" "drawable")
-    '("int" "src_x")
-    '("int" "src_y")
-    '("int" "dest_x")
-    '("int" "dest_y")
-    '("int" "width")
-    '("int" "height")
-    '("GdkPixbufAlphaMode" "alpha_mode")
-    '("int" "alpha_threshold")
-    '("GdkRgbDither" "dither" (default "GDK_RGB_DITHER_NORMAL"))
-    '("gint" "x_dither" (default "0"))
-    '("gint" "y_dither" (default "0"))
-  )
-)
-
 (define-method render_pixmap_and_mask
   (of-object "GdkPixbuf")
   (c-name "gdk_pixbuf_render_pixmap_and_mask")
@@ -3319,12 +3183,6 @@
   (return-type "GdkColormap*")
 )
 
-(define-function rgb_get_cmap
-  (deprecated "use gtk.gdk.rgb_get_colormap instead")
-  (c-name "gdk_rgb_get_cmap")
-  (return-type "GdkColormap*")
-)
-
 (define-function rgb_get_visual
   (c-name "gdk_rgb_get_visual")
   (return-type "GdkVisual*")
@@ -5481,12 +5339,6 @@
   (return-type "GType")
 )
 
-(define-function pixbuf_loader_new
-  (deprecated "use gtk.gdk.PixbufLoader instead")
-  (c-name "gdk_pixbuf_loader_new")
-  (return-type "GdkPixbufLoader*")
-)
-
 (define-function pixbuf_loader_new_with_type
   (c-name "gdk_pixbuf_loader_new_with_type")
   (is-constructor-of GdkPixbufLoader)
diff --git a/gtk/gdkpixbuf.override b/gtk/gdkpixbuf.override
index c894a0e..5ae989f 100644
--- a/gtk/gdkpixbuf.override
+++ b/gtk/gdkpixbuf.override
@@ -48,7 +48,7 @@ _wrap_gdk_pixbuf_render_pixmap_and_mask(PyGObject *self, PyObject *args,
 
     if (mask) {
         pymask = pygobject_new((GObject *) mask);
-        gdk_bitmap_unref(mask);
+        g_object_unref(mask);
     } else {
         Py_INCREF(Py_None);
         pymask = Py_None;