diff options
| author | James Henstridge <james@daa.com.au> | 2001-06-25 03:27:26 +0000 |
|---|---|---|
| committer | James Henstridge <jamesh@src.gnome.org> | 2001-06-25 03:27:26 +0000 |
| commit | dab84950ca43189a7525d06b18cbc96b9abe9857 (patch) | |
| tree | 50b60d3e4524199b10cc5df8050c9c26c98f73dc | |
| parent | 5963920662bde148852d89a56713f168a4c47a35 (diff) | |
| download | pygobject-dab84950ca43189a7525d06b18cbc96b9abe9857.tar.gz pygobject-dab84950ca43189a7525d06b18cbc96b9abe9857.tar.xz pygobject-dab84950ca43189a7525d06b18cbc96b9abe9857.zip | |
remove dead code for GtkArg handling, etc. (also tidied up references to
2001-06-25 James Henstridge <james@daa.com.au>
* gtk/gtkobject-support.c: remove dead code for GtkArg handling,
etc. (also tidied up references to it in other files).
2001-06-24 James Henstridge <james@daa.com.au>
* gtk/gtk-types.c: removed all traces of GdkFont.
* gtk/gdk.defs (Font): add boxed type for font.
| -rw-r--r-- | gobject/gobjectmodule.c | 3 | ||||
| -rw-r--r-- | gobject/pygobject.h | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/gobject/gobjectmodule.c b/gobject/gobjectmodule.c index d8ab589..09f394a 100644 --- a/gobject/gobjectmodule.c +++ b/gobject/gobjectmodule.c @@ -711,7 +711,7 @@ pyg_value_from_pyobject(GValue *value, PyObject *obj) } else if (G_VALUE_HOLDS_BOXED(value)) { PyGBoxedMarshal *bm; - if (pyg_boxed_check(obj, &PyGBoxed_Type) && + if (ExtensionClassSubclassInstance_Check(obj, &PyGBoxed_Type) && G_VALUE_HOLDS(value, ((PyGBoxed *)obj)->gtype)) { g_value_set_boxed(value, pyg_boxed_get(obj, gpointer)); } else if ((bm = pyg_boxed_lookup(G_VALUE_TYPE(value))) != NULL) { @@ -1968,6 +1968,7 @@ static struct _PyGObject_Functions functions = { pygobject_register_wrapper, pygobject_lookup_class, pygobject_new, + pyg_closure_new, pyg_type_from_object, pyg_enum_get_value, pyg_flags_get_value, diff --git a/gobject/pygobject.h b/gobject/pygobject.h index 10a9bf4..4cccd23 100644 --- a/gobject/pygobject.h +++ b/gobject/pygobject.h @@ -35,6 +35,8 @@ struct _PyGObject_Functions { void (* register_wrapper)(PyObject *self); PyExtensionClass *(* lookup_class)(GType type); PyObject *(* new)(GObject *obj); + GClosure *(* closure_new)(PyObject *callback, PyObject *extra_args, + PyObject *swap_data); GType (* type_from_object)(PyObject *obj); gint (* enum_get_value)(GType enum_type, PyObject *obj, gint *val); gint (* flags_get_value)(GType flag_type, PyObject *obj, gint *val); @@ -67,6 +69,7 @@ struct _PyGObject_Functions *_PyGObject_API; #define pygobject_register_wrapper (_PyGObject_API->register_wrapper) #define pygobject_lookup_class (_PyGObject_API->lookup_class) #define pygobject_new (_PyGObject_API->new) +#define pyg_closure_new (_PyGObject_API->closure_new) #define pyg_type_from_object (_PyGObject_API->type_from_object) #define pyg_enum_get_value (_PyGObject_API->enum_get_value) #define pyg_flags_get_value (_PyGObject_API->flags_get_value) |