diff options
| author | Jack Jansen <jack.jansen@cwi.nl> | 1998-04-27 15:08:39 (GMT) |
|---|---|---|
| committer | Jack Jansen <jack.jansen@cwi.nl> | 1998-04-27 15:08:39 (GMT) |
| commit | aa70234c6b8e56a3bc6822e45fca4255e6c0d989 (patch) | |
| tree | 266c231d3ba52c18be1659cb98e0a2e9fc34723e /Mac | |
| parent | d38dc64a8dccf9cecc5213496b0ae2914943eb2f (diff) | |
| download | cpython-aa70234c6b8e56a3bc6822e45fca4255e6c0d989.zip cpython-aa70234c6b8e56a3bc6822e45fca4255e6c0d989.tar.gz cpython-aa70234c6b8e56a3bc6822e45fca4255e6c0d989.tar.bz2 | |
New versions from Just.
Diffstat (limited to 'Mac')
| -rw-r--r-- | Mac/Modules/ColorPickermodule.c | 12 | ||||
| -rw-r--r-- | Mac/Modules/Printingmodule.c | 2 |
2 files changed, 5 insertions, 9 deletions
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 @@ PERFORMANCE OF THIS SOFTWARE. #include <ColorPicker.h> #include "Python.h" - +#include "macglue.h" /* ----------------------------------------------------- */ @@ -42,16 +42,12 @@ cp_GetColor(self, args) 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 @@ static struct PyMethodDef Pr_methods[] = { {"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 */ |