[Python-checkins] CVS: python/dist/src/Mac/Modules/ctl _Ctlmodule.c,1.3,1.4 ctlsupport.py,1.42,1.43

[Jack Jansen]

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

Modified Files:
	_Ctlmodule.c ctlsupport.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: _Ctlmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/ctl/_Ctlmodule.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** _Ctlmodule.c	2001/09/05 10:30:48	1.3
--- _Ctlmodule.c	2001/11/30 14:16:32	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 */
[...1014 lines suppressed...]
***************
*** 2412,2415 ****
--- 2708,2714 ----
  	WindowPtr theWindow;
  	Boolean tracks;
+ #ifndef IsAutomaticControlDragTrackingEnabledForWindow
+ 	PyMac_PRECHECK(IsAutomaticControlDragTrackingEnabledForWindow);
+ #endif
  	if (!PyArg_ParseTuple(_args, "O&",
  	                      WinObj_Convert, &theWindow))
***************
*** 2429,2432 ****
--- 2728,2734 ----
  	ControlHandle _rv;
  	Handle h;
+ #ifndef as_Control
+ 	PyMac_PRECHECK(as_Control);
+ #endif
  	if (!PyArg_ParseTuple(_args, "O&",
  	                      ResObj_Convert, &h))

Index: ctlsupport.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/ctl/ctlsupport.py,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** ctlsupport.py	2001/09/05 10:31:42	1.42
--- ctlsupport.py	2001/11/30 14:16:32	1.43
***************
*** 337,342 ****
  
  # Create the generator classes used to populate the lists
! Function = OSErrFunctionGenerator
! Method = OSErrMethodGenerator
  
  # Create and populate the lists
--- 337,342 ----
  
  # Create the generator classes used to populate the lists
! Function = OSErrWeakLinkFunctionGenerator
! Method = OSErrWeakLinkMethodGenerator
  
  # Create and populate the lists