[Python-checkins] CVS: python/dist/src/Mac/Modules/menu menusupport.py,1.10,1.11

[Jack Jansen]

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

Modified Files:
	menusupport.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: menusupport.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/menu/menusupport.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** menusupport.py	2001/05/17 21:56:22	1.10
--- menusupport.py	2001/05/22 21:53:13	1.11
***************
*** 37,42 ****
  
  includestuff = includestuff + """
  #include <Devices.h> /* Defines OpenDeskAcc in universal headers */
! #include <%s>""" % MACHEADERFILE + """
  
  #ifdef USE_TOOLBOX_OBJECT_GLUE
--- 37,47 ----
  
  includestuff = includestuff + """
+ #ifdef WITHOUT_FRAMEWORKS
  #include <Devices.h> /* Defines OpenDeskAcc in universal headers */
! #include <Menus.h>
! #else
! #include <Carbon/Carbon.h>
! #endif
! 
  
  #ifdef USE_TOOLBOX_OBJECT_GLUE
***************
*** 64,69 ****
  
  initstuff = initstuff + """
! 	PyMac_INIT_TOOLBOX_OBJECT_NEW(MenuObj_New);
! 	PyMac_INIT_TOOLBOX_OBJECT_CONVERT(MenuObj_Convert);
  """
  
--- 69,74 ----
  
  initstuff = initstuff + """
! 	PyMac_INIT_TOOLBOX_OBJECT_NEW(MenuHandle, MenuObj_New);
! 	PyMac_INIT_TOOLBOX_OBJECT_CONVERT(MenuHandle, MenuObj_Convert);
  """