[Python-checkins] CVS: python/dist/src/Mac/Modules/menu Menumodule.c,1.26,1.27

[Jack Jansen]

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

Modified Files:
	Menumodule.c 
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: Menumodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/menu/Menumodule.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** Menumodule.c	2001/05/17 21:56:18	1.26
--- Menumodule.c	2001/05/22 21:53:08	1.27
***************
*** 9,14 ****
--- 9,19 ----
  #include "pymactoolbox.h"
  
+ #ifdef WITHOUT_FRAMEWORKS
  #include <Devices.h> /* Defines OpenDeskAcc in universal headers */
  #include <Menus.h>
+ #else
+ #include <Carbon/Carbon.h>
+ #endif
+ 
[...1943 lines suppressed...]
  
  
! void initMenu(void)
  {
  	PyObject *m;
***************
*** 2790,2795 ****
  
  
! 		PyMac_INIT_TOOLBOX_OBJECT_NEW(MenuObj_New);
! 		PyMac_INIT_TOOLBOX_OBJECT_CONVERT(MenuObj_Convert);
  
  
--- 2539,2544 ----
  
  
! 		PyMac_INIT_TOOLBOX_OBJECT_NEW(MenuHandle, MenuObj_New);
! 		PyMac_INIT_TOOLBOX_OBJECT_CONVERT(MenuHandle, MenuObj_Convert);