[Python-checkins] CVS: python/dist/src/Mac/Modules/ae aesupport.py,1.19,1.20

[Jack Jansen]

Update of /cvsroot/python/python/dist/src/Mac/Modules/ae
In directory usw-pr-cvs1:/tmp/cvs-serv13684/Python/Mac/Modules/ae

Modified Files:
	aesupport.py 
Log Message:
Lots more Carbon/Carbon.h includes, new UPP routine names, function prototypes. Most toolbox modules now compile, link and import in MacOSX-MachO python.

Index: aesupport.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/ae/aesupport.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** aesupport.py	2001/05/17 21:54:18	1.19
--- aesupport.py	2001/05/22 21:51:00	1.20
***************
*** 83,88 ****
--- 83,92 ----
  
  includestuff = includestuff + """
+ #ifdef WITHOUT_FRAMEWORKS
  #include <AppleEvents.h>
  #include <AEObjects.h>
+ #else
+ #include <Carbon/Carbon.h>
+ #endif
  
  #ifdef USE_TOOLBOX_OBJECT_GLUE
***************
*** 145,152 ****
  
  initstuff = initstuff + """
! 	upp_AEIdleProc = NewAEIdleProc(AEIdleProc);
! 	upp_GenericEventHandler = NewAEEventHandlerProc(GenericEventHandler);
! 	PyMac_INIT_TOOLBOX_OBJECT_NEW(AEDesc_New);
! 	PyMac_INIT_TOOLBOX_OBJECT_CONVERT(AEDesc_Convert);
  """
  
--- 149,156 ----
  
  initstuff = initstuff + """
! 	upp_AEIdleProc = NewAEIdleUPP(AEIdleProc);
! 	upp_GenericEventHandler = NewAEEventHandlerUPP(GenericEventHandler);
! 	PyMac_INIT_TOOLBOX_OBJECT_NEW(AEDesc *, AEDesc_New);
! 	PyMac_INIT_TOOLBOX_OBJECT_CONVERT(AEDesc, AEDesc_Convert);
  """