[Python-checkins] python/dist/src/Mac/Modules/menu _Menumodule.c,1.16,1.17 menusupport.py,1.19,1.20

2002年12月23日 15:16:55 -0800

Update of /cvsroot/python/python/dist/src/Mac/Modules/menu
In directory sc8-pr-cvs1:/tmp/cvs-serv31491/menu
Modified Files:
	_Menumodule.c menusupport.py 
Log Message:
- Various tweaks to shut up compiler warnings.
- Regenerated with the correct calls to PyType_Ready and the correct
 deallocator calls.
Index: _Menumodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/menu/_Menumodule.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** _Menumodule.c	19 Dec 2002 21:24:34 -0000	1.16
--- _Menumodule.c	23 Dec 2002 23:16:23 -0000	1.17
***************
*** 65,70 ****
 int OptMenuObj_Convert(PyObject *v, MenuRef *p_itself)
 {
- 	PyObject *tmp;
- 	
 	if ( v == Py_None ) {
 		*p_itself = NULL;
--- 65,68 ----
***************
*** 109,113 ****
 {
 	/* Cleanup of self->ob_itself goes here */
! 	PyObject_Del(self);
 }
 
--- 107,111 ----
 {
 	/* Cleanup of self->ob_itself goes here */
! 	self->ob_type->tp_free((PyObject *)self);
 }
 
***************
*** 3479,3482 ****
--- 3477,3481 ----
 		return;
 	Menu_Type.ob_type = &PyType_Type;
+ 	if (PyType_Ready(&Menu_Type) < 0) return;
 	Py_INCREF(&Menu_Type);
 	PyModule_AddObject(m, "Menu", (PyObject *)&Menu_Type);
Index: menusupport.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/menu/menusupport.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** menusupport.py	3 Dec 2002 23:40:20 -0000	1.19
--- menusupport.py	23 Dec 2002 23:16:23 -0000	1.20
***************
*** 84,89 ****
 int OptMenuObj_Convert(PyObject *v, MenuRef *p_itself)
 {
- 	PyObject *tmp;
- 	
 	if ( v == Py_None ) {
 		*p_itself = NULL;
--- 84,87 ----