[Python-checkins] CVS: python/dist/src/Mac/Modules/fm fmsupport.py,1.2,1.3

[Jack Jansen]

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

Modified Files:
	fmsupport.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: fmsupport.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/fm/fmsupport.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** fmsupport.py	2000/07/14 22:16:40	1.2
--- fmsupport.py	2001/05/22 21:52:26	1.3
***************
*** 20,31 ****
  
  includestuff = includestuff + """
! #include <%s>""" % MACHEADERFILE + """
  
  /*
  ** Parse/generate ComponentDescriptor records
  */
  static PyObject *
! FMRec_New(itself)
! 	FMetricRec *itself;
  {
  
--- 20,35 ----
  
  includestuff = includestuff + """
! #ifdef WITHOUT_FRAMEWORKS
! #include <Fonts.h>
! #else
! #include <Carbon/Carbon.h>
! #endif
  
+ 
  /*
  ** Parse/generate ComponentDescriptor records
  */
  static PyObject *
! FMRec_New(FMetricRec *itself)
  {
  
***************
*** 41,47 ****
  /* Not needed... */
  static int
! FMRec_Convert(v, p_itself)
! 	PyObject *v;
! 	FMetricRec *p_itself;
  {
  	return PyArg_ParseTuple(v, "O&O&O&O&O&",
--- 45,49 ----
  /* Not needed... */
  static int
! FMRec_Convert(PyObject *v, FMetricRec *p_itself)
  {
  	return PyArg_ParseTuple(v, "O&O&O&O&O&",