[Python-checkins] CVS: python/dist/src/Mac/Modules/qt _Qtmodule.c,1.6,1.6.4.1 qtsupport.py,1.18,1.18.14.1

[Jack Jansen]

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

Modified Files:
      Tag: release22-maint
	_Qtmodule.c qtsupport.py 
Log Message:
Backport of _Qtmocule.c 1.7, qtsupport.py 1.19:
Weaklink most toolbox modules, improving backward compatibility. Modules will no longer fail to load if a single routine is missing on the curent OS version, in stead calling the missing routine will raise an exception.

Should finally fix 531398. 2.2.1 candidate.

Also blacklisted some constants with definitions that were not Python-compatible.



Index: _Qtmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/qt/_Qtmodule.c,v
retrieving revision 1.6
retrieving revision 1.6.4.1
diff -C2 -d -r1.6 -r1.6.4.1
*** _Qtmodule.c	18 Dec 2001 15:36:46 -0000	1.6
--- _Qtmodule.c	25 Mar 2002 10:38:57 -0000	1.6.4.1
***************
*** 141,144 ****
--- 141,147 ----
  	WindowPtr movieWindow;
  	Point where;
+ #ifndef MCSetMovie
+ 	PyMac_PRECHECK(MCSetMovie);
+ #endif
  	if (!PyArg_ParseTuple(_args, "O&O&O&",
  	                      MovieObj_Convert, &theMovie,
***************
*** 160,163 ****
[...4018 lines suppressed...]
***************
*** 8368,8371 ****
--- 9577,9583 ----
  	Point startPt;
  	Rect boundsRect;
+ #ifndef DragAlignedWindow
+ 	PyMac_PRECHECK(DragAlignedWindow);
+ #endif
  	if (!PyArg_ParseTuple(_args, "O&O&O&",
  	                      WinObj_Convert, &wp,
***************
*** 8387,8390 ****
--- 9599,9605 ----
  	PyObject *_res = NULL;
  	long maxMilliSecToUse;
+ #ifndef MoviesTask
+ 	PyMac_PRECHECK(MoviesTask);
+ #endif
  	if (!PyArg_ParseTuple(_args, "l",
  	                      &maxMilliSecToUse))

Index: qtsupport.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/qt/qtsupport.py,v
retrieving revision 1.18
retrieving revision 1.18.14.1
diff -C2 -d -r1.18 -r1.18.14.1
*** qtsupport.py	23 Aug 2001 13:50:27 -0000	1.18
--- qtsupport.py	25 Mar 2002 10:38:57 -0000	1.18.14.1
***************
*** 255,260 ****
  
  # Create the generator classes used to populate the lists
! Function = OSErrFunctionGenerator
! Method = OSErrMethodGenerator
  
  # Create and populate the lists
--- 255,260 ----
  
  # Create the generator classes used to populate the lists
! Function = OSErrWeakLinkFunctionGenerator
! Method = OSErrWeakLinkMethodGenerator
  
  # Create and populate the lists