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

[Jack Jansen]

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

Modified Files:
	_Qtmodule.c 
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: _Qtmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/qt/_Qtmodule.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** _Qtmodule.c	2001/09/05 10:29:38	1.3
--- _Qtmodule.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 */
--- 6,11 ----
***************
*** 935,939 ****
  
  PyTypeObject MovieController_Type = {
! 	PyObject_HEAD_INIT(&PyType_Type)
  	0, /*ob_size*/
  	"MovieController", /*tp_name*/
--- 931,935 ----
  
  PyTypeObject MovieController_Type = {
! 	PyObject_HEAD_INIT(NULL)
  	0, /*ob_size*/
  	"MovieController", /*tp_name*/
***************
*** 1329,1333 ****
  
  PyTypeObject TimeBase_Type = {
! 	PyObject_HEAD_INIT(&PyType_Type)
  	0, /*ob_size*/
  	"TimeBase", /*tp_name*/
--- 1325,1329 ----
  
  PyTypeObject TimeBase_Type = {
! 	PyObject_HEAD_INIT(NULL)
  	0, /*ob_size*/
  	"TimeBase", /*tp_name*/
***************
*** 1606,1610 ****
  
  PyTypeObject UserData_Type = {
! 	PyObject_HEAD_INIT(&PyType_Type)
  	0, /*ob_size*/
  	"UserData", /*tp_name*/
--- 1602,1606 ----
  
  PyTypeObject UserData_Type = {
! 	PyObject_HEAD_INIT(NULL)
  	0, /*ob_size*/
  	"UserData", /*tp_name*/
***************
*** 2640,2644 ****
  
  PyTypeObject Media_Type = {
! 	PyObject_HEAD_INIT(&PyType_Type)
  	0, /*ob_size*/
  	"Media", /*tp_name*/
--- 2636,2640 ----
  
  PyTypeObject Media_Type = {
! 	PyObject_HEAD_INIT(NULL)
  	0, /*ob_size*/
  	"Media", /*tp_name*/
***************
*** 3727,3731 ****
  
  PyTypeObject Track_Type = {
! 	PyObject_HEAD_INIT(&PyType_Type)
  	0, /*ob_size*/
  	"Track", /*tp_name*/
--- 3723,3727 ----
  
  PyTypeObject Track_Type = {
! 	PyObject_HEAD_INIT(NULL)
  	0, /*ob_size*/
  	"Track", /*tp_name*/
***************
*** 5799,5803 ****
  
  PyTypeObject Movie_Type = {
! 	PyObject_HEAD_INIT(&PyType_Type)
  	0, /*ob_size*/
  	"Movie", /*tp_name*/
--- 5795,5799 ----
  
  PyTypeObject Movie_Type = {
! 	PyObject_HEAD_INIT(NULL)
  	0, /*ob_size*/
  	"Movie", /*tp_name*/