[Python-checkins] CVS: python/dist/src/Mac/Modules/app _Appmodule.c,1.7,1.8 appsupport.py,1.11,1.12

2002年1月05日 15:44:35 -0800

Update of /cvsroot/python/python/dist/src/Mac/Modules/app
In directory usw-pr-cvs1:/tmp/cvs-serv18458
Modified Files:
	_Appmodule.c appsupport.py 
Log Message:
Whoops, it's late -- generated output now matches what's checked in...
Index: _Appmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/app/_Appmodule.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** _Appmodule.c	2002年01月05日 23:37:19	1.7
--- _Appmodule.c	2002年01月05日 23:44:33	1.8
***************
*** 34,38 ****
 PyTypeObject ThemeDrawingState_Type;

! #define ThemeDrawingState_Check(x) ((x)->ob_type == &ThemeDrawingState_Type)

 typedef struct ThemeDrawingStateObject {
--- 34,38 ----
 PyTypeObject ThemeDrawingState_Type;

! #define ThemeDrawingStateObj_Check(x) ((x)->ob_type == &ThemeDrawingState_Type)

 typedef struct ThemeDrawingStateObject {
***************
*** 41,45 ****
 } ThemeDrawingStateObject;

! PyObject *ThemeDrawingState_New(ThemeDrawingState itself)
 {
 	ThemeDrawingStateObject *it;
--- 41,45 ----
 } ThemeDrawingStateObject;

! PyObject *ThemeDrawingStateObj_New(ThemeDrawingState itself)
 {
 	ThemeDrawingStateObject *it;
***************
*** 49,55 ****
 	return (PyObject *)it;
 }
! int ThemeDrawingState_Convert(PyObject *v, ThemeDrawingState *p_itself)
 {
! 	if (!ThemeDrawingState_Check(v))
 	{
 		PyErr_SetString(PyExc_TypeError, "ThemeDrawingState required");
--- 49,55 ----
 	return (PyObject *)it;
 }
! int ThemeDrawingStateObj_Convert(PyObject *v, ThemeDrawingState *p_itself)
 {
! 	if (!ThemeDrawingStateObj_Check(v))
 	{
 		PyErr_SetString(PyExc_TypeError, "ThemeDrawingState required");
***************
*** 60,64 ****
 }

! static void ThemeDrawingState_dealloc(ThemeDrawingStateObject *self)
 {
 	/* Cleanup of self->ob_itself goes here */
--- 60,64 ----
 }

! static void ThemeDrawingStateObj_dealloc(ThemeDrawingStateObject *self)
 {
 	/* Cleanup of self->ob_itself goes here */
***************
*** 66,70 ****
 }

! static PyObject *ThemeDrawingState_SetThemeDrawingState(ThemeDrawingStateObject *_self, PyObject *_args)
 {
 	PyObject *_res = NULL;
--- 66,70 ----
 }

! static PyObject *ThemeDrawingStateObj_SetThemeDrawingState(ThemeDrawingStateObject *_self, PyObject *_args)
 {
 	PyObject *_res = NULL;
***************
*** 81,85 ****
 }

! static PyObject *ThemeDrawingState_DisposeThemeDrawingState(ThemeDrawingStateObject *_self, PyObject *_args)
 {
 	PyObject *_res = NULL;
--- 81,85 ----
 }

! static PyObject *ThemeDrawingStateObj_DisposeThemeDrawingState(ThemeDrawingStateObject *_self, PyObject *_args)
 {
 	PyObject *_res = NULL;
***************
*** 93,118 ****
 }

! static PyMethodDef ThemeDrawingState_methods[] = {
! 	{"SetThemeDrawingState", (PyCFunction)ThemeDrawingState_SetThemeDrawingState, 1,
 	 "(Boolean inDisposeNow) -> (OSStatus _rv)"},
! 	{"DisposeThemeDrawingState", (PyCFunction)ThemeDrawingState_DisposeThemeDrawingState, 1,
 	 "() -> (OSStatus _rv)"},
 	{NULL, NULL, 0}
 };

! PyMethodChain ThemeDrawingState_chain = { ThemeDrawingState_methods, NULL };

! static PyObject *ThemeDrawingState_getattr(ThemeDrawingStateObject *self, char *name)
 {
! 	return Py_FindMethodInChain(&ThemeDrawingState_chain, (PyObject *)self, name);
 }

! #define ThemeDrawingState_setattr NULL

! #define ThemeDrawingState_compare NULL

! #define ThemeDrawingState_repr NULL

! #define ThemeDrawingState_hash NULL

 PyTypeObject ThemeDrawingState_Type = {
--- 93,118 ----
 }

! static PyMethodDef ThemeDrawingStateObj_methods[] = {
! 	{"SetThemeDrawingState", (PyCFunction)ThemeDrawingStateObj_SetThemeDrawingState, 1,
 	 "(Boolean inDisposeNow) -> (OSStatus _rv)"},
! 	{"DisposeThemeDrawingState", (PyCFunction)ThemeDrawingStateObj_DisposeThemeDrawingState, 1,
 	 "() -> (OSStatus _rv)"},
 	{NULL, NULL, 0}
 };

! PyMethodChain ThemeDrawingStateObj_chain = { ThemeDrawingStateObj_methods, NULL };

! static PyObject *ThemeDrawingStateObj_getattr(ThemeDrawingStateObject *self, char *name)
 {
! 	return Py_FindMethodInChain(&ThemeDrawingStateObj_chain, (PyObject *)self, name);
 }

! #define ThemeDrawingStateObj_setattr NULL

! #define ThemeDrawingStateObj_compare NULL

! #define ThemeDrawingStateObj_repr NULL

! #define ThemeDrawingStateObj_hash NULL

 PyTypeObject ThemeDrawingState_Type = {
***************
*** 123,136 ****
 	0, /*tp_itemsize*/
 	/* methods */
! 	(destructor) ThemeDrawingState_dealloc, /*tp_dealloc*/
 	0, /*tp_print*/
! 	(getattrfunc) ThemeDrawingState_getattr, /*tp_getattr*/
! 	(setattrfunc) ThemeDrawingState_setattr, /*tp_setattr*/
! 	(cmpfunc) ThemeDrawingState_compare, /*tp_compare*/
! 	(reprfunc) ThemeDrawingState_repr, /*tp_repr*/
 	(PyNumberMethods *)0, /* tp_as_number */
 	(PySequenceMethods *)0, /* tp_as_sequence */
 	(PyMappingMethods *)0, /* tp_as_mapping */
! 	(hashfunc) ThemeDrawingState_hash, /*tp_hash*/
 };

--- 123,136 ----
 	0, /*tp_itemsize*/
 	/* methods */
! 	(destructor) ThemeDrawingStateObj_dealloc, /*tp_dealloc*/
 	0, /*tp_print*/
! 	(getattrfunc) ThemeDrawingStateObj_getattr, /*tp_getattr*/
! 	(setattrfunc) ThemeDrawingStateObj_setattr, /*tp_setattr*/
! 	(cmpfunc) ThemeDrawingStateObj_compare, /*tp_compare*/
! 	(reprfunc) ThemeDrawingStateObj_repr, /*tp_repr*/
 	(PyNumberMethods *)0, /* tp_as_number */
 	(PySequenceMethods *)0, /* tp_as_sequence */
 	(PyMappingMethods *)0, /* tp_as_mapping */
! 	(hashfunc) ThemeDrawingStateObj_hash, /*tp_hash*/
 };

***************
*** 1152,1156 ****
 	if (_err != noErr) return PyMac_Error(_err);
 	_res = Py_BuildValue("O&",
! 	 ThemeDrawingState_New, outState);
 	return _res;
 }
--- 1152,1156 ----
 	if (_err != noErr) return PyMac_Error(_err);
 	_res = Py_BuildValue("O&",
! 	 ThemeDrawingStateObj_New, outState);
 	return _res;
 }
Index: appsupport.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/app/appsupport.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** appsupport.py	2002年01月05日 23:37:19	1.11
--- appsupport.py	2002年01月05日 23:44:33	1.12
***************
*** 15,19 ****
 MODPREFIX = 'App'			# The prefix for module-wide routines
 OBJECTTYPE = OBJECTNAME + KIND		# The C type used to represent them
! OBJECTPREFIX = MODPREFIX + 'Obj'	# The prefix for object methods
 INPUTFILE = string.lower(MODPREFIX) + 'gen.py' # The file generated by the scanner
 OUTPUTFILE = MODNAME + "module.c"	# The file generated by this program
--- 15,19 ----
 MODPREFIX = 'App'			# The prefix for module-wide routines
 OBJECTTYPE = OBJECTNAME + KIND		# The C type used to represent them
! OBJECTPREFIX = OBJECTNAME + 'Obj'	# The prefix for object methods
 INPUTFILE = string.lower(MODPREFIX) + 'gen.py' # The file generated by the scanner
 OUTPUTFILE = MODNAME + "module.c"	# The file generated by this program