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/ctl/ctlscan.py b/Mac/Modules/ctl/ctlscan.py
index f104e8d..e36db2c 100644
--- a/Mac/Modules/ctl/ctlscan.py
+++ b/Mac/Modules/ctl/ctlscan.py
@@ -1,4 +1,6 @@
# Scan <Controls.h>, generating ctlgen.py.
+import addpack
+addpack.addpack(':Tools:bgen:bgen')
from scantools import Scanner
@@ -20,7 +22,7 @@
listname = "functions"
if arglist:
t, n, m = arglist[0]
- if t == "ControlHandle" and m == "InMode":
+ if t in ("ControlHandle", "ControlRef") and m == "InMode":
classname = "Method"
listname = "methods"
return classname, listname
@@ -35,6 +37,7 @@
def makeblacklisttypes(self):
return [
'ProcPtr',
+ 'ControlActionUPP',
'CCTabHandle',
'AuxCtlHandle',
]
@@ -51,9 +54,13 @@
# For TrackControl
([("ProcPtr", "actionProc", "InMode")],
[("FakeType('(ControlActionUPP)0')", "*", "*")]),
+ ([("ControlActionUPP", "actionProc", "InMode")],
+ [("FakeType('(ControlActionUPP)0')", "*", "*")]),
([("ControlHandle", "*", "OutMode")],
[("ExistingControlHandle", "*", "*")]),
+ ([("ControlRef", "*", "OutMode")], # Ditto, for Universal Headers
+ [("ExistingControlHandle", "*", "*")]),
]
if __name__ == "__main__":