[Python-checkins] CVS: python/dist/src/Mac/Modules/qt _Qtmodule.c,1.6,1.7

Jack Jansen jackjansen@users.sourceforge.net
Sun, 24 Mar 2002 15:02:40 -0800


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

Modified Files:
	_Qtmodule.c 
Log Message:
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.7
diff -C2 -d -r1.6 -r1.7
*** _Qtmodule.c	18 Dec 2001 15:36:46 -0000	1.6
--- _Qtmodule.c	24 Mar 2002 23:02:37 -0000	1.7
***************
*** 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))