wok-next view pygtk/stuff/patches/python27.patch @ rev 19988
Add qt5 - now it's look good enough
| author | Aleksej Bobylev <al.bobylev@gmail.com> |
|---|---|
| date | Fri Oct 20 03:29:40 2017 +0300 (2017-10-20) |
| parents | |
| children |
line source
1 https://bugzilla.gnome.org/show_bug.cgi?id=623965
3 diff --git a/gtk/gtkmodule.c b/gtk/gtkmodule.c
4 index c0e1493..aa8cf10 100644
5 --- a/gtk/gtkmodule.c
6 +++ b/gtk/gtkmodule.c
7 @@ -227,8 +227,12 @@ init_gtk(void)
8 pygtk_add_stock_items(d);
10 /* extension API */
11 - PyDict_SetItemString(d, "_PyGtk_API",
12 - o=PyCObject_FromVoidPtr(&functions, NULL));
13 +#if PY_VERSION_HEX >= 0x02070000
14 + o = PyCapsule_New(&functions, "gtk._gtk._PyGtk_API", NULL);
15 +#else
16 + o = PyCObject_FromVoidPtr(&functions, NULL);
17 +#endif
18 + PyDict_SetItemString(d, "_PyGtk_API", o);
19 Py_DECREF(o);
21 PyGtkDeprecationWarning = PyErr_NewException("gtk.GtkDeprecationWarning",
22 diff --git a/gtk/pygtk.h b/gtk/pygtk.h
23 index 573c3b9..e4c680f 100644
24 --- a/gtk/pygtk.h
25 +++ b/gtk/pygtk.h
26 @@ -60,6 +60,18 @@ struct _PyGtk_FunctionStruct *_PyGtk_API;
29 /* a function to initialise the pygtk functions */
30 +
31 +/* Python 2.7 introduced the PyCapsule API and deprecated the CObject API */
32 +#if PY_VERSION_HEX >= 0x02070000
33 +#define init_pygtk() G_STMT_START { \
34 + void *capsule = PyCapsule_Import("gtk._gtk._PyGtk_API", 0); \
35 + if (!capsule) { \
36 + return; \
37 + } \
38 + _PyGtk_API = (struct _PyGtk_FunctionStruct*)capsule; \
39 +} G_STMT_END
40 +#else /* PY_VERSION_HEX */
41 +/* Python 2.6 and earlier use the CObject API */
42 #define init_pygtk() G_STMT_START { \
43 PyObject *pygtk = PyImport_ImportModule("gtk"); \
44 if (pygtk != NULL) { \
45 @@ -79,6 +91,7 @@ struct _PyGtk_FunctionStruct *_PyGtk_API;
46 return; \
47 } \
48 } G_STMT_END
49 +#endif /* PY_VERSION_HEX */
51 #endif