remove g_type_init() argument.

2001-06-30  James Henstridge  <james@daa.com.au>

	* gobjectmodule.c (initgobject): remove g_type_init() argument.

	* gtk/gdk.defs (Visual): make GdkVisual a boxed.

	* gtk/gtk.override (GdkDragContext.targets): override getter for
	this attribute.
	(_wrap_gtk_list_store_new): comment out most of this function as
	there is no way to construct a GtkListStore without C varargs as
	of the last GtkTree related commit.

7 files changed, 42 insertions, 63 deletions

diff --git a/ChangeLog b/ChangeLog
index bea78890..ba926766 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2001-06-30  James Henstridge  <james@daa.com.au>
 
+	* gobjectmodule.c (initgobject): remove g_type_init() argument.
+
+	* gtk/gdk.defs (Visual): make GdkVisual a boxed.
+
+	* gtk/gtk.override (GdkDragContext.targets): override getter for
+	this attribute.
+	(_wrap_gtk_list_store_new): comment out most of this function as
+	there is no way to construct a GtkListStore without C varargs as
+	of the last GtkTree related commit.
+
 	* gtk/gtk-types.c: remove uses of GtkSelectionData.
 
 	* gtk/gtk.override (GtkSelectionData.data): override the data
diff --git a/codegen/argtypes.py b/codegen/argtypes.py
index 30b18004..14dff4b2 100644
--- a/codegen/argtypes.py
+++ b/codegen/argtypes.py
@@ -547,6 +547,7 @@ matcher.register('static_string', arg)
 
 arg = UCharArg()
 matcher.register('unsigned-char*', arg)
+matcher.register('const-guchar*', arg)
 matcher.register('guchar*', arg)
 
 arg = CharArg()
diff --git a/gobject/gobjectmodule.c b/gobject/gobjectmodule.c
index 09f394a1..2edc63fc 100644
--- a/gobject/gobjectmodule.c
+++ b/gobject/gobjectmodule.c
@@ -1991,7 +1991,7 @@ initgobject(void)
     m = Py_InitModule("gobject", pygobject_functions);
     d = PyModule_GetDict(m);
 
-    g_type_init(G_TYPE_DEBUG_NONE);
+    g_type_init();
     pygobject_register_class(d, "GObject", 0, &PyGObject_Type, NULL);
     PyDict_SetItemString(PyGObject_Type.class_dictionary, "__gtype__",
 			 o=PyInt_FromLong(G_TYPE_OBJECT));
diff --git a/gobjectmodule.c b/gobjectmodule.c
index 09f394a1..2edc63fc 100644
--- a/gobjectmodule.c
+++ b/gobjectmodule.c
@@ -1991,7 +1991,7 @@ initgobject(void)
     m = Py_InitModule("gobject", pygobject_functions);
     d = PyModule_GetDict(m);
 
-    g_type_init(G_TYPE_DEBUG_NONE);
+    g_type_init();
     pygobject_register_class(d, "GObject", 0, &PyGObject_Type, NULL);
     PyDict_SetItemString(PyGObject_Type.class_dictionary, "__gtype__",
 			 o=PyInt_FromLong(G_TYPE_OBJECT));
diff --git a/gtk/gdk.defs b/gtk/gdk.defs
index b1d1f8fa..72639b85 100644
--- a/gtk/gdk.defs
+++ b/gtk/gdk.defs
@@ -70,14 +70,10 @@
   (c-name GdkPixbufAnimationIter)
 )
 
