diff options
| author | Jack Jansen <jack.jansen@cwi.nl> | 2001-05-22 21:56:42 (GMT) |
|---|---|---|
| committer | Jack Jansen <jack.jansen@cwi.nl> | 2001-05-22 21:56:42 (GMT) |
| commit | fa77e1a1b1ec479600a0f3a1dbc3faf28140d31f (patch) | |
| tree | 405f4572ec550f86d0c2c2b3a84ca672f3a70520 /Mac/Modules/ae/aesupport.py | |
| parent | 1129671350048d9f415d3ba3c411b9bcd8b7ae75 (diff) | |
| download | cpython-fa77e1a1b1ec479600a0f3a1dbc3faf28140d31f.zip cpython-fa77e1a1b1ec479600a0f3a1dbc3faf28140d31f.tar.gz cpython-fa77e1a1b1ec479600a0f3a1dbc3faf28140d31f.tar.bz2 | |
Lots more Carbon/Carbon.h includes, new UPP routine names, function prototypes. Most toolbox modules now compile, link and import in MacOSX-MachO python.
Diffstat (limited to 'Mac/Modules/ae/aesupport.py')
| -rw-r--r-- | Mac/Modules/ae/aesupport.py | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/Mac/Modules/ae/aesupport.py b/Mac/Modules/ae/aesupport.py index 094a309..321a210 100644 --- a/Mac/Modules/ae/aesupport.py +++ b/Mac/Modules/ae/aesupport.py @@ -82,8 +82,12 @@ AEMethod = OSErrMethodGenerator includestuff = includestuff + """ +#ifdef WITHOUT_FRAMEWORKS #include <AppleEvents.h> #include <AEObjects.h> +#else +#include <Carbon/Carbon.h> +#endif #ifdef USE_TOOLBOX_OBJECT_GLUE extern PyObject *_AEDesc_New(AEDesc *); @@ -144,10 +148,10 @@ GenericEventHandler(const AppleEvent *request, AppleEvent *reply, unsigned long """ initstuff = initstuff + """ - upp_AEIdleProc = NewAEIdleProc(AEIdleProc); - upp_GenericEventHandler = NewAEEventHandlerProc(GenericEventHandler); - PyMac_INIT_TOOLBOX_OBJECT_NEW(AEDesc_New); - PyMac_INIT_TOOLBOX_OBJECT_CONVERT(AEDesc_Convert); + upp_AEIdleProc = NewAEIdleUPP(AEIdleProc); + upp_GenericEventHandler = NewAEEventHandlerUPP(GenericEventHandler); + PyMac_INIT_TOOLBOX_OBJECT_NEW(AEDesc *, AEDesc_New); + PyMac_INIT_TOOLBOX_OBJECT_CONVERT(AEDesc, AEDesc_Convert); """ module = MacModule('AE', 'AE', includestuff, finalstuff, initstuff) |