diff options
| author | Johan Dahlin <jdahlin@telia.com> | 2001-12-14 10:49:11 +0000 |
|---|---|---|
| committer | Johan Dahlin <zilch@src.gnome.org> | 2001-12-14 10:49:11 +0000 |
| commit | dc98d5fe415da12361e55d56f7140f8ad33ce20b (patch) | |
| tree | f6be4c7031b5ed4bfe99830f864a476cf06c0e88 /gtk | |
| parent | 474ade108c9039ac8000b4e92e76a9c38939c075 (diff) | |
| download | pygtk-dc98d5fe415da12361e55d56f7140f8ad33ce20b.tar.gz | |
Add and define PYGTK_[MAJOR,MINOR,MACRO]_VERSION. Also add
2001-12-14 Johan Dahlin <jdahlin@telia.com>
* configure.in (PYGTK_MINOR_VERSION): Add and define
PYGTK_[MAJOR,MINOR,MACRO]_VERSION. Also add *_REQUIRED_VERSION
for dependencies.
* gtk/gtkmodule.c (init_gtk): remove gtk_major_version,
gtk_minor_version and gtk_macro_version and replace them with
gtk_version,
Add pygtk_version.
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/gtkmodule.c | 32 |
1 files changed, 14 insertions, 18 deletions
diff --git a/gtk/gtkmodule.c b/gtk/gtkmodule.c index 187483fb..6bca5caa 100644 --- a/gtk/gtkmodule.c +++ b/gtk/gtkmodule.c @@ -31,7 +31,7 @@ static struct _PyGtk_FunctionStruct functions = { DL_EXPORT(void) init_gtk(void) { - PyObject *m, *d, *v; + PyObject *m, *d, *v, *tuple; PyObject *av; int argc, i; char **argv; @@ -77,26 +77,22 @@ init_gtk(void) m = Py_InitModule("gtk._gtk", pygtk_functions); d = PyModule_GetDict(m); - v = PyInt_FromLong(gtk_major_version); - if (v != NULL) { - PyDict_SetItemString(d, "major_version", v); - Py_DECREF(v); - } - v = PyInt_FromLong(gtk_minor_version); - if (v != NULL) { - PyDict_SetItemString(d, "minor_version", v); - Py_DECREF(v); - } - v = PyInt_FromLong(gtk_micro_version); - if (v != NULL) { - PyDict_SetItemString(d, "micro_version", v); - Py_DECREF(v); - } - + /* gtk+ version */ + tuple = Py_BuildValue ("(iii)", gtk_major_version, gtk_minor_version, + gtk_micro_version); + PyDict_SetItemString(d, "gtk_version", tuple); + Py_DECREF(tuple); + + /* pygtk version */ + tuple = Py_BuildValue ("(iii)", PYGTK_MAJOR_VERSION, PYGTK_MINOR_VERSION, + PYGTK_MICRO_VERSION); + PyDict_SetItemString(d, "pygtk_version", tuple); + Py_DECREF(tuple); + _pygtk_register_boxed_types(d); pygtk_register_classes(d); pygtk_add_constants(m, "GTK_"); - + /* for addon libraries ... */ PyDict_SetItemString(d, "_PyGtk_API", PyCObject_FromVoidPtr(&functions, NULL)); |