[Python-checkins] CVS: python/dist/src/Mac/Modules/qd qdsupport.py,1.30,1.31

[Jack Jansen]

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

Modified Files:
	qdsupport.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: qdsupport.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/qd/qdsupport.py,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -r1.30 -r1.31
*** qdsupport.py	2001/05/17 21:57:02	1.30
--- qdsupport.py	2001/05/22 21:54:12	1.31
***************
*** 62,66 ****
  
  includestuff = includestuff + """
! #include <%s>""" % MACHEADERFILE + """
  
  #ifdef USE_TOOLBOX_OBJECT_GLUE
--- 62,70 ----
  
  includestuff = includestuff + """
! #ifdef WITHOUT_FRAMEWORKS
! #include <QuickDraw.h>
! #else
! #include <Carbon/Carbon.h>
! #endif
  
  #ifdef USE_TOOLBOX_OBJECT_GLUE
***************
*** 154,159 ****
  ** Parse/generate RGB records
  */
! PyObject *QdRGB_New(itself)
! 	RGBColorPtr itself;
  {
  
--- 158,162 ----
  ** Parse/generate RGB records
  */
! PyObject *QdRGB_New(RGBColorPtr itself)
  {
  
***************
*** 161,167 ****
  }
  
! QdRGB_Convert(v, p_itself)
! 	PyObject *v;
! 	RGBColorPtr p_itself;
  {
  	long red, green, blue;
--- 164,168 ----
  }
  
! QdRGB_Convert(PyObject *v, RGBColorPtr p_itself)
  {
  	long red, green, blue;
***************
*** 179,184 ****
  */
  static
! PyObject *QdFI_New(itself)
! 	FontInfo *itself;
  {
  
--- 180,184 ----
  */
  static
! PyObject *QdFI_New(FontInfo *itself)
  {
  
***************
*** 192,197 ****
  ** released when the object is released)
  */
! PyObject *BMObj_NewCopied(itself)
! 	BitMapPtr itself;
  {
  	BitMapObject *it;
--- 192,196 ----
  ** released when the object is released)
  */
! PyObject *BMObj_NewCopied(BitMapPtr itself)
  {
  	BitMapObject *it;
***************
*** 219,228 ****
  
  initstuff = initstuff + """
! 	PyMac_INIT_TOOLBOX_OBJECT_NEW(BMObj_New);
! 	PyMac_INIT_TOOLBOX_OBJECT_CONVERT(BMObj_Convert);
! 	PyMac_INIT_TOOLBOX_OBJECT_NEW(GrafObj_New);
! 	PyMac_INIT_TOOLBOX_OBJECT_CONVERT(GrafObj_Convert);
! 	PyMac_INIT_TOOLBOX_OBJECT_NEW(QdRGB_New);
! 	PyMac_INIT_TOOLBOX_OBJECT_CONVERT(QdRGB_Convert);
  """
  
--- 218,227 ----
  
  initstuff = initstuff + """
! 	PyMac_INIT_TOOLBOX_OBJECT_NEW(BitMapPtr, BMObj_New);
! 	PyMac_INIT_TOOLBOX_OBJECT_CONVERT(BitMapPtr, BMObj_Convert);
! 	PyMac_INIT_TOOLBOX_OBJECT_NEW(GrafPtr, GrafObj_New);
! 	PyMac_INIT_TOOLBOX_OBJECT_CONVERT(GrafPtr, GrafObj_Convert);
! 	PyMac_INIT_TOOLBOX_OBJECT_NEW(RGBColorPtr, QdRGB_New);
! 	PyMac_INIT_TOOLBOX_OBJECT_CONVERT(RGBColorPtr, QdRGB_Convert);
  """