[Python-checkins] CVS: python/dist/src/Mac/Modules/menu _Menumodule.c,1.3,1.4 menusupport.py,1.12,1.13

[Jack Jansen]

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

Modified Files:
	_Menumodule.c menusupport.py 
Log Message:
Merged changes made on r22b2-branch between r22b2 and r22b2-mac (the
changes from start of branch upto r22b2 were already merged, of course).


Index: _Menumodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/menu/_Menumodule.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** _Menumodule.c	2001/09/05 10:29:57	1.3
--- _Menumodule.c	2001/11/30 14:16:33	1.4
***************
*** 6,15 ****
  
  
- #ifdef _WIN32
- #include "pywintoolbox.h"
- #else
  #include "macglue.h"
  #include "pymactoolbox.h"
- #endif
  
  /* Macro to test whether a weak-loaded CFM function exists */
[...1244 lines suppressed...]
***************
*** 2416,2419 ****
--- 2781,2787 ----
  	PyObject *_res = NULL;
  	short menuID;
+ #ifndef DeleteMenu
+ 	PyMac_PRECHECK(DeleteMenu);
+ #endif
  	if (!PyArg_ParseTuple(_args, "h",
  	                      &menuID))
***************
*** 2428,2431 ****
--- 2796,2802 ----
  {
  	PyObject *_res = NULL;
+ #ifndef DrawMenuBar
+ 	PyMac_PRECHECK(DrawMenuBar);
+ #endif
  	if (!PyArg_ParseTuple(_args, ""))
  		return NULL;

Index: menusupport.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/menu/menusupport.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** menusupport.py	2001/08/23 13:50:01	1.12
--- menusupport.py	2001/11/30 14:16:33	1.13
***************
*** 82,87 ****
  
  # Create the generator classes used to populate the lists
! Function = OSErrFunctionGenerator
! Method = OSErrMethodGenerator
  
  # Create and populate the lists
--- 82,87 ----
  
  # Create the generator classes used to populate the lists
! Function = OSErrWeakLinkFunctionGenerator
! Method = OSErrWeakLinkMethodGenerator
  
  # Create and populate the lists