Regenerated because of minor changes in universal headers

diff --git a/Mac/Lib/toolbox/Controls.py b/Mac/Lib/toolbox/Controls.py
index f874df8446c62ca8fcffaa3049c625d0d015e6d5..b309710efbb5dee756de6fbe62d55c60be59e8a8 100644 (file)
--- a/Mac/Lib/toolbox/Controls.py
+++ b/Mac/Lib/toolbox/Controls.py
@@ -1,4 +1,4 @@
-# Generated from 'Sap:CodeWarrior6:Metrowerks C/C++:Headers:Universal Headers 2.0.1f:Controls.h'
+# Generated from 'Sap:CodeWarrior7:Metrowerks CodeWarrior:MacOS Support:Headers:Universal Headers:Controls.h'
 
 pushButProc = 0
 checkBoxProc = 1
@@ -6,7 +6,6 @@ radioButProc = 2
 scrollBarProc = 16
 popupMenuProc = 1008
 kControlUsesOwningWindowsFontVariant = 1 << 3
-useWFont = 8
 kControlNoPart = 0
 kControlLabelPart = 1
 kControlMenuPart = 2
@@ -21,16 +20,6 @@ kControlPageDownPart = 23
 kControlIndicatorPart = 129
 kControlDisabledPart = 254
 kControlInactivePart = 255
-inLabel = 1
-inMenu = 2
-inTriangle = 4
-inButton = 10
-inCheckBox = 11
-inUpButton = 20
-inDownButton = 21
-inPageUp = 22
-inPageDown = 23
-inThumb = 129
 kControlCheckboxUncheckedValue = 0
 kControlCheckboxCheckedValue = 1
 kControlCheckboxMixedValue = 2
@@ -73,6 +62,18 @@ drawThumbOutline = 12
 kDrawControlEntireControl = 0
 kDrawControlIndicatorOnly = 129
 kDragControlEntireControl = 0
+kDragControlIndicator = 1
+useWFont = 8
+inLabel = 1
+inMenu = 2
+inTriangle = 4
+inButton = 10
+inCheckBox = 11
+inUpButton = 20
+inDownButton = 21
+inPageUp = 22
+inPageDown = 23
+inThumb = 129
 kNoHiliteControlPart = 0
 kInLabelControlPart = 1
 kInMenuControlPart = 2

diff --git a/Mac/Modules/ctl/Ctlmodule.c b/Mac/Modules/ctl/Ctlmodule.c
index c89d461802aa81211e07dee8717ccea673e2e58d..3ea6b91a229af3e08b82a8995f4660dc72ae57ba 100644 (file)
--- a/Mac/Modules/ctl/Ctlmodule.c
+++ b/Mac/Modules/ctl/Ctlmodule.c
@@ -178,18 +178,18 @@ static PyObject *CtlObj_DragControl(_self, _args)
        PyObject *_args;
 {
        PyObject *_res = NULL;
-       Point startPt;
+       Point startPoint;
        Rect limitRect;
        Rect slopRect;
        DragConstraint axis;
        if (!PyArg_ParseTuple(_args, "O&O&O&h",
-                             PyMac_GetPoint, &startPt,
+                             PyMac_GetPoint, &startPoint,
                              PyMac_GetRect, &limitRect,
                              PyMac_GetRect, &slopRect,
                              &axis))
                return NULL;
        DragControl(_self->ob_itself,
-                   startPt,
+                   startPoint,
                    &limitRect,
                    &slopRect,
                    axis);
@@ -204,12 +204,12 @@ static PyObject *CtlObj_TestControl(_self, _args)
 {
        PyObject *_res = NULL;
        ControlPartCode _rv;
-       Point thePt;
+       Point thePoint;
        if (!PyArg_ParseTuple(_args, "O&",
-                             PyMac_GetPoint, &thePt))
+                             PyMac_GetPoint, &thePoint))
                return NULL;
        _rv = TestControl(_self->ob_itself,
-                         thePt);
+                         thePoint);
        _res = Py_BuildValue("h",
                             _rv);
        return _res;
@@ -457,9 +457,9 @@ static PyMethodDef CtlObj_methods[] = {
        {"TrackControl", (PyCFunction)CtlObj_TrackControl, 1,
         "(Point thePoint) -> (ControlPartCode _rv)"},
        {"DragControl", (PyCFunction)CtlObj_DragControl, 1,
-        "(Point startPt, Rect limitRect, Rect slopRect, DragConstraint axis) -> None"},
+        "(Point startPoint, Rect limitRect, Rect slopRect, DragConstraint axis) -> None"},
        {"TestControl", (PyCFunction)CtlObj_TestControl, 1,
-        "(Point thePt) -> (ControlPartCode _rv)"},
+        "(Point thePoint) -> (ControlPartCode _rv)"},
        {"MoveControl", (PyCFunction)CtlObj_MoveControl, 1,
         "(SInt16 h, SInt16 v) -> None"},
        {"SizeControl", (PyCFunction)CtlObj_SizeControl, 1,

diff --git a/Mac/Modules/ctl/ctlgen.py b/Mac/Modules/ctl/ctlgen.py
index 9873ca4fb846f99333a811712440705130086ee8..529097cc1d0812f545ebe5cd9cc056bb594ba5d8 100644 (file)
--- a/Mac/Modules/ctl/ctlgen.py
+++ b/Mac/Modules/ctl/ctlgen.py
@@ -1,4 +1,4 @@
-# Generated from 'Sap:CodeWarrior6:Metrowerks C/C++:Headers:Universal Headers 2.0.1f:Controls.h'
+# Generated from 'Sap:CodeWarrior7:Metrowerks CodeWarrior:MacOS Support:Headers:Universal Headers:Controls.h'
 
 f = Function(ControlRef, 'NewControl',
     (WindowRef, 'theWindow', InMode),
@@ -51,7 +51,7 @@ methods.append(f)
 
 f = Function(void, 'UpdateControls',
     (WindowRef, 'theWindow', InMode),
-    (RgnHandle, 'updateRgn', InMode),
+    (RgnHandle, 'updateRegion', InMode),
 )
 functions.append(f)
 
@@ -70,7 +70,7 @@ methods.append(f)
 
 f = Method(void, 'DragControl',
     (ControlRef, 'theControl', InMode),
-    (Point, 'startPt', InMode),
+    (Point, 'startPoint', InMode),
     (Rect_ptr, 'limitRect', InMode),
     (Rect_ptr, 'slopRect', InMode),
     (DragConstraint, 'axis', InMode),
@@ -79,7 +79,7 @@ methods.append(f)
 
 f = Method(ControlPartCode, 'TestControl',
     (ControlRef, 'theControl', InMode),
-    (Point, 'thePt', InMode),
+    (Point, 'thePoint', InMode),
 )
 methods.append(f)