Replaced various dummy updateRegions by real arguments

diff --git a/Mac/Modules/ctl/Ctlmodule.c b/Mac/Modules/ctl/Ctlmodule.c
index 2669113724f8760c44899efd1582eb10c2028d66..bc690cd9bc48f1d9062d1aa91073f05925362c04 100644 (file)
--- 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 529097cc1d0812f545ebe5cd9cc056bb594ba5d8..451253aada33583ca80dcb795816ac3af998e9c0 100644 (file)
--- 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 a8b45a582063391aa48a52e39af1dbf8a4b68511..c87922a109da0f155b36231b27cb9de52a023c09 100644 (file)
--- 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")
 

diff --git a/Mac/Modules/dlg/Dlgmodule.c b/Mac/Modules/dlg/Dlgmodule.c
index 93de3e950a593ac49be9cd636b0d430a80d49a8f..d09c41aa8bef264f4466c920176f9da4219103da 100644 (file)
--- 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 <Dialogs.h>
@@ -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 3c1e66969dd886815d7e6731532ac647a09c5c9b..b3f08ae29f15c0b5045effdf173fab1b8fcd652b 100644 (file)
--- 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 cd255ef446b79c2e8ca4e28d04c25cedfbd9d895..ca4e0dfd3d02da18724c6dada64f64c37666bc14 100644 (file)
--- a/Mac/Modules/dlg/dlgsupport.py
+++ b/Mac/Modules/dlg/dlgsupport.py
@@ -21,7 +21,7 @@ ModalFilterProcPtr = InputOnlyType("PyObject*", "O")
 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 9078e9f5f97c5c73f89d1080c08d6532db9a78c2..8aa8e7d36d0f08e90da1b4ddcb475742e6c817de 100644 (file)
--- 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 <Events.h>

diff --git a/Mac/Modules/evt/evtgen.py b/Mac/Modules/evt/evtgen.py
index 2eda8ed1e0ed946d12d81ad20b13d902c9b60e2f..29f78d048b6b3930bf94d8fc30ebfb0214c9d978 100644 (file)
--- 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 617eee4f65cbd9d7d54899bb217f5f3cbbdfeaf8..0471a7e00012edac7e0ccb6e1bd5f227a233df76 100644 (file)
--- a/Mac/Modules/evt/evtsupport.py
+++ b/Mac/Modules/evt/evtsupport.py
@@ -24,7 +24,9 @@ from macsupport import *
 
 #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 7d9203f7260988a52e7dd02ea5c4b892d2af769c..9f3f89c5222d40202ba8ea6dd1d7c82c4702078c 100644 (file)
--- 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 17f20b04f0a978f623fc7e9d82550188340929c4..a276ea3247c255c32475ce63f8efb81d67fb0c21 100644 (file)
--- 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 <Lists.h>
@@ -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 9ee6ce68a0a4cb53bbbc37d6aee86ce453c2d774..85e048525c38cd92e43f5a565783f518804193c0 100644 (file)
--- 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 fa1e9c491204f8d7764cddf27c066f2b9dd1e840..5d0c950176ef95d4850c97442e2eb9786babe9c5 100644 (file)
--- a/Mac/Modules/list/listsupport.py
+++ b/Mac/Modules/list/listsupport.py
@@ -26,8 +26,7 @@ Cell = Point
 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 07e1b8803ea433bdba985c92338c115a13af584c..cdd094ce6284da0948c3e20af82a9377e50da3c9 100644 (file)
--- 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 <Devices.h> /* Defines OpenDeskAcc in universal headers */

diff --git a/Mac/Modules/menu/menugen.py b/Mac/Modules/menu/menugen.py
index 7e27d5c52c2078833675f67a21c866275643d5a2..b5a60ce3dbe460e1558fcecde1bf3819e87287b8 100644 (file)
--- 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',
 )