diff options
| author | Marcelo Lira <marcelo.lira@openbossa.org> | 2011-10-13 16:18:16 -0300 |
|---|---|---|
| committer | Hugo Parente Lima <hugo.pl@gmail.com> | 2012-03-08 16:56:13 -0300 |
| commit | 2683577b7a4fd8bbf61911d50a39bf0301cb12b9 (patch) | |
| tree | ca57d67155a10dc8e312502e4dfb82a206b3848a /PySide/QtCore | |
| parent | ed94eda7981e1fa9a3f1ba29c8eda19a010ba3f6 (diff) | |
Fixes win32's HWND converter.
Reviewed by Hugo Parente <hugo.lima@openbossa.org>
Reviewed by Luciano Wolf <luciano.wolf@openbossa.org>
Diffstat (limited to 'PySide/QtCore')
| -rw-r--r-- | PySide/QtCore/glue/hwnd_conversions.h | 10 | ||||
| -rw-r--r-- | PySide/QtCore/typesystem_core_win.xml | 2 |
2 files changed, 6 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"> |