diff options
-rw-r--r-- | PySide/QtCore/glue/hwnd_conversions.h | 10 | ||||
-rw-r--r-- | PySide/QtCore/typesystem_core_win.xml | 2 | ||||
-rw-r--r-- | PySide/QtGui/glue/wid_conversions.h | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/PySide/QtCore/glue/hwnd_conversions.h b/PySide/QtCore/glue/hwnd_conversions.h index bf2de4df1..65b95e2fd 100644 --- a/PySide/QtCore/glue/hwnd_conversions.h +++ b/PySide/QtCore/glue/hwnd_conversions.h @@ -1,6 +1,6 @@ namespace Shiboken { template <> -struct Converter<HWND__> +struct Converter<HWND> { static bool checkType(PyObject* pyObj) { @@ -19,14 +19,14 @@ struct Converter<HWND__> return 0; } - static PyObject* toPython(HWND__ cppobj) + static PyObject* toPython(HWND cppobj) { - return PyCObject_FromVoidPtr(&cppobj, 0); + return PyCObject_FromVoidPtr(cppobj, 0); } - static HWND__ toCpp(PyObject* pyobj) + static HWND toCpp(PyObject* pyobj) { - return *((HWND__*) PyCObject_AsVoidPtr(pyobj)); + return (HWND)PyCObject_AsVoidPtr(pyobj); } }; } diff --git a/PySide/QtCore/typesystem_core_win.xml b/PySide/QtCore/typesystem_core_win.xml index c4150cd80..8832b25f7 100644 --- a/PySide/QtCore/typesystem_core_win.xml +++ b/PySide/QtCore/typesystem_core_win.xml @@ -19,7 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA --> <typesystem package="PySide.QtCore"> - <primitive-type name="HWND__"> + <primitive-type name="HWND"> <conversion-rule file="glue/hwnd_conversions.h"/> </primitive-type> <value-type name="POINT"> diff --git a/PySide/QtGui/glue/wid_conversions.h b/PySide/QtGui/glue/wid_conversions.h index 9901218a1..1abb5f288 100644 --- a/PySide/QtGui/glue/wid_conversions.h +++ b/PySide/QtGui/glue/wid_conversions.h @@ -1,3 +1,4 @@ +#ifndef Q_WS_WIN namespace Shiboken { template <> struct Converter<WId> @@ -30,3 +31,4 @@ struct Converter<WId> } }; } +#endif |