[pygtk/gtk-3.0: 28/55] Deprecated: Remove GtkPixmap

[John Stowers <jstowers src gnome org>]

commit a162c07a0981e88e13fd25242b9690a55c42307c
Author: John Stowers <john stowers gmail com>
Date:   Sat Jul 10 21:23:53 2010 +1200

    Deprecated: Remove GtkPixmap

 gtk/gtk-base-types.defs |    7 ------
 gtk/gtk-base.defs       |   50 -----------------------------------------------
 gtk/gtk.override        |   46 -------------------------------------------
 3 files changed, 0 insertions(+), 103 deletions(-)
---
diff --git a/gtk/gtk-base-types.defs b/gtk/gtk-base-types.defs
index 188f8c1..4517598 100644
--- a/gtk/gtk-base-types.defs
+++ b/gtk/gtk-base-types.defs
@@ -1987,13 +1987,6 @@
   (gtype-id "GTK_TYPE_PANED")
 )
 
-(define-object Pixmap
-  (in-module "Gtk")
-  (parent "GtkMisc")
-  (c-name "GtkPixmap")
-  (gtype-id "GTK_TYPE_PIXMAP")
-)
-
 (define-object Plug
   (in-module "Gtk")
   (parent "GtkWindow")
diff --git a/gtk/gtk-base.defs b/gtk/gtk-base.defs
index 5358a59..27a5e6a 100644
--- a/gtk/gtk-base.defs
+++ b/gtk/gtk-base.defs
@@ -11500,56 +11500,6 @@
   (return-type "gboolean")
 )
 
-
-;; From /opt/gtk2/include/gtk-2.0/gtk/gtkpixmap.h
-
-(define-function gtk_pixmap_get_type
-  (c-name "gtk_pixmap_get_type")
-  (return-type "GType")
-)
-
-(define-function gtk_pixmap_new
-  (c-name "gtk_pixmap_new")
-  (is-constructor-of "GtkPixmap")
-  (return-type "GtkWidget*")
-  (parameters
-    '("GdkPixmap*" "pixmap")
-    '("GdkBitmap*" "mask" (null-ok))
-  )
-  (deprecated "use GtkImage")
-)
-
-(define-method set
-  (of-object "GtkPixmap")
-  (c-name "gtk_pixmap_set")
-  (return-type "none")
-  (parameters
-    '("GdkPixmap*" "val")
-    '("GdkBitmap*" "mask" (null-ok))
-  )
-)
-
-(define-method get
-  (of-object "GtkPixmap")
-  (c-name "gtk_pixmap_get")
-  (return-type "none")
-  (parameters
-    '("GdkPixmap**" "val")
-    '("GdkBitmap**" "mask")
-  )
-)
-
-(define-method set_build_insensitive
-  (of-object "GtkPixmap")
-  (c-name "gtk_pixmap_set_build_insensitive")
-  (return-type "none")
-  (parameters
-    '("gboolean" "build")
-  )
-)
-
-
-
 ;; From /opt/gtk2/include/gtk-2.0/gtk/gtkplug.h
 
 (define-function gtk_plug_get_type
diff --git a/gtk/gtk.override b/gtk/gtk.override
index 831b03b..bfdab92 100644
--- a/gtk/gtk.override
+++ b/gtk/gtk.override
@@ -1463,19 +1463,6 @@ _wrap_gtk_menu_popup(PyGObject *self, PyObject *args, PyObject *kwargs)
     return Py_None;
 }
 %%
-override gtk_pixmap_get noargs
-static PyObject *
-_wrap_gtk_pixmap_get(PyGObject *self)
-{
-    GdkPixmap *pixmap;
-    GdkBitmap *mask;
-
-    gtk_pixmap_get(GTK_PIXMAP(self->obj), &pixmap, &mask);
-    return Py_BuildValue("(NN)", pygobject_new((GObject *)pixmap),
-                         pygobject_new((GObject *)mask));
-}
-
-%%
 override gtk_button_new kwargs
 static int
 _wrap_gtk_button_new(PyGObject *self, PyObject *args, PyObject *kwargs)
@@ -5119,39 +5106,6 @@ _wrap_gtk_table_new(PyGObject *self, PyObject *args, PyObject *kwargs)
 %%
 new-constructor GTK_TYPE_TABLE
 %%
-override gtk_pixmap_new kwargs
-static int
-_wrap_gtk_pixmap_new(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "pixmap", "mask", NULL };
-    PyGObject *pixmap, *py_mask;
-    GdkPixmap *mask = NULL;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!O:GtkPixmap.__init__",
-                                     kwlist, &PyGdkPixmap_Type, &pixmap, &py_mask))
-        return -1;
-    if (PyErr_Warn(PyExc_DeprecationWarning, "use GtkImage") < 0)
-        return -1;
-    if (py_mask && pygobject_check(py_mask, &PyGdkPixmap_Type))
-        mask = GDK_PIXMAP(py_mask->obj);
-    else if ((PyObject *)py_mask != Py_None) {
-        PyErr_SetString(PyExc_TypeError, "mask should be a GdkPixmap or None");
-        return -1;
-    }
-
-    pygobject_construct(self, NULL);
-    if (!self->obj) {
-        PyErr_SetString(PyExc_RuntimeError, "could not create GtkPixmap object");
-        return -1;
-    }
-
-    gtk_pixmap_set(GTK_PIXMAP(self->obj), GDK_PIXMAP(pixmap->obj), mask);
-
-    return 0;
-}
-%%
-new-constructor GTK_TYPE_PIXMAP
-%%
 override gtk_plug_new kwargs
 static int
 _wrap_gtk_plug_new(PyGObject *self, PyObject *args, PyObject *kwargs)