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/qdscan.py b/Mac/Modules/qd/qdscan.py
index 057db6d..48766f2 100644
--- a/Mac/Modules/qd/qdscan.py
+++ b/Mac/Modules/qd/qdscan.py
@@ -1,7 +1,7 @@
# Scan an Apple header file, generating a Python file of generator calls.
import addpack
-addpack.addpack('D:python:Tools:bgen:bgen')
+addpack.addpack(':Tools:bgen:bgen')
from scantools import Scanner
@@ -12,6 +12,32 @@
scanner = MyScanner(input, output, defsoutput)
scanner.scan()
scanner.close()
+
+ # Grmpf. Universal Headers have Text-stuff in a different include file...
+ input = "QuickDrawText.h"
+ output = "@qdgentext.py"
+ defsoutput = "@QuickDrawText.py"
+ have_extra = 0
+ try:
+ scanner = MyScanner(input, output, defsoutput)
+ scanner.scan()
+ scanner.close()
+ have_extra = 1
+ except IOError:
+ pass
+ if have_extra:
+ print "=== Copying QuickDrawText stuff into main files... ==="
+ ifp = open("@qdgentext.py")
+ ofp = open("qdgen.py", "a")
+ ofp.write(ifp.read())
+ ifp.close()
+ ofp.close()
+ ifp = open("@QuickDrawText.py")
+ ofp = open("QuickDraw.py", "a")
+ ofp.write(ifp.read())
+ ifp.close()
+ ofp.close()
+
print "=== Done scanning and generating, now importing the generated code... ==="
import qdsupport
print "=== Done. It's up to you to compile it now! ==="
@@ -23,7 +49,7 @@
listname = "functions"
if arglist:
t, n, m = arglist[0]
- if t in ("WindowPtr", "WindowPeek") and m == "InMode":
+ if t in ("WindowPtr", "WindowPeek", "WindowRef") and m == "InMode":
classname = "Method"
listname = "methods"
return classname, listname
@@ -48,7 +74,9 @@
'CSpecArray',
'CTabHandle',
'ColorComplementProcPtr',
+ 'ColorComplementUPP',
'ColorSearchProcPtr',
+ 'ColorSearchUPP',
'ConstPatternParam',
'Cursor_ptr',
'DeviceLoopDrawingProcPtr',