diff options
author | Jack Jansen <jack.jansen@cwi.nl> | 1997-08-27 14:09:25 (GMT) |
---|---|---|
committer | Jack Jansen <jack.jansen@cwi.nl> | 1997-08-27 14:09:25 (GMT) |
commit | 8505ef8c6caa179314936132f075380bf6eb08c4 (patch) | |
tree | c82ae3a5f194e9a648f5ef8084b455d2caaad686 /Mac/Modules/waste | |
parent | 3412c5d0fb44f2186ff244aa6d504b1ec0b5dda7 (diff) | |
download | cpython-8505ef8c6caa179314936132f075380bf6eb08c4.zip cpython-8505ef8c6caa179314936132f075380bf6eb08c4.tar.gz cpython-8505ef8c6caa179314936132f075380bf6eb08c4.tar.bz2 |
Added #include <WETabs.h>, which had somehow gone missing
Diffstat (limited to 'Mac/Modules/waste')
-rw-r--r-- | Mac/Modules/waste/wastemodule.c | 6 | ||||
-rw-r--r-- | Mac/Modules/waste/wastescan.py | 8 | ||||
-rw-r--r-- | Mac/Modules/waste/wastesupport.py | 10 |
3 files changed, 20 insertions, 4 deletions
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 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 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 @@ 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 14f9a14..ef73288 100644 --- 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); |