Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit fa77e1a

Browse files
committed
Lots more Carbon/Carbon.h includes, new UPP routine names, function prototypes. Most toolbox modules now compile, link and import in MacOSX-MachO python.
1 parent 1129671 commit fa77e1a

41 files changed

Lines changed: 2230 additions & 5765 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Mac/Modules/ae/AEmodule.c

Lines changed: 59 additions & 153 deletions
Large diffs are not rendered by default.

Mac/Modules/ae/aesupport.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,12 @@ def passInput(self, name):
8282

8383

8484
includestuff = includestuff + """
85+
#ifdef WITHOUT_FRAMEWORKS
8586
#include <AppleEvents.h>
8687
#include <AEObjects.h>
88+
#else
89+
#include <Carbon/Carbon.h>
90+
#endif
8791
8892
#ifdef USE_TOOLBOX_OBJECT_GLUE
8993
extern PyObject *_AEDesc_New(AEDesc *);
@@ -144,10 +148,10 @@ def passInput(self, name):
144148
"""
145149

146150
initstuff = initstuff + """
147-
upp_AEIdleProc = NewAEIdleProc(AEIdleProc);
148-
upp_GenericEventHandler = NewAEEventHandlerProc(GenericEventHandler);
149-
PyMac_INIT_TOOLBOX_OBJECT_NEW(AEDesc_New);
150-
PyMac_INIT_TOOLBOX_OBJECT_CONVERT(AEDesc_Convert);
151+
upp_AEIdleProc = NewAEIdleUPP(AEIdleProc);
152+
upp_GenericEventHandler = NewAEEventHandlerUPP(GenericEventHandler);
153+
PyMac_INIT_TOOLBOX_OBJECT_NEW(AEDesc *, AEDesc_New);
154+
PyMac_INIT_TOOLBOX_OBJECT_CONVERT(AEDesc, AEDesc_Convert);
151155
"""
152156

153157
module = MacModule('AE', 'AE', includestuff, finalstuff, initstuff)

0 commit comments

Comments
 (0)