[Python-checkins] CVS: python/dist/src/Mac/Modules/win _Winmodule.c,1.4,1.5 winsupport.py,1.28,1.29

[Jack Jansen]

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

Modified Files:
	_Winmodule.c winsupport.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: _Winmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/win/_Winmodule.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** _Winmodule.c	2001/11/05 16:16:22	1.4
--- _Winmodule.c	2001/11/30 14:16:34	1.5
***************
*** 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 */
[...1397 lines suppressed...]
***************
*** 2633,2636 ****
--- 3040,3046 ----
  	WindowPtr _rv;
  	CGrafPtr port;
+ #ifndef GetWindowFromPort
+ 	PyMac_PRECHECK(GetWindowFromPort);
+ #endif
  	if (!PyArg_ParseTuple(_args, "O&",
  	                      GrafObj_Convert, &port))
***************
*** 2661,2664 ****
--- 3071,3077 ----
  	Point thePoint;
  	WindowPtr theWindow;
+ #ifndef FindWindow
+ 	PyMac_PRECHECK(FindWindow);
+ #endif
  	if (!PyArg_ParseTuple(_args, "O&",
  	                      PyMac_GetPoint, &thePoint))

Index: winsupport.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/win/winsupport.py,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** winsupport.py	2001/11/05 16:16:15	1.28
--- winsupport.py	2001/11/30 14:16:34	1.29
***************
*** 196,201 ****
  
  # Create the generator classes used to populate the lists
! Function = OSErrFunctionGenerator
! Method = OSErrMethodGenerator
  
  # Create and populate the lists
--- 196,201 ----
  
  # Create the generator classes used to populate the lists
! Function = OSErrWeakLinkFunctionGenerator
! Method = OSErrWeakLinkMethodGenerator
  
  # Create and populate the lists