New versions from Just.
diff --git a/Mac/Modules/ColorPickermodule.c b/Mac/Modules/ColorPickermodule.c
index 5101d25..d9370b5 100644
--- a/Mac/Modules/ColorPickermodule.c
+++ b/Mac/Modules/ColorPickermodule.c
@@ -23,7 +23,7 @@
#include <ColorPicker.h>
#include "Python.h"
-
+#include "macglue.h"
/* ----------------------------------------------------- */
@@ -42,16 +42,12 @@
RGBColor inColor, outColor;
Boolean ok;
Point where = {0, 0};
- char * prompt;
- Str255 pprompt;
+ Str255 prompt;
- if (!PyArg_ParseTuple(args, "sO&", &prompt, QdRGB_Convert, &inColor))
+ if (!PyArg_ParseTuple(args, "O&O&", PyMac_GetStr255, prompt, QdRGB_Convert, &inColor))
return NULL;
- BlockMove(prompt, pprompt + 1, strlen(prompt));
- pprompt[0] = strlen(prompt);
-
- ok = GetColor(where, pprompt, &inColor, &outColor);
+ ok = GetColor(where, prompt, &inColor, &outColor);
return Py_BuildValue("O&h", QdRGB_New, &outColor, ok);
}
diff --git a/Mac/Modules/Printingmodule.c b/Mac/Modules/Printingmodule.c
index e4cac9b..94d05a6 100644
--- a/Mac/Modules/Printingmodule.c
+++ b/Mac/Modules/Printingmodule.c
@@ -435,7 +435,7 @@
{"PrOpenPage", (PyCFunction)Pr_PrOpenPage, METH_VARARGS, Pr_PrOpenPage__doc__},
{"PrClosePage", (PyCFunction)Pr_PrClosePage, METH_VARARGS, Pr_PrClosePage__doc__},
{"PrPicFile", (PyCFunction)Pr_PrPicFile, METH_VARARGS, Pr_PrPicFile__doc__},
- {"PrGeneral", (PyCFunction)Pr_PrGeneral, METH_VARARGS, Pr_PrGeneral__doc__},
+// {"PrGeneral", (PyCFunction)Pr_PrGeneral, METH_VARARGS, Pr_PrGeneral__doc__},
{"PrDrvrVers", (PyCFunction)Pr_PrDrvrVers, METH_VARARGS, Pr_PrDrvrVers__doc__},
{NULL, (PyCFunction)NULL, 0, NULL} /* sentinel */