diff options
| author | James Henstridge <james@daa.com.au> | 2001-04-08 10:32:14 +0000 |
|---|---|---|
| committer | James Henstridge <jamesh@src.gnome.org> | 2001-04-08 10:32:14 +0000 |
| commit | 0671ff219951209669ac63e85f1055057c799749 (patch) | |
| tree | b4a5237d7b90c2f45949129c1d6f39d50f499123 /gtk/gtkobject-support.c | |
| parent | 6b96bb26c404962a5544b1ed52cb3b55774e8c77 (diff) | |
| download | pygtk-0671ff219951209669ac63e85f1055057c799749.tar.gz | |
same here.
2001-04-08 James Henstridge <james@daa.com.au>
* gtk/gtk.override: same here.
* gtk/gtk-types.c (_pygtk_register_boxed_types): more fixups
* gtk/gtkobject-support.c: lots of similar fixups.
* codegen/argtypes.py (_enum_name): gdk type codes now seem to be
named GDK_TYPE_... and not GTK_TYPE_GDK_...
2001-04-07 James Henstridge <james@daa.com.au>
* gtk/gtk.defs: lots of defs file updates.
2001-04-06 James Henstridge <james@daa.com.au>
* codegen/h2def.py: add --onlyobjdefs flag to script.
Diffstat (limited to 'gtk/gtkobject-support.c')
| -rw-r--r-- | gtk/gtkobject-support.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/gtk/gtkobject-support.c b/gtk/gtkobject-support.c index c3fd4255..c487b134 100644 --- a/gtk/gtkobject-support.c +++ b/gtk/gtkobject-support.c @@ -219,24 +219,24 @@ pygtk_arg_from_pyobject(GtkArg *arg, PyObject *obj) GTK_VALUE_BOXED(*arg) = PyGtkAccelGroup_Get(obj); else return -1; - } else if (arg->type == GTK_TYPE_GDK_EVENT) { + } else if (arg->type == GDK_TYPE_EVENT) { if (PyGdkEvent_Check(obj)) GTK_VALUE_BOXED(*arg) = PyGdkEvent_Get(obj); else return -1; - } else if (arg->type == GTK_TYPE_GDK_FONT) { + } else if (arg->type == GDK_TYPE_FONT) { if (PyGdkFont_Check(obj)) GTK_VALUE_BOXED(*arg) = PyGdkFont_Get(obj); else return -1; - } else if (arg->type == GTK_TYPE_GDK_COLOR) { + } else if (arg->type == GDK_TYPE_COLOR) { if (PyGdkColor_Check(obj)) GTK_VALUE_BOXED(*arg) = PyGdkColor_Get(obj); else if (obj == Py_None) GTK_VALUE_BOXED(*arg) = NULL; else return -1; - } else if (arg->type == GTK_TYPE_GDK_VISUAL) { + } else if (arg->type == GDK_TYPE_VISUAL) { if (PyGdkVisual_Check(obj)) GTK_VALUE_BOXED(*arg) = PyGdkVisual_Get(obj); else if (obj == Py_None) @@ -317,13 +317,13 @@ pygtk_arg_as_pyobject(GtkArg *arg) case GTK_TYPE_BOXED: if (arg->type == GTK_TYPE_ACCEL_GROUP) return PyGtkAccelGroup_New(GTK_VALUE_BOXED(*arg)); - else if (arg->type == GTK_TYPE_GDK_EVENT) + else if (arg->type == GDK_TYPE_EVENT) return PyGdkEvent_New(GTK_VALUE_BOXED(*arg)); - else if (arg->type == GTK_TYPE_GDK_FONT) + else if (arg->type == GDK_TYPE_FONT) return PyGdkFont_New(GTK_VALUE_BOXED(*arg)); - else if (arg->type == GTK_TYPE_GDK_COLOR) + else if (arg->type == GDK_TYPE_COLOR) return PyGdkColor_New(GTK_VALUE_BOXED(*arg)); - else if (arg->type == GTK_TYPE_GDK_VISUAL) + else if (arg->type == GDK_TYPE_VISUAL) return PyGdkVisual_New(GTK_VALUE_BOXED(*arg)); else if (arg->type == GTK_TYPE_SELECTION_DATA) return PyGtkSelectionData_New(GTK_VALUE_BOXED(*arg)); @@ -456,22 +456,22 @@ pygtk_ret_from_pyobject(GtkArg *ret, PyObject *py_ret) *GTK_RETLOC_BOXED(*ret) = PyGtkAccelGroup_Get(py_ret); else *GTK_RETLOC_BOXED(*ret) = NULL; - } else if (ret->type == GTK_TYPE_GDK_EVENT) { + } else if (ret->type == GDK_TYPE_EVENT) { if (PyGdkEvent_Check(py_ret)) *GTK_RETLOC_BOXED(*ret) = PyGdkEvent_Get(py_ret); else *GTK_RETLOC_BOXED(*ret) = NULL; - } else if (ret->type == GTK_TYPE_GDK_FONT) { + } else if (ret->type == GDK_TYPE_FONT) { if (PyGdkFont_Check(py_ret)) *GTK_RETLOC_BOXED(*ret) = PyGdkFont_Get(py_ret); else *GTK_RETLOC_BOXED(*ret) = NULL; - } else if (ret->type == GTK_TYPE_GDK_COLOR) { + } else if (ret->type == GDK_TYPE_COLOR) { if (PyGdkColor_Check(py_ret)) *GTK_RETLOC_BOXED(*ret) = PyGdkColor_Get(py_ret); else *GTK_RETLOC_BOXED(*ret) = NULL; - } else if (ret->type == GTK_TYPE_GDK_VISUAL) { + } else if (ret->type == GDK_TYPE_VISUAL) { if (PyGdkVisual_Check(py_ret)) *GTK_RETLOC_BOXED(*ret) = PyGdkVisual_Get(py_ret); else @@ -547,13 +547,13 @@ pygtk_ret_as_pyobject(GtkArg *arg) case GTK_TYPE_BOXED: if (arg->type == GTK_TYPE_ACCEL_GROUP) return PyGtkAccelGroup_New(*GTK_RETLOC_BOXED(*arg)); - else if (arg->type == GTK_TYPE_GDK_EVENT) + else if (arg->type == GDK_TYPE_EVENT) return PyGdkEvent_New(*GTK_RETLOC_BOXED(*arg)); - else if (arg->type == GTK_TYPE_GDK_FONT) + else if (arg->type == GDK_TYPE_FONT) return PyGdkFont_New(*GTK_RETLOC_BOXED(*arg)); - else if (arg->type == GTK_TYPE_GDK_COLOR) + else if (arg->type == GDK_TYPE_COLOR) return PyGdkColor_New(*GTK_RETLOC_BOXED(*arg)); - else if (arg->type == GTK_TYPE_GDK_VISUAL) + else if (arg->type == GDK_TYPE_VISUAL) return PyGdkVisual_New(*GTK_RETLOC_BOXED(*arg)); else if (arg->type == GTK_TYPE_SELECTION_DATA) return PyGtkSelectionData_New(*GTK_RETLOC_BOXED(*arg)); |