Lots more Carbon/Carbon.h includes, new UPP routine names, function p…

…rototypes. Most toolbox modules now compile, link and import in MacOSX-MachO python.
skrah · May 22, 2001 · fa77e1a · fa77e1a
1 parent 1129671
commit fa77e1a
Show file tree

Hide file tree

Showing 41 changed files with 2,230 additions and 5,765 deletions.
diff --git a/Mac/Modules/ae/AEmodule.c b/Mac/Modules/ae/AEmodule.c
diff --git a/Mac/Modules/ae/aesupport.py b/Mac/Modules/ae/aesupport.py
@@ -82,8 +82,12 @@ def passInput(self, name):
 
 
 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 @@ def passInput(self, name):
 """
 
 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)