diff --git a/Mac/Modules/ctl/Ctlmodule.c b/Mac/Modules/ctl/Ctlmodule.c index 2669113724f..bc690cd9bc4 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 @@ -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 529097cc1d0..451253aada3 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 a8b45a58206..c87922a109d 100644 --- a/Mac/Modules/ctl/ctlsupport.py +++ b/Mac/Modules/ctl/ctlsupport.py @@ -28,7 +28,7 @@ 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") diff --git a/Mac/Modules/dlg/Dlgmodule.c b/Mac/Modules/dlg/Dlgmodule.c index 93de3e950a5..d09c41aa8be 100644 --- a/Mac/Modules/dlg/Dlgmodule.c +++ b/Mac/Modules/dlg/Dlgmodule.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 @@ -173,10 +176,12 @@ static PyObject *DlgObj_UpdateDialog(_self, _args) PyObject *_args; { PyObject *_res = NULL; - if (!PyArg_ParseTuple(_args, "")) + RgnHandle updateRgn; + if (!PyArg_ParseTuple(_args, "O&", + ResObj_Convert, &updateRgn)) return NULL; UpdateDialog(_self->ob_itself, - _self->ob_itself->visRgn); + updateRgn); Py_INCREF(Py_None); _res = Py_None; return _res; @@ -481,7 +486,7 @@ static PyMethodDef DlgObj_methods[] = { {"DrawDialog", (PyCFunction)DlgObj_DrawDialog, 1, "() -> None"}, {"UpdateDialog", (PyCFunction)DlgObj_UpdateDialog, 1, - "() -> None"}, + "(RgnHandle updateRgn) -> None"}, {"GetDialogItem", (PyCFunction)DlgObj_GetDialogItem, 1, "(short itemNo) -> (short itemType, Handle item, Rect box)"}, {"SetDialogItem", (PyCFunction)DlgObj_SetDialogItem, 1, diff --git a/Mac/Modules/dlg/dlggen.py b/Mac/Modules/dlg/dlggen.py index 3c1e66969dd..b3f08ae29f1 100644 --- a/Mac/Modules/dlg/dlggen.py +++ b/Mac/Modules/dlg/dlggen.py @@ -1,4 +1,4 @@ -# Generated from 'Sap:CodeWarrior7:Metrowerks CodeWarrior:MacOS Support:Headers:Universal Headers:Dialogs.h' +# Generated from 'flap:CW8 Gold:Metrowerks CodeWarrior:MacOS Support:Headers:Universal Headers:Dialogs.h' f = Function(DialogRef, 'NewDialog', (NullStorage, 'wStorage', InMode), diff --git a/Mac/Modules/dlg/dlgsupport.py b/Mac/Modules/dlg/dlgsupport.py index cd255ef446b..ca4e0dfd3d0 100644 --- a/Mac/Modules/dlg/dlgsupport.py +++ b/Mac/Modules/dlg/dlgsupport.py @@ -21,7 +21,7 @@ ModalFilterProcPtr.passInput = lambda name: "NewModalFilterProc(Dlg_PassFilterProc(%s))" % name ModalFilterUPP = ModalFilterProcPtr -RgnHandle = FakeType("_self->ob_itself->visRgn") # XXX +RgnHandle = OpaqueByValueType("RgnHandle", "ResObj") DITLMethod = Type("DITLMethod", "h") diff --git a/Mac/Modules/evt/Evtmodule.c b/Mac/Modules/evt/Evtmodule.c index 9078e9f5f97..8aa8e7d36d0 100644 --- a/Mac/Modules/evt/Evtmodule.c +++ b/Mac/Modules/evt/Evtmodule.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 diff --git a/Mac/Modules/evt/evtgen.py b/Mac/Modules/evt/evtgen.py index 2eda8ed1e0e..29f78d048b6 100644 --- a/Mac/Modules/evt/evtgen.py +++ b/Mac/Modules/evt/evtgen.py @@ -1,4 +1,4 @@ -# Generated from 'Sap:CodeWarrior7:Metrowerks CodeWarrior:MacOS Support:Headers:Universal Headers:Events.h' +# Generated from 'flap:CW8 Gold:Metrowerks CodeWarrior:MacOS Support:Headers:Universal Headers:Events.h' f = Function(UInt32, 'GetCaretTime', ) diff --git a/Mac/Modules/evt/evtsupport.py b/Mac/Modules/evt/evtsupport.py index 617eee4f65c..0471a7e0001 100644 --- a/Mac/Modules/evt/evtsupport.py +++ b/Mac/Modules/evt/evtsupport.py @@ -24,7 +24,9 @@ #WindowPeek = OpaqueByValueType("WindowPeek", OBJECTPREFIX) -RgnHandle = FakeType("(RgnHandle)0") # XXX +RgnHandle = FakeType("(RgnHandle)0") +# XXXX Should be next, but this will break a lot of code... +# RgnHandle = OpaqueByValueType("RgnHandle", "OptResObj") KeyMap = ArrayOutputBufferType("KeyMap") MacOSEventKind = Type("MacOSEventKind", "h") # Old-style diff --git a/Mac/Modules/fm/Fmgen.py b/Mac/Modules/fm/Fmgen.py index 7d9203f7260..9f3f89c5222 100644 --- a/Mac/Modules/fm/Fmgen.py +++ b/Mac/Modules/fm/Fmgen.py @@ -1,4 +1,4 @@ -# Generated from 'flap:CodeWarrior:Metrowerks CodeWarrior:MacOS Support:Headers:Universal Headers:Fonts.h' +# Generated from 'flap:CW8 Gold:Metrowerks CodeWarrior:MacOS Support:Headers:Universal Headers:Fonts.h' f = Function(void, 'InitFonts', ) diff --git a/Mac/Modules/list/Listmodule.c b/Mac/Modules/list/Listmodule.c index 17f20b04f0a..a276ea3247c 100644 --- a/Mac/Modules/list/Listmodule.c +++ b/Mac/Modules/list/Listmodule.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 @@ -299,9 +302,11 @@ static PyObject *ListObj_LUpdate(_self, _args) PyObject *_args; { PyObject *_res = NULL; - if (!PyArg_ParseTuple(_args, "")) + RgnHandle theRgn; + if (!PyArg_ParseTuple(_args, "O&", + ResObj_Convert, &theRgn)) return NULL; - LUpdate((*_self->ob_itself)->port->visRgn, + LUpdate(theRgn, _self->ob_itself); Py_INCREF(Py_None); _res = Py_None; @@ -528,7 +533,7 @@ static PyMethodDef ListObj_methods[] = { {"LAutoScroll", (PyCFunction)ListObj_LAutoScroll, 1, "() -> None"}, {"LUpdate", (PyCFunction)ListObj_LUpdate, 1, - "() -> None"}, + "(RgnHandle theRgn) -> None"}, {"LActivate", (PyCFunction)ListObj_LActivate, 1, "(Boolean act) -> None"}, {"LCellSize", (PyCFunction)ListObj_LCellSize, 1, diff --git a/Mac/Modules/list/listgen.py b/Mac/Modules/list/listgen.py index 9ee6ce68a0a..85e048525c3 100644 --- a/Mac/Modules/list/listgen.py +++ b/Mac/Modules/list/listgen.py @@ -1,4 +1,4 @@ -# Generated from 'Sap:CodeWarrior7:Metrowerks CodeWarrior:MacOS Support:Headers:Universal Headers:Lists.h' +# Generated from 'flap:CW8 Gold:Metrowerks CodeWarrior:MacOS Support:Headers:Universal Headers:Lists.h' f = Function(ListRef, 'LNew', (Rect_ptr, 'rView', InMode), diff --git a/Mac/Modules/list/listsupport.py b/Mac/Modules/list/listsupport.py index fa1e9c49120..5d0c950176e 100644 --- a/Mac/Modules/list/listsupport.py +++ b/Mac/Modules/list/listsupport.py @@ -26,8 +26,7 @@ VarOutBufferShortsize = VarHeapOutputBufferType('char', 'short', 's') # (buf, &len) InBufferShortsize = VarInputBufferType('char', 'short', 's') # (buf, len) -# For LUpdate, we alsways update the complete visible region. -RgnHandle = FakeType("(*_self->ob_itself)->port->visRgn") +RgnHandle = OpaqueByValueType("RgnHandle", "ResObj") includestuff = includestuff + """ diff --git a/Mac/Modules/menu/Menumodule.c b/Mac/Modules/menu/Menumodule.c index 07e1b8803ea..cdd094ce628 100644 --- a/Mac/Modules/menu/Menumodule.c +++ b/Mac/Modules/menu/Menumodule.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 /* Defines OpenDeskAcc in universal headers */ diff --git a/Mac/Modules/menu/menugen.py b/Mac/Modules/menu/menugen.py index 7e27d5c52c2..b5a60ce3dbe 100644 --- a/Mac/Modules/menu/menugen.py +++ b/Mac/Modules/menu/menugen.py @@ -1,4 +1,4 @@ -# Generated from 'Sap:CodeWarrior7:Metrowerks CodeWarrior:MacOS Support:Headers:Universal Headers:Menus.h' +# Generated from 'flap:CW8 Gold:Metrowerks CodeWarrior:MacOS Support:Headers:Universal Headers:Menus.h' f = Function(short, 'GetMBarHeight', )