[Python-checkins] CVS: python/dist/src/Mac/Modules/qt qtsupport.py,1.16,1.17

[Jack Jansen]

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

Modified Files:
	qtsupport.py 
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: qtsupport.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/qt/qtsupport.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** qtsupport.py	2001/05/17 21:57:42	1.16
--- qtsupport.py	2001/05/22 21:54:42	1.17
***************
*** 25,29 ****
  
  includestuff = includestuff + """
! #include <%s>""" % MACHEADERFILE + """
  
  #ifdef USE_TOOLBOX_OBJECT_GLUE
--- 25,35 ----
  
  includestuff = includestuff + """
! #ifdef WITHOUT_FRAMEWORKS
! #include <Movies.h>
! #else
! /* #include <Carbon/Carbon.h> */
! #include <QuickTime/QuickTime.h>
! #endif
! 
  
  #ifdef USE_TOOLBOX_OBJECT_GLUE
***************
*** 63,68 ****
  */
  static PyObject *
! QtTimeRecord_New(itself)
! 	TimeRecord *itself;
  {
  	if (itself->base)
--- 69,73 ----
  */
  static PyObject *
! QtTimeRecord_New(TimeRecord *itself)
  {
  	if (itself->base)
***************
*** 75,81 ****
  
  static int
! QtTimeRecord_Convert(v, p_itself)
! 	PyObject *v;
! 	TimeRecord *p_itself;
  {
  	PyObject *base = NULL;
--- 80,84 ----
  
  static int
! QtTimeRecord_Convert(PyObject *v, TimeRecord *p_itself)
  {
  	PyObject *base = NULL;
***************
*** 96,111 ****
  
  initstuff = initstuff + """
! 	PyMac_INIT_TOOLBOX_OBJECT_NEW(TrackObj_New);
! 	PyMac_INIT_TOOLBOX_OBJECT_CONVERT(TrackObj_Convert);
! 	PyMac_INIT_TOOLBOX_OBJECT_NEW(MovieObj_New);
! 	PyMac_INIT_TOOLBOX_OBJECT_CONVERT(MovieObj_Convert);
! 	PyMac_INIT_TOOLBOX_OBJECT_NEW(MovieCtlObj_New);
! 	PyMac_INIT_TOOLBOX_OBJECT_CONVERT(MovieCtlObj_Convert);
! 	PyMac_INIT_TOOLBOX_OBJECT_NEW(TimeBaseObj_New);
! 	PyMac_INIT_TOOLBOX_OBJECT_CONVERT(TimeBaseObj_Convert);
! 	PyMac_INIT_TOOLBOX_OBJECT_NEW(UserDataObj_New);
! 	PyMac_INIT_TOOLBOX_OBJECT_CONVERT(UserDataObj_Convert);
! 	PyMac_INIT_TOOLBOX_OBJECT_NEW(MediaObj_New);
! 	PyMac_INIT_TOOLBOX_OBJECT_CONVERT(MediaObj_Convert);
  """
  
--- 99,114 ----
  
  initstuff = initstuff + """
! 	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);
  """