[Python-checkins] CVS: python/dist/src/Mac/Modules/cm cmsupport.py,1.3,1.4

2001年5月22日 14:51:35 -0700

Update of /cvsroot/python/python/dist/src/Mac/Modules/cm
In directory usw-pr-cvs1:/tmp/cvs-serv13840/Python/Mac/Modules/cm
Modified Files:
	cmsupport.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: cmsupport.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/cm/cmsupport.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** cmsupport.py	2001年05月17日 21:54:35	1.3
--- cmsupport.py	2001年05月22日 21:51:33	1.4
***************
*** 22,26 ****
 
 includestuff = includestuff + """
! #include <%s>""" % MACHEADERFILE + """
 #ifdef USE_TOOLBOX_OBJECT_GLUE
 extern PyObject *_CmpObj_New(Component);
--- 22,31 ----
 
 includestuff = includestuff + """
! #ifdef WITHOUT_FRAMEWORKS
! #include <Components.h>
! #else
! #include <Carbon/Carbon.h>
! #endif
! 
 #ifdef USE_TOOLBOX_OBJECT_GLUE
 extern PyObject *_CmpObj_New(Component);
***************
*** 39,44 ****
 */
 static PyObject *
! CmpDesc_New(itself)
! 	ComponentDescription *itself;
 {
 
--- 44,48 ----
 */
 static PyObject *
! CmpDesc_New(ComponentDescription *itself)
 {
 
***************
*** 51,57 ****
 
 static int
! CmpDesc_Convert(v, p_itself)
! 	PyObject *v;
! 	ComponentDescription *p_itself;
 {
 	return PyArg_ParseTuple(v, "O&O&O&ll",
--- 55,59 ----
 
 static int
! CmpDesc_Convert(PyObject *v, ComponentDescription *p_itself)
 {
 	return PyArg_ParseTuple(v, "O&O&O&ll",
***************
*** 65,72 ****
 
 initstuff = initstuff + """
! 	PyMac_INIT_TOOLBOX_OBJECT_NEW(CmpObj_New);
! 	PyMac_INIT_TOOLBOX_OBJECT_CONVERT(CmpObj_Convert);
! 	PyMac_INIT_TOOLBOX_OBJECT_NEW(CmpInstObj_New);
! 	PyMac_INIT_TOOLBOX_OBJECT_CONVERT(CmpInstObj_Convert);
 """
 
--- 67,74 ----
 
 initstuff = initstuff + """
! 	PyMac_INIT_TOOLBOX_OBJECT_NEW(Component, CmpObj_New);
! 	PyMac_INIT_TOOLBOX_OBJECT_CONVERT(Component, CmpObj_Convert);
! 	PyMac_INIT_TOOLBOX_OBJECT_NEW(ComponentInstance, CmpInstObj_New);
! 	PyMac_INIT_TOOLBOX_OBJECT_CONVERT(ComponentInstance, CmpInstObj_Convert);
 """