diff options
| author | Jack Jansen <jack.jansen@cwi.nl> | 1996-04-10 14:48:19 (GMT) |
|---|---|---|
| committer | Jack Jansen <jack.jansen@cwi.nl> | 1996-04-10 14:48:19 (GMT) |
| commit | 2b72417da0af053f6efc1b3574361744eb22d2a7 (patch) | |
| tree | 2385a4dfc666a30489672c480c46794b0210be97 /Mac/Modules/ctl | |
| parent | fcdf4378acd50b94da0cf16187363f3bf5815d6a (diff) | |
| download | cpython-2b72417da0af053f6efc1b3574361744eb22d2a7.zip cpython-2b72417da0af053f6efc1b3574361744eb22d2a7.tar.gz cpython-2b72417da0af053f6efc1b3574361744eb22d2a7.tar.bz2 | |
Replaced various dummy updateRegions by real arguments
Diffstat (limited to 'Mac/Modules/ctl')
| -rw-r--r-- | Mac/Modules/ctl/Ctlmodule.c | 13 | ||||
| -rw-r--r-- | Mac/Modules/ctl/ctlgen.py | 2 | ||||
| -rw-r--r-- | Mac/Modules/ctl/ctlsupport.py | 2 |
3 files changed, 11 insertions, 6 deletions
diff --git a/Mac/Modules/ctl/Ctlmodule.c b/Mac/Modules/ctl/Ctlmodule.c index 2669113..bc690cd 100644 --- a/Mac/Modules/ctl/Ctlmodule.c +++ b/Mac/Modules/ctl/Ctlmodule.c @@ -40,6 +40,9 @@ extern int GrafObj_Convert(PyObject *, GrafPtr *); extern PyObject *BMObj_New(BitMapPtr); extern int BMObj_Convert(PyObject *, BitMapPtr *); +extern PyObject *PMObj_New(PixMapHandle); +extern int PMObj_Convert(PyObject *, PixMapHandle *); + extern PyObject *WinObj_WhichWindow(WindowPtr); #include <Controls.h> @@ -624,11 +627,13 @@ static PyObject *Ctl_UpdateControls(_self, _args) { PyObject *_res = NULL; WindowPtr theWindow; - if (!PyArg_ParseTuple(_args, "O&", - WinObj_Convert, &theWindow)) + RgnHandle updateRegion; + if (!PyArg_ParseTuple(_args, "O&O&", + WinObj_Convert, &theWindow, + ResObj_Convert, &updateRegion)) return NULL; UpdateControls(theWindow, - theWindow->visRgn); + updateRegion); Py_INCREF(Py_None); _res = Py_None; return _res; @@ -666,7 +671,7 @@ static PyMethodDef Ctl_methods[] = { {"DrawControls", (PyCFunction)Ctl_DrawControls, 1, "(WindowPtr theWindow) -> None"}, {"UpdateControls", (PyCFunction)Ctl_UpdateControls, 1, - "(WindowPtr theWindow) -> None"}, + "(WindowPtr theWindow, RgnHandle updateRegion) -> None"}, {"FindControl", (PyCFunction)Ctl_FindControl, 1, "(Point thePoint, WindowPtr theWindow) -> (ControlPartCode _rv, ControlHandle theControl)"}, {NULL, NULL, 0} diff --git a/Mac/Modules/ctl/ctlgen.py b/Mac/Modules/ctl/ctlgen.py index 529097c..451253a 100644 --- a/Mac/Modules/ctl/ctlgen.py +++ b/Mac/Modules/ctl/ctlgen.py @@ -1,4 +1,4 @@ -# Generated from 'Sap:CodeWarrior7:Metrowerks CodeWarrior:MacOS Support:Headers:Universal Headers:Controls.h' +# Generated from 'flap:CW8 Gold:Metrowerks CodeWarrior:MacOS Support:Headers:Universal Headers:Controls.h' f = Function(ControlRef, 'NewControl', (WindowRef, 'theWindow', InMode), diff --git a/Mac/Modules/ctl/ctlsupport.py b/Mac/Modules/ctl/ctlsupport.py index a8b45a5..c87922a 100644 --- a/Mac/Modules/ctl/ctlsupport.py +++ b/Mac/Modules/ctl/ctlsupport.py @@ -28,7 +28,7 @@ ControlHandle = OpaqueByValueType(OBJECTTYPE, OBJECTPREFIX) ControlRef = ControlHandle ExistingControlHandle = OpaqueByValueType(OBJECTTYPE, "CtlObj_WhichControl", "BUG") -RgnHandle = FakeType("theWindow->visRgn") # XXX +RgnHandle = OpaqueByValueType("RgnHandle", "ResObj") ControlPartCode = Type("ControlPartCode", "h") DragConstraint = Type("DragConstraint", "h") |