Ported to Universal Header 2.0.1f (i.e. CW6)
diff --git a/Mac/Modules/ctl/ctlgen.py b/Mac/Modules/ctl/ctlgen.py
index 85fc6c7..683e26b 100644
--- a/Mac/Modules/ctl/ctlgen.py
+++ b/Mac/Modules/ctl/ctlgen.py
@@ -1,32 +1,20 @@
-# Generated from 'Moes:CW5 GOLD \304:Metrowerks C/C++ \304:Headers \304:Universal Headers 2.0a3 \304:Controls.h'
+# Generated from 'Moes:CodeWarrior6:Metrowerks C/C++:Headers:Universal Headers 2.0.1f:Controls.h'
f = Function(ControlRef, 'NewControl',
(WindowRef, 'theWindow', InMode),
(Rect_ptr, 'boundsRect', InMode),
(ConstStr255Param, 'title', InMode),
(Boolean, 'visible', InMode),
- (short, 'value', InMode),
- (short, 'min', InMode),
- (short, 'max', InMode),
- (short, 'procID', InMode),
- (long, 'refCon', InMode),
+ (SInt16, 'value', InMode),
+ (SInt16, 'min', InMode),
+ (SInt16, 'max', InMode),
+ (SInt16, 'procID', InMode),
+ (SInt32, 'refCon', InMode),
)
functions.append(f)
-f = Method(void, 'SetControlTitle',
- (ControlRef, 'theControl', InMode),
- (ConstStr255Param, 'title', InMode),
-)
-methods.append(f)
-
-f = Method(void, 'GetControlTitle',
- (ControlRef, 'theControl', InMode),
- (Str255, 'title', InMode),
-)
-methods.append(f)
-
f = Function(ControlRef, 'GetNewControl',
- (short, 'controlID', InMode),
+ (SInt16, 'controlID', InMode),
(WindowRef, 'owner', InMode),
)
functions.append(f)
@@ -41,12 +29,12 @@
)
functions.append(f)
-f = Method(void, 'HideControl',
+f = Method(void, 'ShowControl',
(ControlRef, 'theControl', InMode),
)
methods.append(f)
-f = Method(void, 'ShowControl',
+f = Method(void, 'HideControl',
(ControlRef, 'theControl', InMode),
)
methods.append(f)
@@ -61,72 +49,107 @@
)
methods.append(f)
-f = Method(void, 'HiliteControl',
- (ControlRef, 'theControl', InMode),
- (short, 'hiliteState', InMode),
-)
-methods.append(f)
-
f = Function(void, 'UpdateControls',
(WindowRef, 'theWindow', InMode),
(RgnHandle, 'updateRgn', InMode),
)
functions.append(f)
+f = Method(void, 'HiliteControl',
+ (ControlRef, 'theControl', InMode),
+ (ControlPartCode, 'hiliteState', InMode),
+)
+methods.append(f)
+
+f = Method(ControlPartCode, 'TrackControl',
+ (ControlRef, 'theControl', InMode),
+ (Point, 'thePoint', InMode),
+ (FakeType('(ControlActionUPP)0'), 'actionProc', InMode),
+)
+methods.append(f)
+
+f = Method(void, 'DragControl',
+ (ControlRef, 'theControl', InMode),
+ (Point, 'startPt', InMode),
+ (Rect_ptr, 'limitRect', InMode),
+ (Rect_ptr, 'slopRect', InMode),
+ (DragConstraint, 'axis', InMode),
+)
+methods.append(f)
+
+f = Method(ControlPartCode, 'TestControl',
+ (ControlRef, 'theControl', InMode),
+ (Point, 'thePt', InMode),
+)
+methods.append(f)
+
+f = Function(ControlPartCode, 'FindControl',
+ (Point, 'thePoint', InMode),
+ (WindowRef, 'theWindow', InMode),
+ (ExistingControlHandle, 'theControl', OutMode),
+)
+functions.append(f)
+
f = Method(void, 'MoveControl',
(ControlRef, 'theControl', InMode),
- (short, 'h', InMode),
- (short, 'v', InMode),
+ (SInt16, 'h', InMode),
+ (SInt16, 'v', InMode),
)
methods.append(f)
f = Method(void, 'SizeControl',
(ControlRef, 'theControl', InMode),
- (short, 'w', InMode),
- (short, 'h', InMode),
+ (SInt16, 'w', InMode),
+ (SInt16, 'h', InMode),
+)
+methods.append(f)
+
+f = Method(void, 'SetControlTitle',
+ (ControlRef, 'theControl', InMode),
+ (ConstStr255Param, 'title', InMode),
+)
+methods.append(f)
+
+f = Method(void, 'GetControlTitle',
+ (ControlRef, 'theControl', InMode),
+ (Str255, 'title', InMode),
+)
+methods.append(f)
+
+f = Method(SInt16, 'GetControlValue',
+ (ControlRef, 'theControl', InMode),
)
methods.append(f)
f = Method(void, 'SetControlValue',
(ControlRef, 'theControl', InMode),
- (short, 'theValue', InMode),
+ (SInt16, 'newValue', InMode),
)
methods.append(f)
-f = Method(short, 'GetControlValue',
+f = Method(SInt16, 'GetControlMinimum',
(ControlRef, 'theControl', InMode),
)
methods.append(f)
f = Method(void, 'SetControlMinimum',
(ControlRef, 'theControl', InMode),
- (short, 'minValue', InMode),
+ (SInt16, 'newMinimum', InMode),
)
methods.append(f)
-f = Method(short, 'GetControlMinimum',
+f = Method(SInt16, 'GetControlMaximum',
(ControlRef, 'theControl', InMode),
)
methods.append(f)
f = Method(void, 'SetControlMaximum',
(ControlRef, 'theControl', InMode),
- (short, 'maxValue', InMode),
+ (SInt16, 'newMaximum', InMode),
)
methods.append(f)
-f = Method(short, 'GetControlMaximum',
- (ControlRef, 'theControl', InMode),
-)
-methods.append(f)
-
-f = Method(void, 'SetControlReference',
- (ControlRef, 'theControl', InMode),
- (long, 'data', InMode),
-)
-methods.append(f)
-
-f = Method(long, 'GetControlReference',
+f = Method(SInt16, 'GetControlVariant',
(ControlRef, 'theControl', InMode),
)
methods.append(f)
@@ -137,37 +160,14 @@
)
methods.append(f)
-f = Method(void, 'DragControl',
+f = Method(void, 'SetControlReference',
(ControlRef, 'theControl', InMode),
- (Point, 'startPt', InMode),
- (Rect_ptr, 'limitRect', InMode),
- (Rect_ptr, 'slopRect', InMode),
- (short, 'axis', InMode),
+ (SInt32, 'data', InMode),
)
methods.append(f)
-f = Method(short, 'TestControl',
+f = Method(SInt32, 'GetControlReference',
(ControlRef, 'theControl', InMode),
- (Point, 'thePt', InMode),
-)
-methods.append(f)
-
-f = Function(short, 'FindControl',
- (Point, 'thePoint', InMode),
- (WindowRef, 'theWindow', InMode),
- (ExistingControlHandle, 'theControl', OutMode),
-)
-functions.append(f)
-
-f = Method(short, 'GetControlVariant',
- (ControlRef, 'theControl', InMode),
-)
-methods.append(f)
-
-f = Method(short, 'TrackControl',
- (ControlRef, 'theControl', InMode),
- (Point, 'thePoint', InMode),
- (FakeType('(ControlActionUPP)0'), 'actionProc', InMode),
)
methods.append(f)