Added #include <WETabs.h>, which had somehow gone missing
diff --git a/Mac/Modules/waste/wastemodule.c b/Mac/Modules/waste/wastemodule.c
index 7f74ff6..a832957 100644
--- a/Mac/Modules/waste/wastemodule.c
+++ b/Mac/Modules/waste/wastemodule.c
@@ -43,13 +43,17 @@
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 add9364..eb666d0 100644
--- 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 @@
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 @@
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 14f9a14..ef73288 100644
--- a/Mac/Modules/waste/wastesupport.py
+++ b/Mac/Modules/waste/wastesupport.py
@@ -39,9 +39,15 @@
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 @@
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);