Allow property-style access to colour and colouralpha APIs.

1 files changed, 7 insertions, 3 deletions

diff --git a/test/ScintillaCallable.py b/test/ScintillaCallable.py
index 6d97eb25a..1164631ae 100644
--- a/test/ScintillaCallable.py
+++ b/test/ScintillaCallable.py
@@ -9,6 +9,11 @@ from ctypes import c_int, c_ulong, c_char_p, c_wchar_p, c_ushort, c_uint, c_long
 def IsEnumeration(t):
 	return t[:1].isupper()
 
+basicTypes = ["bool", "int", "position", "line", "pointer", "colour", "colouralpha"]
+
+def BasicTypeOrEnumeration(t):
+	return t in basicTypes or IsEnumeration(t)
+
 class TEXTRANGE(ctypes.Structure):
 	_fields_= (\
 		('cpMin', c_long),
@@ -86,8 +91,7 @@ class ScintillaCallable:
 				not name.startswith("Get") and \
 				not feature["Param1Type"] and \
 				not feature["Param2Type"] and \
-				(feature["ReturnType"] in ["bool", "int", "position", "line", "pointer"] or \
-				IsEnumeration(feature["ReturnType"])):
+				BasicTypeOrEnumeration(feature["ReturnType"]):
 				#~ print("property", feature)
 				return self._scifn(self._sciptr, value, None, None)
 		elif name.startswith("SCN_") and name in self.k:
@@ -105,7 +109,7 @@ class ScintillaCallable:
 			value = int(feature["Value"], 0)
 			#~ print("setproperty", feature)
 			if feature["FeatureType"] == "set" and not name.startswith("Set"):
-				if feature["Param1Type"] in ["bool", "int", "position", "line"] or IsEnumeration(feature["Param1Type"]):
+				if BasicTypeOrEnumeration(feature["Param1Type"]):
 					return self._scifn(self._sciptr, value, c_char_p(val), None)
 				elif feature["Param2Type"] in ["string"]:
 					return self._scifn(self._sciptr, value, None, c_char_p(val))