diff options
author | Johan Dahlin <jdahlin@async.com.br> | 2003-01-01 22:24:50 +0000 |
---|---|---|
committer | Johan Dahlin <zilch@src.gnome.org> | 2003-01-01 22:24:50 +0000 |
commit | 4453bfdba835f3234d9dc310731262b7ffd89367 (patch) | |
tree | 7e4f1c6fac1e80d2a76af06e9148e3aecf9adaf3 /gtk/gtk.override | |
parent | 5d95e414b9aa64d4a9afd5faf33f204a043c2280 (diff) | |
download | pygtk-4453bfdba835f3234d9dc310731262b7ffd89367.tar.gz |
Add default values.
2003-01-01 Johan Dahlin <jdahlin@async.com.br>
* gtk/gtk.defs (GtkTreeView.scroll_to_cell): Add default values.
* gtk/gtk.override (_wrap_gtk_tree_selection_get_selected): Check
the mode before calling gtk_tree_selection_get_selected, this
avoids an abort() in gtk+.
* pygtk.py: Updated to fix #102180, so .require() can be called
twice and won't do anything the second time (eg, not raise an
error) based upon patch by warner-gnome.bugzilla@lothar.com
Diffstat (limited to 'gtk/gtk.override')
-rw-r--r-- | gtk/gtk.override | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/gtk/gtk.override b/gtk/gtk.override index fab6f1e2..27a24ec6 100644 --- a/gtk/gtk.override +++ b/gtk/gtk.override @@ -3097,14 +3097,27 @@ _wrap_gtk_tree_selection_get_selected(PyGObject *self) { GtkTreeModel *model; GtkTreeIter iter; + GtkSelectionMode mode; + + mode = gtk_tree_selection_get_mode(GTK_TREE_SELECTION(self->obj)); + if (mode == GTK_SELECTION_MULTIPLE) { + PyErr_SetString(PyExc_TypeError, + "GtkTreeSelection.get_selected can not be used when" + " selection mode is gtk.SELECTION_MULTIPLE"); + return NULL; + } if (gtk_tree_selection_get_selected(GTK_TREE_SELECTION(self->obj), - &model, &iter)) - return Py_BuildValue("(NN)", pygobject_new((GObject *)model), + &model, &iter)) { + return Py_BuildValue("(NN)", + pygobject_new((GObject *)model), pyg_boxed_new(GTK_TYPE_TREE_ITER, &iter, TRUE, TRUE)); - else - return Py_BuildValue ("(NN)", pygobject_new((GObject *)model), Py_None); + } else { + return Py_BuildValue ("(NN)", + pygobject_new((GObject *)model), + Py_None); + } } %% override gtk_tree_selection_selected_foreach |