Fixed GetPen and SetPt arguments
diff --git a/Mac/Modules/qd/Qdmodule.c b/Mac/Modules/qd/Qdmodule.c
index 14d5a4d..adbba87 100644
--- a/Mac/Modules/qd/Qdmodule.c
+++ b/Mac/Modules/qd/Qdmodule.c
@@ -543,8 +543,7 @@
{
PyObject *_res = NULL;
Point pt;
- if (!PyArg_ParseTuple(_args, "O&",
- PyMac_GetPoint, &pt))
+ if (!PyArg_ParseTuple(_args, ""))
return NULL;
GetPen(&pt);
_res = Py_BuildValue("O&",
@@ -2062,8 +2061,7 @@
Point pt;
short h;
short v;
- if (!PyArg_ParseTuple(_args, "O&hh",
- PyMac_GetPoint, &pt,
+ if (!PyArg_ParseTuple(_args, "hh",
&h,
&v))
return NULL;
@@ -3435,7 +3433,7 @@
{"ShowPen", (PyCFunction)Qd_ShowPen, 1,
"() -> None"},
{"GetPen", (PyCFunction)Qd_GetPen, 1,
- "(Point pt) -> (Point pt)"},
+ "() -> (Point pt)"},
{"GetPenState", (PyCFunction)Qd_GetPenState, 1,
"() -> (PenState pnState)"},
{"SetPenState", (PyCFunction)Qd_SetPenState, 1,
@@ -3597,7 +3595,7 @@
{"FillPoly", (PyCFunction)Qd_FillPoly, 1,
"(PolyHandle poly, Pattern pat) -> None"},
{"SetPt", (PyCFunction)Qd_SetPt, 1,
- "(Point pt, short h, short v) -> (Point pt)"},
+ "(short h, short v) -> (Point pt)"},
{"LocalToGlobal", (PyCFunction)Qd_LocalToGlobal, 1,
"(Point pt) -> (Point pt)"},
{"GlobalToLocal", (PyCFunction)Qd_GlobalToLocal, 1,
diff --git a/Mac/Modules/qd/qdgen.py b/Mac/Modules/qd/qdgen.py
index 7ea15fe..df3ad98 100644
--- a/Mac/Modules/qd/qdgen.py
+++ b/Mac/Modules/qd/qdgen.py
@@ -88,7 +88,7 @@
functions.append(f)
f = Function(void, 'GetPen',
- (Point, 'pt', InOutMode),
+ (Point, 'pt', OutMode),
)
functions.append(f)
@@ -570,7 +570,7 @@
functions.append(f)
f = Function(void, 'SetPt',
- (Point, 'pt', InOutMode),
+ (Point, 'pt', OutMode),
(short, 'h', InMode),
(short, 'v', InMode),
)
diff --git a/Mac/Modules/qd/qdscan.py b/Mac/Modules/qd/qdscan.py
index 2838c06..6c87ce0 100644
--- a/Mac/Modules/qd/qdscan.py
+++ b/Mac/Modules/qd/qdscan.py
@@ -109,6 +109,11 @@
('short', 'byteCount', 'InMode')],
[('TextThingie', '*', '*'), ('*', '*', '*'), ('*', '*', '*')]),
+ # GetPen and SetPt use a point-pointer as output-only:
+ ('GetPen', [('Point', '*', 'OutMode')], [('*', '*', 'OutMode')]),
+ ('SetPt', [('Point', '*', 'OutMode')], [('*', '*', 'OutMode')]),
+
+ # All others use it as input/output:
([('Point', '*', 'OutMode')],
[('*', '*', 'InOutMode')]),