[Python-checkins] CVS: python/dist/src/Mac/Modules/qt Qtmodule.c,1.23,1.24

[Jack Jansen]

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

Modified Files:
	Qtmodule.c 
Log Message:
Lots more Carbon/Carbon.h includes, new UPP routine names, function prototypes. Most toolbox modules now compile, link and import in MacOSX-MachO python.

Index: Qtmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/qt/Qtmodule.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** Qtmodule.c	2001/05/17 21:57:32	1.23
--- Qtmodule.c	2001/05/22 21:54:37	1.24
***************
*** 9,13 ****
--- 9,19 ----
  #include "pymactoolbox.h"
  
+ #ifdef WITHOUT_FRAMEWORKS
  #include <Movies.h>
+ #else
+ /* #include <Carbon/Carbon.h> */
+ #include <QuickTime/QuickTime.h>
+ #endif
+ 
[...6302 lines suppressed...]
! 		PyMac_INIT_TOOLBOX_OBJECT_CONVERT(MediaObj_Convert);
  
  
--- 8369,8384 ----
  
  
! 		PyMac_INIT_TOOLBOX_OBJECT_NEW(Track, TrackObj_New);
! 		PyMac_INIT_TOOLBOX_OBJECT_CONVERT(Track, TrackObj_Convert);
! 		PyMac_INIT_TOOLBOX_OBJECT_NEW(Movie, MovieObj_New);
! 		PyMac_INIT_TOOLBOX_OBJECT_CONVERT(Movie, MovieObj_Convert);
! 		PyMac_INIT_TOOLBOX_OBJECT_NEW(MovieController, MovieCtlObj_New);
! 		PyMac_INIT_TOOLBOX_OBJECT_CONVERT(MovieController, MovieCtlObj_Convert);
! 		PyMac_INIT_TOOLBOX_OBJECT_NEW(TimeBase, TimeBaseObj_New);
! 		PyMac_INIT_TOOLBOX_OBJECT_CONVERT(TimeBase, TimeBaseObj_Convert);
! 		PyMac_INIT_TOOLBOX_OBJECT_NEW(UserData, UserDataObj_New);
! 		PyMac_INIT_TOOLBOX_OBJECT_CONVERT(UserData, UserDataObj_Convert);
! 		PyMac_INIT_TOOLBOX_OBJECT_NEW(Media, MediaObj_New);
! 		PyMac_INIT_TOOLBOX_OBJECT_CONVERT(Media, MediaObj_Convert);