Trying again to check it in. Changes to:
- Use Universal Headers as input
- Change addpack calls to not depend on Guido's disklayout
- Checkge testprograms to use new names for some functions
diff --git a/Mac/Modules/qd/qdgen.py b/Mac/Modules/qd/qdgen.py
index 975e438..612b9e7 100644
--- a/Mac/Modules/qd/qdgen.py
+++ b/Mac/Modules/qd/qdgen.py
@@ -1,4 +1,4 @@
-# Generated from 'D:Development:THINK C:Mac #includes:Apple #includes:QuickDraw.h'
+# Generated from 'Moes:CW5 GOLD \304:Metrowerks C/C++ \304:Headers \304:Universal Headers 2.0a3 \304:QuickDraw.h'
f = Function(void, 'OpenPort',
(GrafPtr, 'port', InMode),
@@ -131,65 +131,6 @@
)
functions.append(f)
-f = Function(void, 'TextFont',
- (short, 'font', InMode),
-)
-functions.append(f)
-
-f = Function(void, 'TextFace',
- (short, 'face', InMode),
-)
-functions.append(f)
-
-f = Function(void, 'TextMode',
- (short, 'mode', InMode),
-)
-functions.append(f)
-
-f = Function(void, 'TextSize',
- (short, 'size', InMode),
-)
-functions.append(f)
-
-f = Function(void, 'SpaceExtra',
- (Fixed, 'extra', InMode),
-)
-functions.append(f)
-
-f = Function(void, 'DrawChar',
- (short, 'ch', InMode),
-)
-functions.append(f)
-
-f = Function(void, 'DrawString',
- (ConstStr255Param, 's', InMode),
-)
-functions.append(f)
-
-f = Function(void, 'DrawText',
- (TextThingie, 'textBuf', InMode),
- (short, 'firstByte', InMode),
- (short, 'byteCount', InMode),
-)
-functions.append(f)
-
-f = Function(short, 'CharWidth',
- (short, 'ch', InMode),
-)
-functions.append(f)
-
-f = Function(short, 'StringWidth',
- (ConstStr255Param, 's', InMode),
-)
-functions.append(f)
-
-f = Function(short, 'TextWidth',
- (TextThingie, 'textBuf', InMode),
- (short, 'firstByte', InMode),
- (short, 'byteCount', InMode),
-)
-functions.append(f)
-
f = Function(void, 'ForeColor',
(long, 'color', InMode),
)
@@ -641,6 +582,12 @@
)
functions.append(f)
+f = Function(void, 'SubPt',
+ (Point, 'src', InMode),
+ (Point, 'dst', InOutMode),
+)
+functions.append(f)
+
f = Function(Boolean, 'PtInRgn',
(Point, 'pt', InMode),
(RgnHandle, 'rgn', InMode),
@@ -651,11 +598,6 @@
)
functions.append(f)
-f = Function(void, 'DisposPixMap',
- (PixMapHandle, 'pm', InMode),
-)
-functions.append(f)
-
f = Function(void, 'DisposePixMap',
(PixMapHandle, 'pm', InMode),
)
@@ -671,11 +613,6 @@
)
functions.append(f)
-f = Function(void, 'DisposPixPat',
- (PixPatHandle, 'pp', InMode),
-)
-functions.append(f)
-
f = Function(void, 'DisposePixPat',
(PixPatHandle, 'pp', InMode),
)
@@ -751,21 +688,10 @@
)
functions.append(f)
-f = Function(void, 'CharExtra',
- (Fixed, 'extra', InMode),
-)
-functions.append(f)
-
f = Function(long, 'GetCTSeed',
)
functions.append(f)
-f = Function(void, 'SubPt',
- (Point, 'src', InMode),
- (Point, 'dst', InOutMode),
-)
-functions.append(f)
-
f = Function(void, 'SetClientID',
(short, 'id', InMode),
)
@@ -787,3 +713,69 @@
)
functions.append(f)
+# Generated from 'Moes:CW5 GOLD \304:Metrowerks C/C++ \304:Headers \304:Universal Headers 2.0a3 \304:QuickDrawText.h'
+
+f = Function(void, 'TextFont',
+ (short, 'font', InMode),
+)
+functions.append(f)
+
+f = Function(void, 'TextFace',
+ (short, 'face', InMode),
+)
+functions.append(f)
+
+f = Function(void, 'TextMode',
+ (short, 'mode', InMode),
+)
+functions.append(f)
+
+f = Function(void, 'TextSize',
+ (short, 'size', InMode),
+)
+functions.append(f)
+
+f = Function(void, 'SpaceExtra',
+ (Fixed, 'extra', InMode),
+)
+functions.append(f)
+
+f = Function(void, 'DrawChar',
+ (short, 'ch', InMode),
+)
+functions.append(f)
+
+f = Function(void, 'DrawString',
+ (ConstStr255Param, 's', InMode),
+)
+functions.append(f)
+
+f = Function(void, 'DrawText',
+ (TextThingie, 'textBuf', InMode),
+ (short, 'firstByte', InMode),
+ (short, 'byteCount', InMode),
+)
+functions.append(f)
+
+f = Function(short, 'CharWidth',
+ (short, 'ch', InMode),
+)
+functions.append(f)
+
+f = Function(short, 'StringWidth',
+ (ConstStr255Param, 's', InMode),
+)
+functions.append(f)
+
+f = Function(short, 'TextWidth',
+ (TextThingie, 'textBuf', InMode),
+ (short, 'firstByte', InMode),
+ (short, 'byteCount', InMode),
+)
+functions.append(f)
+
+f = Function(void, 'CharExtra',
+ (Fixed, 'extra', InMode),
+)
+functions.append(f)
+