summaryrefslogtreecommitdiff
path: root/gtk/gtktreeview.override
diff options
context:
space:
mode:
authorPaul Pogonyshev <pogonyshev@gmx.net>2009-05-31 19:10:08 +0300
committerPaul Pogonyshev <pogonyshev@gmx.net>2009-06-13 00:19:40 +0300
commitfbb3e653ab1c4f467d7aae61e8444fab8c839af1 (patch)
tree06fde385138f68e83430ba6105744779cfd73d2e /gtk/gtktreeview.override
parent956592c614c567623510dccf5fc1edaee9c766c1 (diff)
downloadpygtk-fbb3e653ab1c4f467d7aae61e8444fab8c839af1.tar.gz
Modernize constructors of seven more types
Make and/or just mark constructors of gtk.ImageMenuItem, gtk.LinkButton, gtk.TreeViewColumn, gtk.ListStore, gtk.TreeStore, gtk.TextMark and gtk.MountOperation new-style. Part of bug #583777.
Diffstat (limited to 'gtk/gtktreeview.override')
-rw-r--r--gtk/gtktreeview.override27
1 files changed, 16 insertions, 11 deletions
diff --git a/gtk/gtktreeview.override b/gtk/gtktreeview.override
index 05d93c9e..2a101b1f 100644
--- a/gtk/gtktreeview.override
+++ b/gtk/gtktreeview.override
@@ -72,6 +72,8 @@ ignore
gtk_tree_store_insert_with_values
gtk_tree_store_insert_with_valuesv
%%
+new-constructor GTK_TYPE_TREE_VIEW_COLUMN
+%%
override gtk_tree_view_column_new kwargs
static int
_wrap_gtk_tree_view_column_new(PyGObject *self, PyObject*args, PyObject*kwargs)
@@ -94,13 +96,13 @@ _wrap_gtk_tree_view_column_new(PyGObject *self, PyObject*args, PyObject*kwargs)
return -1;
}
}
- tvc = GTK_TREE_VIEW_COLUMN(
- g_object_new(pyg_type_from_object((PyObject *) self), NULL));
- if (title)
- gtk_tree_view_column_set_title(tvc, title);
+ pygobject_construct(self, "title", title, NULL);
+ tvc = GTK_TREE_VIEW_COLUMN(self->obj);
+
if (cell)
gtk_tree_view_column_pack_start(tvc, cell, TRUE);
+
if (kwargs) {
while (PyDict_Next(kwargs, &i, &key, &item)) {
gchar *attr = PyString_AsString(key);
@@ -111,6 +113,7 @@ _wrap_gtk_tree_view_column_new(PyGObject *self, PyObject*args, PyObject*kwargs)
"%s must be an integer column number", attr);
PyErr_SetString(PyExc_TypeError, err);
g_object_unref(tvc);
+ self->obj = NULL;
return -1;
}
@@ -123,8 +126,6 @@ _wrap_gtk_tree_view_column_new(PyGObject *self, PyObject*args, PyObject*kwargs)
PyInt_AsLong(item));
}
}
- self->obj = (GObject *)tvc;
- pygobject_register_wrapper((PyObject *)self);
return 0;
}
%%
@@ -1232,6 +1233,8 @@ _wrap_gtk_tree_sortable_set_default_sort_func(PyGObject *self, PyObject *args)
%%
ignore gtk_list_store_newv
%%
+new-constructor GTK_TYPE_LIST_STORE
+%%
override gtk_list_store_new
static int
_wrap_gtk_list_store_new(PyGObject *self, PyObject *args)
@@ -1256,15 +1259,16 @@ _wrap_gtk_list_store_new(PyGObject *self, PyObject *args)
return -1;
}
}
- self->obj = g_object_newv(pyg_type_from_object((PyObject *) self), 0, NULL);
+
+ pygobject_construct(self, NULL);
gtk_list_store_set_column_types(GTK_LIST_STORE(self->obj), len, column_types);
g_free(column_types);
+
if (!self->obj) {
PyErr_SetString(PyExc_RuntimeError,
"could not create GtkListStore object");
return -1;
}
- pygobject_register_wrapper((PyObject *)self);
return 0;
}
%%
@@ -1631,6 +1635,8 @@ _wrap_gtk_list_store_reorder(PyGObject *self, PyObject *args)
%%
ignore gtk_tree_store_newv
%%
+new-constructor GTK_TYPE_TREE_STORE
+%%
override gtk_tree_store_new
static int
_wrap_gtk_tree_store_new(PyGObject *self, PyObject *args)
@@ -1655,16 +1661,15 @@ _wrap_gtk_tree_store_new(PyGObject *self, PyObject *args)
}
}
- self->obj = g_object_newv(pyg_type_from_object((PyObject *) self), 0, NULL);
+ pygobject_construct(self, NULL);
gtk_tree_store_set_column_types(GTK_TREE_STORE(self->obj), len, column_types);
-
g_free(column_types);
+
if (!self->obj) {
PyErr_SetString(PyExc_RuntimeError,
"could not create GtkTreeStore object");
return -1;
}
- pygobject_register_wrapper((PyObject *)self);
return 0;
}
%%