fix to use gtk_list_store_newv. (_wrap_gtk_tree_store_new): similar fix

2001-07-01  James Henstridge  <james@daa.com.au>

	* gtk/gtk.override (_wrap_gtk_list_store_new): fix to use
	gtk_list_store_newv.
	(_wrap_gtk_tree_store_new): similar fix here.

3 files changed, 36 insertions, 58 deletions

diff --git a/ChangeLog b/ChangeLog
index b64cace9..85b35c01 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-07-01  James Henstridge  <james@daa.com.au>
+
+	* gtk/gtk.override (_wrap_gtk_list_store_new): fix to use
+	gtk_list_store_newv.
+	(_wrap_gtk_tree_store_new): similar fix here.
+
 2001-06-30  James Henstridge  <james@daa.com.au>
 
 	* gtk/gtk-types.c: remove GdkDevice stuff from this file.
diff --git a/gtk/gtk.defs b/gtk/gtk.defs
index 8af0e964..14e7657a 100644
--- a/gtk/gtk.defs
+++ b/gtk/gtk.defs
@@ -8799,8 +8799,8 @@
   (return-type GType)
 )
 
-(function gtk_settings_get_global
-  (c-name gtk_settings_get_global)
+(function gtk_settings_get_default
+  (c-name gtk_settings_get_default)
   (return-type GtkSettings*)
 )
 
@@ -13912,12 +13912,6 @@
   (parameter (type-and-name GtkStyle* style))
 )
 
-(method set_rc_style
-  (of-object Widget (Gtk))
-  (c-name gtk_widget_set_rc_style)
-  (return-type none)
-)
-
 (method ensure_style
   (of-object Widget (Gtk))
   (c-name gtk_widget_ensure_style)
@@ -13930,12 +13924,6 @@
   (return-type GtkStyle*)
 )
 
-(method restore_default_style
-  (of-object Widget (Gtk))
-  (c-name gtk_widget_restore_default_style)
-  (return-type none)
-)
-
 (method modify_style
   (of-object Widget (Gtk))
   (c-name gtk_widget_modify_style)
@@ -14035,12 +14023,6 @@
   (return-type none)
 )
 
-(function widget_push_style
-  (c-name gtk_widget_push_style)
-  (return-type none)
-  (parameter (type-and-name GtkStyle* style))
-)
-
 (function widget_push_colormap
   (c-name gtk_widget_push_colormap)
   (return-type none)
@@ -14057,11 +14039,6 @@
   (return-type none)
 )
 
-(function widget_pop_style
-  (c-name gtk_widget_pop_style)
-  (return-type none)
-)
-
 (function widget_pop_colormap
   (c-name gtk_widget_pop_colormap)
   (return-type none)
@@ -14106,23 +14083,12 @@
   (varargs t)
 )
 
-(function widget_set_default_style
-  (c-name gtk_widget_set_default_style)
-  (return-type none)
-  (parameter (type-and-name GtkStyle* style))
-)
-
 (function widget_set_default_colormap
   (c-name gtk_widget_set_default_colormap)
   (return-type none)
   (parameter (type-and-name GdkColormap* colormap))
 )
 
-(function widget_get_default_style
-  (c-name gtk_widget_get_default_style)
-  (return-type GtkStyle*)
-)
-
 (function widget_get_default_colormap
   (c-name gtk_widget_get_default_colormap)
   (return-type GdkColormap*)
diff --git a/gtk/gtk.override b/gtk/gtk.override
index 6f17339f..e1d9c23d 100644
--- a/gtk/gtk.override
+++ b/gtk/gtk.override
@@ -2133,30 +2133,33 @@ _wrap_gtk_tree_model_get_value(PyGObject *self, PyObject*args, PyObject*kwargs)
     return ret;
 }
 %%
+ignore gtk_list_store_newv
+%%
 override gtk_list_store_new
 static PyObject *
 _wrap_gtk_list_store_new(PyGObject *self, PyObject *args)
 {
     guint len, i;
-    GtkListStore *ls;
+    GType *column_types;
 
     len = PyTuple_Size(args);
-    ls = gtk_list_store_new(0);
-#if 0
-    gtk_list_store_set_n_columns(ls, len);
+    column_types = g_new(GType, len);
     for (i = 0; i < len; i++) {
 	PyObject *item = PyTuple_GetItem(args, i);
-	GType type;
 
-	type = pyg_type_from_object(item);
-	if (type == 0) {
-	    g_object_unref(G_OBJECT(ls));
+	column_types[i] = pyg_type_from_object(item);
+	if (column_types[i] == 0) {
+	    g_free(column_types);
 	    return NULL;
 	}
-	gtk_list_store_set_column_type(ls, i, type);
     }
-#endif
-    self->obj = (GObject *)ls;
+    self->obj = (GObject *)gtk_list_store_new(len, column_types);
+    g_free(column_types);
+    if (!self->obj) {
+        PyErr_SetString(PyExc_RuntimeError,
+			"could not create GtkListStore object");
+        return NULL;
+    }
     pygobject_register_wrapper((PyObject *)self);
     Py_INCREF(Py_None);
     return Py_None;
@@ -2281,30 +2284,33 @@ _wrap_gtk_list_store_append(PyGObject *self, PyObject *args)
     return pyg_boxed_new(GTK_TYPE_TREE_ITER, &iter, TRUE, TRUE);
 }
 %%
+ignore gtk_tree_store_newv
+%%
 override gtk_tree_store_new
 static PyObject *
 _wrap_gtk_tree_store_new(PyGObject *self, PyObject *args)
 {
     guint len, i;
-    GtkTreeStore *ts;
+    GType *column_types;
 
     len = PyTuple_Size(args);
-    ts = gtk_tree_store_new(0);
-#if 0
-    gtk_tree_store_set_n_columns(ts, len);
+    column_types = g_new(GType, len);
     for (i = 0; i < len; i++) {
 	PyObject *item = PyTuple_GetItem(args, i);
-	GType type;
 
-	type = pyg_type_from_object(item);
-	if (type == 0) {
-	    g_object_unref(G_OBJECT(ts));
+	column_types[i] = pyg_type_from_object(item);
+	if (column_types[i] == 0) {
+	    g_free(column_types);
 	    return NULL;
 	}
-	gtk_tree_store_set_column_type(ts, i, type);
     }
-#endif
-    self->obj = (GObject *)ts;
+    self->obj = (GObject *)gtk_tree_store_new(len, column_types);
+    g_free(column_types);
+    if (!self->obj) {
+        PyErr_SetString(PyExc_RuntimeError,
+			"could not create GtkTreeStore object");
+        return NULL;
+    }
     pygobject_register_wrapper((PyObject *)self);
     Py_INCREF(Py_None);
     return Py_None;