From c55793015e0b1911184002e3eef6b84bea61dda8 Mon Sep 17 00:00:00 2001
From: Unknown <nyamatongwe@gmail.com>
Date: Sat, 10 Aug 2013 12:13:08 +1000
Subject: Fix PySide interface to match 64-bit fixes in ScintillaEdit.

---
 qt/ScintillaEditPy/sepbuild.py                           | 4 ++++
 qt/ScintillaEditPy/typesystem_ScintillaEdit.xml.template | 8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/qt/ScintillaEditPy/sepbuild.py b/qt/ScintillaEditPy/sepbuild.py
index 77d2cb221..43d9930fd 100644
--- a/qt/ScintillaEditPy/sepbuild.py
+++ b/qt/ScintillaEditPy/sepbuild.py
@@ -76,9 +76,13 @@ injectCheckN = """
 def methodSignature(name, v, options):
 	argTypes = ""
 	p1Type = WidgetGen.cppAlias(v["Param1Type"])
+	if p1Type == "int":
+		p1Type = "uptr_t"
 	if p1Type:
 		argTypes = argTypes + p1Type
 	p2Type = WidgetGen.cppAlias(v["Param2Type"])
+	if p2Type == "int":
+		p2Type = "sptr_t"
 	if p2Type and v["Param2Type"] != "stringresult":
 		if p1Type:
 			argTypes = argTypes + ", "
diff --git a/qt/ScintillaEditPy/typesystem_ScintillaEdit.xml.template b/qt/ScintillaEditPy/typesystem_ScintillaEdit.xml.template
index 12522f5f7..3c7e91cda 100644
--- a/qt/ScintillaEditPy/typesystem_ScintillaEdit.xml.template
+++ b/qt/ScintillaEditPy/typesystem_ScintillaEdit.xml.template
@@ -15,7 +15,7 @@
 	<!-- Custom implementation of get and set_margin_mask_n: mask is defined 
 	     as an int but is really a bitfield and the numeric value can be 
 	     greater than max value of an int -->
-		<modify-function signature="set_margin_mask_n(int, int)">
+		<modify-function signature="set_margin_mask_n(uptr_t, sptr_t)">
 			<inject-code>
 				int margin = PyInt_AsLong(%PYARG_1);
 				if (margin == -1 &amp;&amp; PyErr_Occurred())
@@ -28,7 +28,7 @@
 				Py_RETURN_NONE;
 			</inject-code>
 		</modify-function>
-		<modify-function signature="get_margin_mask_n(int) const">
+		<modify-function signature="get_margin_mask_n(uptr_t) const">
 			<inject-code>
 				int margin = PyInt_AsLong(%PYARG_1);
 				if (margin == -1 &amp;&amp; PyErr_Occurred())
@@ -37,7 +37,7 @@
 				%PYARG_0 = PyInt_FromSize_t(mask);
 			</inject-code>
 		</modify-function>
-		<modify-function signature="setMarginMaskN(int, int)">
+		<modify-function signature="setMarginMaskN(uptr_t, sptr_t)">
 			<inject-code>
 				int margin = PyInt_AsLong(%PYARG_1);
 				if (margin == -1 &amp;&amp; PyErr_Occurred())
@@ -50,7 +50,7 @@
 				Py_RETURN_NONE;
 			</inject-code>
 		</modify-function>
-		<modify-function signature="marginMaskN(int) const">
+		<modify-function signature="marginMaskN(uptr_t) const">
 			<inject-code>
 				int margin = PyInt_AsLong(%PYARG_1);
 				if (margin == -1 &amp;&amp; PyErr_Occurred())
-- 
cgit v1.2.3