Added #include <WETabs.h>, which had somehow gone missing

diff --git a/Mac/Modules/waste/wastemodule.c b/Mac/Modules/waste/wastemodule.c
index 7f74ff6a3cfe21891d62c4dd65790bef962de859..a832957153ef8fb27aa5ddbb60edb6ed62bac984 100644 (file)
--- a/Mac/Modules/waste/wastemodule.c
+++ b/Mac/Modules/waste/wastemodule.c
@@ -43,13 +43,17 @@ extern int BMObj_Convert(PyObject *, BitMapPtr *);
 extern PyObject *WinObj_WhichWindow(WindowPtr);
 
 #include <WASTE.h>
-#include <WEObjectHandlers.h>
 #include <WETabs.h>
+#include <WEObjectHandlers.h>
 
 /* Exported by Qdmodule.c: */
 extern PyObject *QdRGB_New(RGBColor *);
 extern int QdRGB_Convert(PyObject *, RGBColor *);
 
+/* Exported by AEModule.c: */
+extern PyObject *AEDesc_New(AppleEvent *);
+extern int AEDesc_Convert(PyObject *, AppleEvent *);
+
 /* Forward declaration */
 staticforward PyObject *WEOObj_New(WEObjectReference);
 staticforward PyObject *ExistingwasteObj_New(WEReference);

diff --git a/Mac/Modules/waste/wastescan.py b/Mac/Modules/waste/wastescan.py
index add9364fe55752093d9dc8b1b8dfdb939cef781d..eb666d07bf5f91755410a60e1eb6767ee4e02e2c 100644 (file)
--- a/Mac/Modules/waste/wastescan.py
+++ b/Mac/Modules/waste/wastescan.py
@@ -3,9 +3,9 @@
 import addpack
 addpack.addpack(':tools:bgen:bgen')
 from scantools import Scanner
-from bgenlocations import TOOLBOXDIR
+from bgenlocations import MWERKSDIR, TOOLBOXDIR
 
-WASTEDIR=":::::Waste 1.2 distribution:"
+WASTEDIR=":::::Waste 1.2 Distribution:WASTE C/C++ Headers:"
 
 OBJECT = "TEHandle"
 SHORT = "waste"
@@ -13,7 +13,7 @@ OBJECT = "WEReference"
 OBJECT2 = "WEObjectReference"
 
 def main():
-       input = WASTEDIR + "WASTE C/C++ Headers:WASTE.h"
+       input = WASTEDIR + "WASTE.h"
        output = SHORT + "gen.py"
        defsoutput = TOOLBOXDIR + "WASTEconst.py"
        scanner = MyScanner(input, output, defsoutput)
@@ -54,6 +54,8 @@ class MyScanner(Scanner):
                return [
                        "DragReference",        # For now...
                        "UniversalProcPtr",
+                       "WEFontIDToNameUPP",
+                       "WEFontNameToIDUPP",
                        ]
 
        def makerepairinstructions(self):

diff --git a/Mac/Modules/waste/wastesupport.py b/Mac/Modules/waste/wastesupport.py
index 14f9a14496e8419bc01dffc880aa733dbf7a317f..ef73288353e0e77484e7c230b315da8b3637fac4 100644 (file)
--- a/Mac/Modules/waste/wastesupport.py
+++ b/Mac/Modules/waste/wastesupport.py
@@ -39,9 +39,15 @@ WEStyleMode = Type("WEStyleMode", "h")
 WEActionKind = Type("WEActionKind", "h")
 WEAlignment = Type("WEAlignment", "b")
 WEEdge = Type("WEEdge", "b")
+WEDirection = Type("WEDirection", "h")
 WESoupHandle = OpaqueByValueType("WESoupHandle", "ResObj")
+WEFontTableHandle = OpaqueByValueType("WEFontTableHandle", "ResObj")
+WEFontTableHandle
 WERunInfo = OpaqueType("WERunInfo", "RunInfo")
 
+AppleEvent = OpaqueType('AppleEvent', 'AEDesc')
+AppleEvent_ptr = OpaqueType('AppleEvent', 'AEDesc')
+
 TextStyle = OpaqueType("TextStyle", "TextStyle")
 TextStyle_ptr = TextStyle
 LongPt = OpaqueType("LongPt", "LongPt")
@@ -58,6 +64,10 @@ includestuff = includestuff + """
 extern PyObject *QdRGB_New(RGBColor *);
 extern int QdRGB_Convert(PyObject *, RGBColor *);
 
+/* Exported by AEModule.c: */
+extern PyObject *AEDesc_New(AppleEvent *);
+extern int AEDesc_Convert(PyObject *, AppleEvent *);
+
 /* Forward declaration */
 staticforward PyObject *WEOObj_New(WEObjectReference);
 staticforward PyObject *ExistingwasteObj_New(WEReference);