diff options
| author | James Henstridge <james@daa.com.au> | 2001-09-28 23:43:47 +0000 |
|---|---|---|
| committer | James Henstridge <jamesh@src.gnome.org> | 2001-09-28 23:43:47 +0000 |
| commit | e0ef227e050134d9b0d9397865dd3c5053ba8d8f (patch) | |
| tree | 1da46f929fc547582755dfc50cde016f04245299 /pango.override | |
| parent | c6a29df6dd65bbede61d2253637886789bebda51 (diff) | |
| download | pygtk-e0ef227e050134d9b0d9397865dd3c5053ba8d8f.tar.gz | |
use pyg_type_from_object instead. Based on patch from Elliot.
2001-09-29 James Henstridge <james@daa.com.au>
* gtk/pygtktreemodel.c (pygtk_tree_model_get_column_type): use
pyg_type_from_object instead. Based on patch from Elliot.
* gtk/gtk.override (_wrap_gtk_selection_data__get_data): convert
getter to a function to match codegen changes.
* : merge in python22-branch (see changelog entries below).
Diffstat (limited to 'pango.override')
| -rw-r--r-- | pango.override | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/pango.override b/pango.override index 5ed77ee4..c3c0636d 100644 --- a/pango.override +++ b/pango.override @@ -5,7 +5,7 @@ headers #include <pygobject.h> #include <pango/pango.h> -static PyExtensionClass *_PyGObject_Type; +static PyTypeObject *_PyGObject_Type; #define PyGObject_Type (*_PyGObject_Type) %% @@ -16,8 +16,8 @@ init if (pygobject != NULL) { PyObject *module_dict = PyModule_GetDict(pygobject); - _PyGObject_Type = (PyExtensionClass *)PyDict_GetItemString(module_dict, - "GObject"); + _PyGObject_Type = (PyTypeObject *)PyDict_GetItemString(module_dict, + "GObject"); } else { Py_FatalError("could not import gobject"); return; @@ -49,7 +49,7 @@ ignore ignore pango_font_description_from_string %% override pango_font_description_new kwargs -static PyObject * +static int _wrap_pango_font_description_new(PyGBoxed *self, PyObject *args, PyObject *kwargs) { @@ -59,7 +59,7 @@ _wrap_pango_font_description_new(PyGBoxed *self, PyObject *args, if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|z:PangoFontDescription.__init__", kwlist, &str)) - return NULL; + return -1; self->gtype = PANGO_TYPE_FONT_DESCRIPTION; self->free_on_dealloc = FALSE; @@ -70,9 +70,8 @@ _wrap_pango_font_description_new(PyGBoxed *self, PyObject *args, if (!self->boxed) { PyErr_SetString(PyExc_RuntimeError, "could not create PangoFontDescription object"); - return NULL; + return -1; } self->free_on_dealloc = TRUE; - Py_INCREF(Py_None); - return Py_None; + return 0; } |