[Python-checkins] python/dist/src/Mac/Modules/app _Appmodule.c, 1.11.2.2, 1.11.2.3

[jhylton@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Mac/Modules/app
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27718/Mac/Modules/app

Modified Files:
      Tag: ast-branch
	_Appmodule.c 
Log Message:
Merge head to branch (for the last time)


Index: _Appmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/app/_Appmodule.c,v
retrieving revision 1.11.2.2
retrieving revision 1.11.2.3
diff -u -d -r1.11.2.2 -r1.11.2.3
--- _Appmodule.c	7 Jan 2005 07:01:03 -0000	1.11.2.2
+++ _Appmodule.c	16 Oct 2005 05:24:01 -0000	1.11.2.3
@@ -20,7 +20,7 @@
 
 int ThemeButtonDrawInfo_Convert(PyObject *v, ThemeButtonDrawInfo *p_itself)
 {
-	return PyArg_Parse(v, "(iHH)", &p_itself->state, &p_itself->value, &p_itself->adornment);
+        return PyArg_Parse(v, "(iHH)", &p_itself->state, &p_itself->value, &p_itself->adornment);
 }
 
 
@@ -45,6 +45,7 @@
 	it->ob_itself = itself;
 	return (PyObject *)it;
 }
+
 int ThemeDrawingStateObj_Convert(PyObject *v, ThemeDrawingState *p_itself)
 {
 	if (!ThemeDrawingStateObj_Check(v))
@@ -115,16 +116,16 @@
 
 #define ThemeDrawingStateObj_tp_alloc PyType_GenericAlloc
 
-static PyObject *ThemeDrawingStateObj_tp_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
+static PyObject *ThemeDrawingStateObj_tp_new(PyTypeObject *type, PyObject *_args, PyObject *_kwds)
 {
-	PyObject *self;
+	PyObject *_self;
 	ThemeDrawingState itself;
 	char *kw[] = {"itself", 0};
 
-	if (!PyArg_ParseTupleAndKeywords(args, kwds, "O&", kw, ThemeDrawingStateObj_Convert, &itself)) return NULL;
-	if ((self = type->tp_alloc(type, 0)) == NULL) return NULL;
-	((ThemeDrawingStateObject *)self)->ob_itself = itself;
-	return self;
+	if (!PyArg_ParseTupleAndKeywords(_args, _kwds, "O&", kw, ThemeDrawingStateObj_Convert, &itself)) return NULL;
+	if ((_self = type->tp_alloc(type, 0)) == NULL) return NULL;
+	((ThemeDrawingStateObject *)_self)->ob_itself = itself;
+	return _self;
 }
 
 #define ThemeDrawingStateObj_tp_free PyObject_Del