[Python-checkins] CVS: python/dist/src/Mac/Modules/te tesupport.py,1.7,1.8

[Jack Jansen]

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

Modified Files:
	tesupport.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: tesupport.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/te/tesupport.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** tesupport.py	2001/05/17 21:58:17	1.7
--- tesupport.py	2001/05/22 21:56:10	1.8
***************
*** 33,37 ****
  
  includestuff = includestuff + """
! #include <%s>""" % MACHEADERFILE + """
  
  #ifdef USE_TOOLBOX_OBJECT_GLUE
--- 33,41 ----
  
  includestuff = includestuff + """
! #ifdef WITHOUT_FRAMEWORKS
! #include <TextEdit.h>
! #else
! #include <Carbon/Carbon.h>
! #endif
  
  #ifdef USE_TOOLBOX_OBJECT_GLUE
***************
*** 50,55 ****
  */
  static PyObject *
! TextStyle_New(itself)
! 	TextStylePtr itself;
  {
  
--- 54,58 ----
  */
  static PyObject *
! TextStyle_New(TextStylePtr itself)
  {
  
***************
*** 59,65 ****
  
  static int
! TextStyle_Convert(v, p_itself)
! 	PyObject *v;
! 	TextStylePtr p_itself;
  {
  	long font, face, size;
--- 62,66 ----
  
  static int
! TextStyle_Convert(PyObject *v, TextStylePtr p_itself)
  {
  	long font, face, size;
***************
*** 75,80 ****
  
  initstuff = initstuff + """
! 	PyMac_INIT_TOOLBOX_OBJECT_NEW(TEObj_New);
! 	PyMac_INIT_TOOLBOX_OBJECT_CONVERT(TEObj_Convert);
  """
  
--- 76,81 ----
  
  initstuff = initstuff + """
! 	PyMac_INIT_TOOLBOX_OBJECT_NEW(TEHandle, TEObj_New);
! 	PyMac_INIT_TOOLBOX_OBJECT_CONVERT(TEHandle, TEObj_Convert);
  """