From ebeae9d084fc6093d34408a353f2979a654550cb Mon Sep 17 00:00:00 2001
From: Marcelo Lira <marcelo.lira@openbossa.org>
Date: Fri, 9 Dec 2011 20:01:53 -0300
Subject: Fixes custom code for QtCore's HWND on win32.

---
 PySide/QtCore/typesystem_core_win.xml |  3 +++
 PySide/QtGui/typesystem_gui_win.xml   |  9 +--------
 PySide/typesystem_templates.xml       | 11 +++++++++++
 3 files changed, 15 insertions(+), 8 deletions(-)

(limited to 'PySide')

diff --git a/PySide/QtCore/typesystem_core_win.xml b/PySide/QtCore/typesystem_core_win.xml
index a9663c9b8..f4b8cab24 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 416c5e5ba..93d422a22 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 47615ad02..2903ae408 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>
-- 
cgit v1.2.3