diff options
Diffstat (limited to 'gobject')
| -rw-r--r-- | gobject/__init__.py | 25 | ||||
| -rw-r--r-- | gobject/gobjectmodule.c | 26 |
2 files changed, 27 insertions, 24 deletions
diff --git a/gobject/__init__.py b/gobject/__init__.py index c94003d..fed14fb 100644 --- a/gobject/__init__.py +++ b/gobject/__init__.py @@ -48,4 +48,29 @@ class GObjectMeta(type): type_register(cls, namespace.get('__gtype_name__')) _gobject._install_metaclass(GObjectMeta) + +# TYPE_INVALID defined in gobjectmodule.c +TYPE_NONE = type_from_name('void') +TYPE_INTERFACE = type_from_name('GInterface') +TYPE_CHAR = type_from_name('gchar') +TYPE_UCHAR = type_from_name('guchar') +TYPE_BOOLEAN = type_from_name('gboolean') +TYPE_INT = type_from_name('gint') +TYPE_UINT = type_from_name('guint') +TYPE_LONG = type_from_name('glong') +TYPE_ULONG = type_from_name('gulong') +TYPE_INT64 = type_from_name('gint64') +TYPE_UINT64 = type_from_name('guint64') +TYPE_ENUM = type_from_name('GEnum') +TYPE_FLAGS = type_from_name('GFlags') +TYPE_FLOAT = type_from_name('gfloat') +TYPE_DOUBLE = type_from_name('gdouble') +TYPE_STRING = type_from_name('gchararray') +TYPE_POINTER = type_from_name('gpointer') +TYPE_BOXED = type_from_name('GBoxed') +TYPE_PARAM = type_from_name('GParam') +TYPE_OBJECT = type_from_name('GObject') +TYPE_PYOBJECT = type_from_name('PyObject') +TYPE_UNICHAR = TYPE_UINT + del _gobject diff --git a/gobject/gobjectmodule.c b/gobject/gobjectmodule.c index 753a837..1649457 100644 --- a/gobject/gobjectmodule.c +++ b/gobject/gobjectmodule.c @@ -3131,31 +3131,9 @@ init_gobject(void) PyModule_AddIntConstant(m, "SPAWN_CHILD_INHERITS_STDIN", G_SPAWN_CHILD_INHERITS_STDIN); PyModule_AddIntConstant(m, "SPAWN_FILE_AND_ARGV_ZERO", G_SPAWN_FILE_AND_ARGV_ZERO); - + /* The rest of the types are set in __init__.py */ PyModule_AddObject(m, "TYPE_INVALID", pyg_type_wrapper_new(G_TYPE_INVALID)); - PyModule_AddObject(m, "TYPE_NONE", pyg_type_wrapper_new(G_TYPE_NONE)); - PyModule_AddObject(m, "TYPE_INTERFACE", pyg_type_wrapper_new(G_TYPE_INTERFACE)); - PyModule_AddObject(m, "TYPE_CHAR", pyg_type_wrapper_new(G_TYPE_CHAR)); - PyModule_AddObject(m, "TYPE_UCHAR", pyg_type_wrapper_new(G_TYPE_UCHAR)); - PyModule_AddObject(m, "TYPE_UNICHAR", pyg_type_wrapper_new(G_TYPE_UINT)); - PyModule_AddObject(m, "TYPE_BOOLEAN", pyg_type_wrapper_new(G_TYPE_BOOLEAN)); - PyModule_AddObject(m, "TYPE_INT", pyg_type_wrapper_new(G_TYPE_INT)); - PyModule_AddObject(m, "TYPE_UINT", pyg_type_wrapper_new(G_TYPE_UINT)); - PyModule_AddObject(m, "TYPE_LONG", pyg_type_wrapper_new(G_TYPE_LONG)); - PyModule_AddObject(m, "TYPE_ULONG", pyg_type_wrapper_new(G_TYPE_ULONG)); - PyModule_AddObject(m, "TYPE_INT64", pyg_type_wrapper_new(G_TYPE_INT64)); - PyModule_AddObject(m, "TYPE_UINT64", pyg_type_wrapper_new(G_TYPE_UINT64)); - PyModule_AddObject(m, "TYPE_ENUM", pyg_type_wrapper_new(G_TYPE_ENUM)); - PyModule_AddObject(m, "TYPE_FLAGS", pyg_type_wrapper_new(G_TYPE_FLAGS)); - PyModule_AddObject(m, "TYPE_FLOAT", pyg_type_wrapper_new(G_TYPE_FLOAT)); - PyModule_AddObject(m, "TYPE_DOUBLE", pyg_type_wrapper_new(G_TYPE_DOUBLE)); - PyModule_AddObject(m, "TYPE_STRING", pyg_type_wrapper_new(G_TYPE_STRING)); - PyModule_AddObject(m, "TYPE_POINTER", pyg_type_wrapper_new(G_TYPE_POINTER)); - PyModule_AddObject(m, "TYPE_BOXED", pyg_type_wrapper_new(G_TYPE_BOXED)); - PyModule_AddObject(m, "TYPE_PARAM", pyg_type_wrapper_new(G_TYPE_PARAM)); - PyModule_AddObject(m, "TYPE_OBJECT", pyg_type_wrapper_new(G_TYPE_OBJECT)); - PyModule_AddObject(m, "TYPE_PYOBJECT", pyg_type_wrapper_new(PY_TYPE_OBJECT)); - + pyg_register_gtype_custom(G_TYPE_STRV, _pyg_strv_from_gvalue, _pyg_strv_to_gvalue); |