-
-;; Boxed types ...
-
-(boxed Visual
+(object Visual
   (in-module Gdk)
+  (parent Object (G))
   (c-name GdkVisual)
-  (copy-func gdk_visual_ref)
-  (release-func gdk_visual_unref)
   (field (type-and-name GdkVisualType type))
   (field (type-and-name gint depth))
   (field (type-and-name GdkByteOrder byte_order))
@@ -94,6 +90,9 @@
   (field (type-and-name gint blue_prec))
 )
 
+
+;; Boxed types ...
+
 (boxed Font
   (in-module Gdk)
   (c-name GdkFont)
diff --git a/gtk/gtk.defs b/gtk/gtk.defs
index d8b3e333..8af0e964 100644
--- a/gtk/gtk.defs
+++ b/gtk/gtk.defs
@@ -6517,29 +6517,6 @@
   (return-type GtkListStore*)
 )
 
-(function gtk_list_store_new_with_types
-  (c-name gtk_list_store_new_with_types)
-  (is-constructor-of GtkListStore)
-  (return-type GtkListStore*)
-  (parameter (type-and-name gint n_columns))
-  (varargs t)
-)
-
-(method set_n_columns
-  (of-object ListStore (Gtk))
-  (c-name gtk_list_store_set_n_columns)
-  (return-type none)
-  (parameter (type-and-name gint n_columns))
-)
-
-(method set_column_type
-  (of-object ListStore (Gtk))
-  (c-name gtk_list_store_set_column_type)
-  (return-type none)
-  (parameter (type-and-name gint column))
-  (parameter (type-and-name GType type))
-)
-
 (method set_value
   (of-object ListStore (Gtk))
   (c-name gtk_list_store_set_value)
@@ -12509,29 +12486,6 @@
   (return-type GtkTreeStore*)
 )
 
-(function gtk_tree_store_new_with_types
-  (c-name gtk_tree_store_new_with_types)
-  (is-constructor-of GtkTreeStore)
-  (return-type GtkTreeStore*)
-  (parameter (type-and-name gint n_columns))
-  (varargs t)
-)
-
-(method set_n_columns
-  (of-object TreeStore (Gtk))
-  (c-name gtk_tree_store_set_n_columns)
-  (return-type none)
-  (parameter (type-and-name gint n_columns))
-)
-
-(method set_column_type
-  (of-object TreeStore (Gtk))
-  (c-name gtk_tree_store_set_column_type)
-  (return-type none)
-  (parameter (type-and-name gint column))
-  (parameter (type-and-name GType type))
-)
-
 (method set_value
   (of-object TreeStore (Gtk))
   (c-name gtk_tree_store_set_value)
@@ -12783,13 +12737,13 @@
   (of-object TreeView (Gtk))
   (c-name gtk_tree_view_set_expander_column)
   (return-type none)
-  (parameter (type-and-name gint col))
+  (parameter (type-and-name GtkTreeViewColumn* column))
 )
 
 (method get_expander_column
   (of-object TreeView (Gtk))
   (c-name gtk_tree_view_get_expander_column)
-  (return-type gint)
+  (return-type GtkTreeViewColumn*)
 )
 
 (method set_column_drag_function
diff --git a/gtk/gtk.override b/gtk/gtk.override
index 2eceff10..3e9cdaa3 100644
--- a/gtk/gtk.override
+++ b/gtk/gtk.override
@@ -578,7 +578,7 @@ _wrap_gtk_selection_data_set(PyGBoxed *self, PyObject *args, PyObject *kwargs)
     int format, length;
     guchar *data;
 
-    if (!PyArg_ParseTupleAndKeywords(args, kwlist,
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs,
 				     "iis#:GtkSelectionData.set", kwlist,
 				     &type, &format, &data, &length))
 	return NULL;
@@ -1251,6 +1251,21 @@ _wrap_gdk_drag_find_window(PyGObject *self, PyObject *args, PyObject *kwargs)
 			 protocol);
 }
 %%
+override_attr GdkDragContext.targets
+PyObject *atom, *ret = PyList_New(0);
+GList *tmp;
+if (ret == NULL)
+    return NULL;
+for (tmp = GDK_DRAG_CONTEXT(self->obj)->targets; tmp; tmp = tmp->next) {
+    if ((atom = PyGdkAtom_New(GPOINTER_TO_INT(tmp->data))) == NULL) {
+	Py_DECREF(ret);
+	return NULL;
+    }
+    PyList_Append(ret, atom);
+    Py_DECREF(atom);
+}
+return ret;
+%%
 override gdk_gc_new_with_values kwargs
 static PyObject *
 _wrap_gdk_gc_new_with_values(PyGObject *self, PyObject *args, PyObject *kwargs)
@@ -1744,8 +1759,6 @@ _wrap_gtk_tree_model_get_value(PyGObject *self, PyObject*args, PyObject*kwargs)
     return ret;
 }
 %%
-ignore gtk_list_store_new_with_types
-%%
 override gtk_list_store_new
 static PyObject *
 _wrap_gtk_list_store_new(PyGObject *self, PyObject *args)
@@ -1754,7 +1767,8 @@ _wrap_gtk_list_store_new(PyGObject *self, PyObject *args)
     GtkListStore *ls;
 
     len = PyTuple_Size(args);
-    ls = gtk_list_store_new();
+    ls = gtk_list_store_new(0);
+#if 0
     gtk_list_store_set_n_columns(ls, len);
     for (i = 0; i < len; i++) {
 	PyObject *item = PyTuple_GetItem(args, i);
@@ -1767,6 +1781,7 @@ _wrap_gtk_list_store_new(PyGObject *self, PyObject *args)
 	}
 	gtk_list_store_set_column_type(ls, i, type);
     }
+#endif
     self->obj = (GObject *)ls;
     pygobject_register_wrapper((PyObject *)self);
     Py_INCREF(Py_None);
@@ -1892,8 +1907,6 @@ _wrap_gtk_list_store_append(PyGObject *self, PyObject *args)
     return pyg_boxed_new(GTK_TYPE_TREE_ITER, &iter, TRUE, TRUE);
 }
 %%
-ignore gtk_tree_store_new_with_types
-%%
 override gtk_tree_store_new
 static PyObject *
 _wrap_gtk_tree_store_new(PyGObject *self, PyObject *args)
@@ -1902,7 +1915,8 @@ _wrap_gtk_tree_store_new(PyGObject *self, PyObject *args)
     GtkTreeStore *ts;
 
     len = PyTuple_Size(args);
-    ts = gtk_tree_store_new();
+    ts = gtk_tree_store_new(0);
+#if 0
     gtk_tree_store_set_n_columns(ts, len);
     for (i = 0; i < len; i++) {
 	PyObject *item = PyTuple_GetItem(args, i);
@@ -1915,6 +1929,7 @@ _wrap_gtk_tree_store_new(PyGObject *self, PyObject *args)
 	}
 	gtk_tree_store_set_column_type(ts, i, type);
     }
+#endif
     self->obj = (GObject *)ts;
     pygobject_register_wrapper((PyObject *)self);
     Py_INCREF(Py_None);