diff options
| author | Matt Wilson <msw@redhat.com> | 2001-10-02 14:02:43 +0000 |
|---|---|---|
| committer | Matt Wilson <msw@src.gnome.org> | 2001-10-02 14:02:43 +0000 |
| commit | c12ce8c2858866de6eabcba9e813a91c2de83164 (patch) | |
| tree | 6aa863b080d9cb730ba10617e2cc8e9d8a65a2a7 | |
| parent | 8f681595878b9e41538830dc3e55d0236c8d2bb0 (diff) | |
| download | pygtk-c12ce8c2858866de6eabcba9e813a91c2de83164.tar.gz | |
accept unicode objects as well. (_wrap_gtk_clist_prepend): likewise
2001-10-02 Matt Wilson <msw@redhat.com>
* gtk/gtk.override (_wrap_gtk_clist_new_with_titles): accept unicode
objects as well.
(_wrap_gtk_clist_prepend): likewise
(_wrap_gtk_clist_append): likewise
(_wrap_gtk_clist_insert): likewise
(_wrap_gtk_combo_set_popdown_strings): likewise
(_wrap_gtk_ctree_new_with_titles): likewise
(_wrap_gtk_ctree_insert_node): likewise
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | gtk/gtk.override | 35 |
2 files changed, 32 insertions, 14 deletions
@@ -1,3 +1,14 @@ +2001-10-02 Matt Wilson <msw@redhat.com> + + * gtk/gtk.override (_wrap_gtk_clist_new_with_titles): accept unicode + objects as well. + (_wrap_gtk_clist_prepend): likewise + (_wrap_gtk_clist_append): likewise + (_wrap_gtk_clist_insert): likewise + (_wrap_gtk_combo_set_popdown_strings): likewise + (_wrap_gtk_ctree_new_with_titles): likewise + (_wrap_gtk_ctree_insert_node): likewise + 2001-10-02 Johan Dahlin <zilch.am@home.se> * gtk/gtk.defs: Added diff --git a/gtk/gtk.override b/gtk/gtk.override index 2c8a295c..5cea0eca 100644 --- a/gtk/gtk.override +++ b/gtk/gtk.override @@ -365,8 +365,9 @@ _wrap_gtk_clist_new_with_titles(PyGObject *self, PyObject *args, PyObject *item = PySequence_GetItem(py_list, i); Py_DECREF(item); /* PySequence_GetItem INCREF's */ - if (!PyString_Check(item)) { - PyErr_SetString(PyExc_TypeError, "sequence item not a string"); + if (!PyString_Check(item) && !PyUnicode_Check(item)) { + PyErr_SetString(PyExc_TypeError, + "sequence item not a string or unicode object"); g_free(list); return -1; } @@ -475,8 +476,9 @@ _wrap_gtk_clist_prepend(PyGObject *self, PyObject *args, PyObject *kwargs) PyObject *item = PySequence_GetItem(py_list, i); Py_DECREF(item); - if (!PyString_Check(item)) { - PyErr_SetString(PyExc_TypeError, "sequence item not a string"); + if (!PyString_Check(item) && !PyUnicode_Check(item)) { + PyErr_SetString(PyExc_TypeError, + "sequence item not a string or unicode object"); g_free(list); return NULL; } @@ -513,8 +515,9 @@ _wrap_gtk_clist_append(PyGObject *self, PyObject *args, PyObject *kwargs) PyObject *item = PySequence_GetItem(py_list, i); Py_DECREF(item); - if (!PyString_Check(item)) { - PyErr_SetString(PyExc_TypeError, "sequence item not a string"); + if (!PyString_Check(item) && !PyUnicode_Check(item)) { + PyErr_SetString(PyExc_TypeError, + "sequence item not a string or unicode object"); g_free(list); return NULL; } @@ -551,8 +554,9 @@ _wrap_gtk_clist_insert(PyGObject *self, PyObject *args, PyObject *kwargs) PyObject *item = PySequence_GetItem(py_list, i); Py_DECREF(item); - if (!PyString_Check(item)) { - PyErr_SetString(PyExc_TypeError, "sequence item not a string"); + if (!PyString_Check(item) && !PyUnicode_Check(item)) { + PyErr_SetString(PyExc_TypeError, + "sequence item not a string or unicode object"); g_free(list); return NULL; } @@ -687,8 +691,9 @@ _wrap_gtk_combo_set_popdown_strings(PyGObject *self, PyObject *args, PyObject *item = PySequence_GetItem(list, i); Py_DECREF(item); - if (!PyString_Check(item)) { - PyErr_SetString(PyExc_TypeError, "sequence item not a string"); + if (!PyString_Check(item) && !PyUnicode_Check(item)) { + PyErr_SetString(PyExc_TypeError, + "sequence item not a string or unicode object"); g_list_free(glist); return NULL; } @@ -2207,8 +2212,9 @@ _wrap_gtk_ctree_new_with_titles(PyGObject *self, PyObject *args, PyObject *item = PySequence_GetItem(py_titles, i); Py_DECREF(item); - if (!PyString_Check(item)) { - PyErr_SetString(PyExc_TypeError, "sequence item not a string"); + if (!PyString_Check(item) && !PyUnicode_Check(item)) { + PyErr_SetString(PyExc_TypeError, + "sequence item not a string or unicode object"); g_free(titles); return -1; } @@ -2335,8 +2341,9 @@ _wrap_gtk_ctree_insert_node(PyGObject *self, PyObject *args, PyObject *item = PySequence_GetItem(py_text, i); Py_DECREF(item); - if (!PyString_Check(item)) { - PyErr_SetString(PyExc_TypeError,"text sequence item not a string"); + if (!PyString_Check(item) && !PyUnicode_Check(item)) { + PyErr_SetString(PyExc_TypeError, + "sequence item not a string or unicode object"); g_free(text); return NULL; } |