diff options
| author | Marcelo Lira <marcelo.lira@openbossa.org> | 2011-12-09 18:07:23 -0300 |
|---|---|---|
| committer | Hugo Parente Lima <hugo.pl@gmail.com> | 2012-03-08 16:56:21 -0300 |
| commit | c31c14cdfb5fa31c8e985fb50e8f4d001b7cd0ed (patch) | |
| tree | f05ee5f1bc4e6d5015afdecfe5c4dade9deee1e0 /PySide | |
| parent | 879e4bb14d1e17bb34c3793f5e33d7b82563a3f7 (diff) | |
Fixed QtCore's HWND converter for win32.
Diffstat (limited to 'PySide')
| -rw-r--r-- | PySide/QtCore/typesystem_core_win.xml | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/PySide/QtCore/typesystem_core_win.xml b/PySide/QtCore/typesystem_core_win.xml index 998228292..b55f04d5f 100644 --- a/PySide/QtCore/typesystem_core_win.xml +++ b/PySide/QtCore/typesystem_core_win.xml @@ -21,14 +21,25 @@ <typesystem package="PySide.QtCore"> <primitive-type name="HWND"> <conversion-rule file="glue/hwnd_conversions.h"> - <native-to-target> - return PyCObject_FromVoidPtr(%in, 0); - </native-to-target> - <target-to-native> - <add-conversion type="PyCObject"> - %out = *((%OUTTYPE*)PyCObject_AsVoidPtr(%in)); - </add-conversion> - </target-to-native> + <native-to-target> + #ifdef IS_PY3K + return PyCapsule_New(%in, 0, 0); + #else + return PyCObject_FromVoidPtr(%in, 0); + #endif + </native-to-target> + <target-to-native> + <add-conversion type="PyNone"> + %out = 0; + </add-conversion> + <add-conversion check="checkPyCapsuleOrPyCObject(%in)" type="PyObject"> + #ifdef IS_PY3K + %out = (%OUTTYPE)PyCapsule_GetPointer(%in, 0); + #else + %out = (%OUTTYPE)PyCObject_AsVoidPtr(%in); + #endif + </add-conversion> + </target-to-native> </conversion-rule> </primitive-type> <value-type name="POINT"> |