From 2683577b7a4fd8bbf61911d50a39bf0301cb12b9 Mon Sep 17 00:00:00 2001
From: Marcelo Lira <marcelo.lira@openbossa.org>
Date: Thu, 13 Oct 2011 16:18:16 -0300
Subject: Fixes win32's HWND converter.

Reviewed by Hugo Parente <hugo.lima@openbossa.org>
Reviewed by Luciano Wolf <luciano.wolf@openbossa.org>
---
 PySide/QtCore/glue/hwnd_conversions.h | 10 +++++-----
 PySide/QtCore/typesystem_core_win.xml |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'PySide/QtCore')

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">
-- 
cgit v1.2.3