diff options
| author | Marcelo Lira <marcelo.lira@openbossa.org> | 2011-12-09 20:01:53 -0300 |
|---|---|---|
| committer | Marcelo Lira <marcelo.lira@openbossa.org> | 2011-12-09 20:01:53 -0300 |
| commit | 35a92c1dbf47be5270c4ce61591b51351950efc7 (patch) | |
| tree | 4c5df89a74879faa1528dad52bdd7ab60b4b1379 /PySide | |
| parent | 651cadc2c485ab3f9704974f2bef6737412a0071 (diff) | |
| download | pyside-35a92c1dbf47be5270c4ce61591b51351950efc7.tar.gz pyside-35a92c1dbf47be5270c4ce61591b51351950efc7.tar.xz pyside-35a92c1dbf47be5270c4ce61591b51351950efc7.zip | |
Fixes custom code for QtCore's HWND on win32.
Diffstat (limited to 'PySide')
| -rw-r--r-- | PySide/QtCore/typesystem_core_win.xml | 3 | ||||
| -rw-r--r-- | PySide/QtGui/typesystem_gui_win.xml | 9 | ||||
| -rw-r--r-- | PySide/typesystem_templates.xml | 11 |
3 files changed, 15 insertions, 8 deletions
diff --git a/PySide/QtCore/typesystem_core_win.xml b/PySide/QtCore/typesystem_core_win.xml index a9663c9..f4b8cab 100644 --- a/PySide/QtCore/typesystem_core_win.xml +++ b/PySide/QtCore/typesystem_core_win.xml @@ -43,6 +43,9 @@ </target-to-native> </conversion-rule> </primitive-type> + <inject-code class="native" position="beginning"> + <insert-template name="checkPyCapsuleOrPyCObject_func"/> + </inject-code> <value-type name="POINT"> <include file-name="wtypes.h" location="global"/> </value-type> diff --git a/PySide/QtGui/typesystem_gui_win.xml b/PySide/QtGui/typesystem_gui_win.xml index 416c5e5..93d422a 100644 --- a/PySide/QtGui/typesystem_gui_win.xml +++ b/PySide/QtGui/typesystem_gui_win.xml @@ -43,14 +43,7 @@ </conversion-rule> </primitive-type> <inject-code class="native" position="beginning"> - static bool checkPyCapsuleOrPyCObject(PyObject* pyObj) - { - #ifdef IS_PY3K - return PyCapsule_CheckExact(pyObj); - #else - return PyCObject_Check(pyObj); - #endif - } + <insert-template name="checkPyCapsuleOrPyCObject_func"/> </inject-code> <enum-type name="QPixmap::HBitmapFormat" /> </typesystem> diff --git a/PySide/typesystem_templates.xml b/PySide/typesystem_templates.xml index 47615ad..2903ae4 100644 --- a/PySide/typesystem_templates.xml +++ b/PySide/typesystem_templates.xml @@ -414,4 +414,15 @@ } </template> + <template name="checkPyCapsuleOrPyCObject_func"> + static bool checkPyCapsuleOrPyCObject(PyObject* pyObj) + { + #ifdef IS_PY3K + return PyCapsule_CheckExact(pyObj); + #else + return PyCObject_Check(pyObj); + #endif + } + </template> + </typesystem> |