Mailing List Archive

Update of /cvsroot/python/python/dist/src/Modules
In directory sc8-pr-cvs1:/tmp/cvs-serv7410/Modules

Modified Files:
_tkinter.c
Log Message:
Rename want_objects to wantobjects throughout, for consistency.


Index: _tkinter.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/_tkinter.c,v
retrieving revision 1.131
retrieving revision 1.132
diff -C2 -d -r1.131 -r1.132
*** _tkinter.c 26 Nov 2002 09:28:05 -0000 1.131
--- _tkinter.c 26 Nov 2002 21:39:48 -0000 1.132
***************
*** 222,226 ****
PyObject_HEAD
Tcl_Interp *interp;
! int want_objects;
} TkappObject;

--- 222,226 ----
PyObject_HEAD
Tcl_Interp *interp;
! int wantobjects;
} TkappObject;

***************
*** 524,528 ****
static TkappObject *
Tkapp_New(char *screenName, char *baseName, char *className,
! int interactive, int want_objects)
{
TkappObject *v;
--- 524,528 ----
static TkappObject *
Tkapp_New(char *screenName, char *baseName, char *className,
! int interactive, int wantobjects)
{
TkappObject *v;
***************
*** 534,538 ****

v->interp = Tcl_CreateInterp();
! v->want_objects = want_objects;

#if defined(macintosh)
--- 534,538 ----

v->interp = Tcl_CreateInterp();
! v->wantobjects = wantobjects;

#if defined(macintosh)
***************
*** 902,906 ****
if (i == TCL_ERROR)
Tkinter_Error(self);
! else if(((TkappObject*)self)->want_objects) {
Tcl_Obj *value = Tcl_GetObjResult(interp);
/* Not sure whether the IncrRef is necessary, but something
--- 902,906 ----
if (i == TCL_ERROR)
Tkinter_Error(self);
! else if(((TkappObject*)self)->wantobjects) {
Tcl_Obj *value = Tcl_GetObjResult(interp);
/* Not sure whether the IncrRef is necessary, but something
***************
*** 1968,1975 ****
{

! int want_objects;
! if (!PyArg_ParseTuple(args, "i:wantobjects", &want_objects))
return NULL;
! ((TkappObject*)self)->want_objects = want_objects;

Py_INCREF(Py_None);
--- 1968,1975 ----
{

! int wantobjects;
! if (!PyArg_ParseTuple(args, "i:wantobjects", &wantobjects))
return NULL;
! ((TkappObject*)self)->wantobjects = wantobjects;

Py_INCREF(Py_None);
***************
*** 2180,2184 ****
char *className = NULL;
int interactive = 0;
! int want_objects = 0;

baseName = strrchr(Py_GetProgramName(), '/');
--- 2180,2184 ----
char *className = NULL;
int interactive = 0;
! int wantobjects = 0;

baseName = strrchr(Py_GetProgramName(), '/');
***************
*** 2191,2199 ****
if (!PyArg_ParseTuple(args, "|zssi:create",
&screenName, &baseName, &className,
! &interactive, &want_objects))
return NULL;

return (PyObject *) Tkapp_New(screenName, baseName, className,
! interactive, want_objects);
}

--- 2191,2199 ----
if (!PyArg_ParseTuple(args, "|zssi:create",
&screenName, &baseName, &className,
! &interactive, &wantobjects))
return NULL;

return (PyObject *) Tkapp_New(screenName, baseName, className,
! interactive, wantobjects);
}