diff options
author | James Henstridge <james@daa.com.au> | 2001-06-26 16:55:34 +0000 |
---|---|---|
committer | James Henstridge <jamesh@src.gnome.org> | 2001-06-26 16:55:34 +0000 |
commit | 78028c23416411537215f07adb15b41b9bd889a9 (patch) | |
tree | b6b6bf331de5e73ddca439299e1497266fbbb8a5 /gtk/pygtk-private.h | |
parent | 526b1c7f2467aa16dfdc100b3472dd4cffac2eb7 (diff) | |
download | pygtk-78028c23416411537215f07adb15b41b9bd889a9.tar.gz |
remove registrations for `custom' boxed types for objects converted to
2001-06-27 James Henstridge <james@daa.com.au>
* codegen/argtypes.py (arg): remove registrations for `custom'
boxed types for objects converted to PyGBoxed.
* gtk/gtk.override: use PyGBoxed calls fro GtkTreeIters.
* gtk/gtk-types.c: remove GtkTreeIter stuff from here.
* gtk/gtk.defs (TreeIter): add boxed type here.
2001-06-26 James Henstridge <james@daa.com.au>
* gtk/gtk-types.c: remove traces of GdkColor from this file.
* gtk/gtk.override: convert occurences of PyGdkColor_* with
correct PyGBoxed calls.
* gtk/gdk.defs (Color): add GdkColor boxed type here.
Diffstat (limited to 'gtk/pygtk-private.h')
-rw-r--r-- | gtk/pygtk-private.h | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/gtk/pygtk-private.h b/gtk/pygtk-private.h index 52221229..665a2d95 100644 --- a/gtk/pygtk-private.h +++ b/gtk/pygtk-private.h @@ -14,7 +14,6 @@ #undef WITH_THREAD /* type objects */ -extern PyTypeObject PyGdkColor_Type; extern PyTypeObject PyGdkEvent_Type; extern PyTypeObject PyGtkSelectionData_Type; extern PyTypeObject PyGdkAtom_Type; @@ -22,10 +21,8 @@ extern PyTypeObject PyGdkCursor_Type; extern PyTypeObject PyGtkCTreeNode_Type; extern PyTypeObject PyGdkDevice_Type; extern PyTypeObject PyGtkTextIter_Type; -extern PyTypeObject PyGtkTreeIter_Type; /* check the type of a PyObject */ -#define PyGdkColor_Check(v) ((v)->ob_type == &PyGdkColor_Type) #define PyGdkEvent_Check(v) ((v)->ob_type == &PyGdkEvent_Type) #define PyGtkSelectionData_Check(v) ((v)->ob_type == &PyGtkSelectionData_Type) #define PyGdkAtom_Check(v) ((v)->ob_type == &PyGdkAtom_Type) @@ -33,10 +30,8 @@ extern PyTypeObject PyGtkTreeIter_Type; #define PyGtkCTreeNode_Check(v) ((v)->ob_type == &PyGtkCTreeNode_Type) #define PyGdkDevice_Check(v) ((v)->ob_type == &PyGdkDevice_Type) #define PyGtkTextIter_Check(v) ((v)->ob_type == &PyGtkTextIter_Type) -#define PyGtkTreeIter_Check(v) ((v)->ob_type == &PyGtkTreeIter_Type) /* constructors for PyObject wrappers ... */ -PyObject *PyGdkColor_New(GdkColor *colour); PyObject *PyGdkEvent_New(GdkEvent *event); PyObject *PyGtkSelectionData_New(GtkSelectionData *data); PyObject *PyGdkAtom_New(GdkAtom atom); @@ -44,34 +39,16 @@ PyObject *PyGdkCursor_New(GdkCursor *cursor); PyObject *PyGtkCTreeNode_New(GtkCTreeNode *node); PyObject *PyGdkDevice_New(GdkDevice *device); PyObject *PyGtkTextIter_New(GtkTextIter *iter); -PyObject *PyGtkTreeIter_New(GtkTreeIter *iter); /* miscelaneous functions */ void pygtk_block_threads(void); void pygtk_unblock_threads(void); void pygtk_destroy_notify(gpointer data); -void pygtk_callback_marshal(GtkObject *o, gpointer d, guint nargs, - GtkArg *args); -void pygtk_signal_marshal(GtkObject *object, gpointer user_data, - int nparams, GtkArg *args, GtkType *arg_types, - GtkType return_type); + void pygtk_handler_marshal(gpointer a, PyObject *func, int nargs,GtkArg *args); void pygtk_input_marshal(gpointer a, PyObject *func, int nargs, GtkArg *args); -PyObject *pygtk_args_as_tuple(int nparams, GtkArg *args); -int pygtk_args_from_sequence(GtkArg *args, int nparams, PyObject *seq); -int pygtk_arg_from_pyobject(GtkArg *arg, PyObject *obj); -PyObject *pygtk_arg_as_pyobject(GtkArg *arg); -void pygtk_ret_from_pyobject(GtkArg *ret, PyObject *py_ret); -PyObject *pygtk_ret_as_pyobject(GtkArg *arg); -GtkArg *pygtk_dict_as_container_args(PyObject *dict, GtkType type, - gint *nargs); - -void pygtk_register_boxed(GtkType boxed_type, - PyObject *(*fromarg)(gpointer boxed), - int (*toarg)(gpointer *boxed, PyObject *obj)); - /* private */ PyObject *pygtk_tree_path_to_pyobject(GtkTreePath *path); GtkTreePath *pygtk_tree_path_from_pyobject(PyObject *object); |