[Python-checkins] CVS: python/dist/src/Modules _tkinter.c,1.103,1.104
Fred L. Drake
python-dev@python.org
Fri, 7 Jul 2000 21:04:41 -0700
Update of /cvsroot/python/python/dist/src/Modules
In directory slayer.i.sourceforge.net:/tmp/cvs-serv5156
Modified Files:
_tkinter.c
Log Message:
Removed Py_PROTO, ANSI-fied sources.
Index: _tkinter.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/_tkinter.c,v
retrieving revision 1.103
retrieving revision 1.104
diff -C2 -r1.103 -r1.104
*** _tkinter.c 2000/06/30 23:50:38 1.103
--- _tkinter.c 2000/07/08 04:04:38 1.104
***************
*** 192,200 ****
#include <Events.h> /* For EventRecord */
! typedef int (*TclMacConvertEventPtr) Py_PROTO((EventRecord *eventPtr));
! void Tcl_MacSetEventProc Py_PROTO((TclMacConvertEventPtr procPtr));
! int TkMacConvertEvent Py_PROTO((EventRecord *eventPtr));
! staticforward int PyMacConvertEvent Py_PROTO((EventRecord *eventPtr));
#if defined(__CFM68K__) && !defined(__USING_STATIC_LIBS__)
--- 192,200 ----
#include <Events.h> /* For EventRecord */
! typedef int (*TclMacConvertEventPtr) (EventRecord *eventPtr);
! void Tcl_MacSetEventProc (TclMacConvertEventPtr procPtr);
! int TkMacConvertEvent (EventRecord *eventPtr);
! staticforward int PyMacConvertEvent (EventRecord *eventPtr);
#if defined(__CFM68K__) && !defined(__USING_STATIC_LIBS__)
***************
*** 244,249 ****
static PyObject *
! Tkinter_Error(v)
! PyObject *v;
{
PyErr_SetString(Tkinter_TclError, Tkapp_Result(v));
--- 244,248 ----
static PyObject *
! Tkinter_Error(PyObject *v)
{
PyErr_SetString(Tkinter_TclError, Tkapp_Result(v));
***************
*** 263,268 ****
static void
! Sleep(milli)
! int milli;
{
/* XXX Too bad if you don't have select(). */
--- 262,266 ----
static void
! Sleep(int milli)
{
/* XXX Too bad if you don't have select(). */
***************
*** 278,284 ****
static char *
! AsString(value, tmp)
! PyObject *value;
! PyObject *tmp;
{
if (PyString_Check(value))
--- 276,280 ----
static char *
! AsString(PyObject *value, PyObject *tmp)
{
if (PyString_Check(value))
***************
*** 297,302 ****
static char *
! Merge(args)
! PyObject *args;
{
PyObject *tmp = NULL;
--- 293,297 ----
static char *
! Merge(PyObject *args)
{
PyObject *tmp = NULL;
***************
*** 370,375 ****
static PyObject *
! Split(list)
! char *list;
{
int argc;
--- 365,369 ----
static PyObject *
! Split(char *list)
{
int argc;
***************
*** 417,422 ****
#ifndef WITH_APPINIT
int
! Tcl_AppInit(interp)
! Tcl_Interp *interp;
{
Tk_Window main;
--- 411,415 ----
#ifndef WITH_APPINIT
int
! Tcl_AppInit(Tcl_Interp *interp)
{
Tk_Window main;
***************
*** 446,454 ****
static TkappObject *
! Tkapp_New(screenName, baseName, className, interactive)
! char *screenName;
! char *baseName;
! char *className;
! int interactive;
{
TkappObject *v;
--- 439,443 ----
static TkappObject *
! Tkapp_New(char *screenName, char *baseName, char *className, int interactive)
{
TkappObject *v;
***************
*** 511,516 ****
static Tcl_Obj*
! AsObj(value)
! PyObject *value;
{
Tcl_Obj *result;
--- 500,504 ----
static Tcl_Obj*
! AsObj(PyObject *value)
{
Tcl_Obj *result;
***************
*** 568,574 ****
static PyObject *
! Tkapp_Call(self, args)
! PyObject *self;
! PyObject *args;
{
Tcl_Obj *objStore[ARGSZ];
--- 556,560 ----
static PyObject *
! Tkapp_Call(PyObject *self, PyObject *args)
{
Tcl_Obj *objStore[ARGSZ];
***************
*** 661,667 ****
static PyObject *
! Tkapp_Call(self, args)
! PyObject *self;
! PyObject *args;
{
/* This is copied from Merge() */
--- 647,651 ----
static PyObject *
! Tkapp_Call(PyObject *self, PyObject *args)
{
/* This is copied from Merge() */
***************
*** 776,782 ****
static PyObject *
! Tkapp_GlobalCall(self, args)
! PyObject *self;
! PyObject *args;
{
/* Could do the same here as for Tkapp_Call(), but this is not used
--- 760,764 ----
static PyObject *
! Tkapp_GlobalCall(PyObject *self, PyObject *args)
{
/* Could do the same here as for Tkapp_Call(), but this is not used
***************
*** 812,818 ****
static PyObject *
! Tkapp_Eval(self, args)
! PyObject *self;
! PyObject *args;
{
char *script;
--- 794,798 ----
static PyObject *
! Tkapp_Eval(PyObject *self, PyObject *args)
{
char *script;
***************
*** 835,841 ****
static PyObject *
! Tkapp_GlobalEval(self, args)
! PyObject *self;
! PyObject *args;
{
char *script;
--- 815,819 ----
static PyObject *
! Tkapp_GlobalEval(PyObject *self, PyObject *args)
{
char *script;
***************
*** 858,864 ****
static PyObject *
! Tkapp_EvalFile(self, args)
! PyObject *self;
! PyObject *args;
{
char *fileName;
--- 836,840 ----
static PyObject *
! Tkapp_EvalFile(PyObject *self, PyObject *args)
{
char *fileName;
***************
*** 882,888 ****
static PyObject *
! Tkapp_Record(self, args)
! PyObject *self;
! PyObject *args;
{
char *script;
--- 858,862 ----
static PyObject *
! Tkapp_Record(PyObject *self, PyObject *args)
{
char *script;
***************
*** 905,911 ****
static PyObject *
! Tkapp_AddErrorInfo(self, args)
! PyObject *self;
! PyObject *args;
{
char *msg;
--- 879,883 ----
static PyObject *
! Tkapp_AddErrorInfo(PyObject *self, PyObject *args)
{
char *msg;
***************
*** 926,933 ****
static PyObject *
! SetVar(self, args, flags)
! PyObject *self;
! PyObject *args;
! int flags;
{
char *name1, *name2, *ok, *s;
--- 898,902 ----
static PyObject *
! SetVar(PyObject *self, PyObject *args, int flags)
{
char *name1, *name2, *ok, *s;
***************
*** 970,976 ****
static PyObject *
! Tkapp_SetVar(self, args)
! PyObject *self;
! PyObject *args;
{
return SetVar(self, args, TCL_LEAVE_ERR_MSG);
--- 939,943 ----
static PyObject *
! Tkapp_SetVar(PyObject *self, PyObject *args)
{
return SetVar(self, args, TCL_LEAVE_ERR_MSG);
***************
*** 978,984 ****
static PyObject *
! Tkapp_GlobalSetVar(self, args)
! PyObject *self;
! PyObject *args;
{
return SetVar(self, args, TCL_LEAVE_ERR_MSG | TCL_GLOBAL_ONLY);
--- 945,949 ----
static PyObject *
! Tkapp_GlobalSetVar(PyObject *self, PyObject *args)
{
return SetVar(self, args, TCL_LEAVE_ERR_MSG | TCL_GLOBAL_ONLY);
***************
*** 988,995 ****
static PyObject *
! GetVar(self, args, flags)
! PyObject *self;
! PyObject *args;
! int flags;
{
char *name1, *name2=NULL, *s;
--- 953,957 ----
static PyObject *
! GetVar(PyObject *self, PyObject *args, int flags)
{
char *name1, *name2=NULL, *s;
***************
*** 1015,1021 ****
static PyObject *
! Tkapp_GetVar(self, args)
! PyObject *self;
! PyObject *args;
{
return GetVar(self, args, TCL_LEAVE_ERR_MSG);
--- 977,981 ----
static PyObject *
! Tkapp_GetVar(PyObject *self, PyObject *args)
{
return GetVar(self, args, TCL_LEAVE_ERR_MSG);
***************
*** 1023,1029 ****
static PyObject *
! Tkapp_GlobalGetVar(self, args)
! PyObject *self;
! PyObject *args;
{
return GetVar(self, args, TCL_LEAVE_ERR_MSG | TCL_GLOBAL_ONLY);
--- 983,987 ----
static PyObject *
! Tkapp_GlobalGetVar(PyObject *self, PyObject *args)
{
return GetVar(self, args, TCL_LEAVE_ERR_MSG | TCL_GLOBAL_ONLY);
***************
*** 1033,1040 ****
static PyObject *
! UnsetVar(self, args, flags)
! PyObject *self;
! PyObject *args;
! int flags;
{
char *name1, *name2=NULL;
--- 991,995 ----
static PyObject *
! UnsetVar(PyObject *self, PyObject *args, int flags)
{
char *name1, *name2=NULL;
***************
*** 1063,1069 ****
static PyObject *
! Tkapp_UnsetVar(self, args)
! PyObject *self;
! PyObject *args;
{
return UnsetVar(self, args, TCL_LEAVE_ERR_MSG);
--- 1018,1022 ----
static PyObject *
! Tkapp_UnsetVar(PyObject *self, PyObject *args)
{
return UnsetVar(self, args, TCL_LEAVE_ERR_MSG);
***************
*** 1071,1077 ****
static PyObject *
! Tkapp_GlobalUnsetVar(self, args)
! PyObject *self;
! PyObject *args;
{
return UnsetVar(self, args, TCL_LEAVE_ERR_MSG | TCL_GLOBAL_ONLY);
--- 1024,1028 ----
static PyObject *
! Tkapp_GlobalUnsetVar(PyObject *self, PyObject *args)
{
return UnsetVar(self, args, TCL_LEAVE_ERR_MSG | TCL_GLOBAL_ONLY);
***************
*** 1083,1089 ****
static PyObject *
! Tkapp_GetInt(self, args)
! PyObject *self;
! PyObject *args;
{
char *s;
--- 1034,1038 ----
static PyObject *
! Tkapp_GetInt(PyObject *self, PyObject *args)
{
char *s;
***************
*** 1098,1104 ****
static PyObject *
! Tkapp_GetDouble(self, args)
! PyObject *self;
! PyObject *args;
{
char *s;
--- 1047,1051 ----
static PyObject *
! Tkapp_GetDouble(PyObject *self, PyObject *args)
{
char *s;
***************
*** 1113,1119 ****
static PyObject *
! Tkapp_GetBoolean(self, args)
! PyObject *self;
! PyObject *args;
{
char *s;
--- 1060,1064 ----
static PyObject *
! Tkapp_GetBoolean(PyObject *self, PyObject *args)
{
char *s;
***************
*** 1128,1134 ****
static PyObject *
! Tkapp_ExprString(self, args)
! PyObject *self;
! PyObject *args;
{
char *s;
--- 1073,1077 ----
static PyObject *
! Tkapp_ExprString(PyObject *self, PyObject *args)
{
char *s;
***************
*** 1150,1156 ****
static PyObject *
! Tkapp_ExprLong(self, args)
! PyObject *self;
! PyObject *args;
{
char *s;
--- 1093,1097 ----
static PyObject *
! Tkapp_ExprLong(PyObject *self, PyObject *args)
{
char *s;
***************
*** 1173,1179 ****
static PyObject *
! Tkapp_ExprDouble(self, args)
! PyObject *self;
! PyObject *args;
{
char *s;
--- 1114,1118 ----
static PyObject *
! Tkapp_ExprDouble(PyObject *self, PyObject *args)
{
char *s;
***************
*** 1198,1204 ****
static PyObject *
! Tkapp_ExprBoolean(self, args)
! PyObject *self;
! PyObject *args;
{
char *s;
--- 1137,1141 ----
static PyObject *
! Tkapp_ExprBoolean(PyObject *self, PyObject *args)
{
char *s;
***************
*** 1223,1229 ****
static PyObject *
! Tkapp_SplitList(self, args)
! PyObject *self;
! PyObject *args;
{
char *list;
--- 1160,1164 ----
static PyObject *
! Tkapp_SplitList(PyObject *self, PyObject *args)
{
char *list;
***************
*** 1257,1263 ****
static PyObject *
! Tkapp_Split(self, args)
! PyObject *self;
! PyObject *args;
{
char *list;
--- 1192,1196 ----
static PyObject *
! Tkapp_Split(PyObject *self, PyObject *args)
{
char *list;
***************
*** 1269,1275 ****
static PyObject *
! Tkapp_Merge(self, args)
! PyObject *self;
! PyObject *args;
{
char *s = Merge(args);
--- 1202,1206 ----
static PyObject *
! Tkapp_Merge(PyObject *self, PyObject *args)
{
char *s = Merge(args);
***************
*** 1297,1302 ****
static int
! PythonCmd_Error(interp)
! Tcl_Interp *interp;
{
errorInCmd = 1;
--- 1228,1232 ----
static int
! PythonCmd_Error(Tcl_Interp *interp)
{
errorInCmd = 1;
***************
*** 1310,1318 ****
*/
static int
! PythonCmd(clientData, interp, argc, argv)
! ClientData clientData;
! Tcl_Interp *interp;
! int argc;
! char *argv[];
{
PythonCmd_ClientData *data = (PythonCmd_ClientData *)clientData;
--- 1240,1244 ----
*/
static int
! PythonCmd(ClientData clientData, Tcl_Interp *interp, int argc, char *argv[])
{
PythonCmd_ClientData *data = (PythonCmd_ClientData *)clientData;
***************
*** 1360,1365 ****
static void
! PythonCmdDelete(clientData)
! ClientData clientData;
{
PythonCmd_ClientData *data = (PythonCmd_ClientData *)clientData;
--- 1286,1290 ----
static void
! PythonCmdDelete(ClientData clientData)
{
PythonCmd_ClientData *data = (PythonCmd_ClientData *)clientData;
***************
*** 1375,1381 ****
static PyObject *
! Tkapp_CreateCommand(self, args)
! PyObject *self;
! PyObject *args;
{
PythonCmd_ClientData *data;
--- 1300,1304 ----
static PyObject *
! Tkapp_CreateCommand(PyObject *self, PyObject *args)
{
PythonCmd_ClientData *data;
***************
*** 1416,1422 ****
static PyObject *
! Tkapp_DeleteCommand(self, args)
! PyObject *self;
! PyObject *args;
{
char *cmdName;
--- 1339,1343 ----
static PyObject *
! Tkapp_DeleteCommand(PyObject *self, PyObject *args)
{
char *cmdName;
***************
*** 1451,1458 ****
static FileHandler_ClientData *
! NewFHCD(func, file, id)
! PyObject *func;
! PyObject *file;
! int id;
{
FileHandler_ClientData *p;
--- 1372,1376 ----
static FileHandler_ClientData *
! NewFHCD(PyObject *func, PyObject *file, int id)
{
FileHandler_ClientData *p;
***************
*** 1471,1476 ****
static void
! DeleteFHCD(id)
! int id;
{
FileHandler_ClientData *p, **pp;
--- 1389,1393 ----
static void
! DeleteFHCD(int id)
{
FileHandler_ClientData *p, **pp;
***************
*** 1490,1496 ****
static void
! FileHandler(clientData, mask)
! ClientData clientData;
! int mask;
{
FileHandler_ClientData *data = (FileHandler_ClientData *)clientData;
--- 1407,1411 ----
static void
! FileHandler(ClientData clientData, int mask)
{
FileHandler_ClientData *data = (FileHandler_ClientData *)clientData;
***************
*** 1514,1522 ****
static int
! GetFileNo(file)
/* Either an int >= 0 or an object with a
*.fileno() method that returns an int >= 0
*/
- PyObject *file;
{
PyObject *meth, *args, *res;
--- 1429,1436 ----
static int
! GetFileNo(PyObject *file)
/* Either an int >= 0 or an object with a
*.fileno() method that returns an int >= 0
*/
{
PyObject *meth, *args, *res;
***************
*** 1557,1563 ****
static PyObject *
! Tkapp_CreateFileHandler(self, args)
! PyObject *self;
! PyObject *args; /* Is (file, mask, func) */
{
FileHandler_ClientData *data;
--- 1471,1476 ----
static PyObject *
! Tkapp_CreateFileHandler(PyObject *self, PyObject *args)
! /* args is (file, mask, func) */
{
FileHandler_ClientData *data;
***************
*** 1588,1594 ****
static PyObject *
! Tkapp_DeleteFileHandler(self, args)
! PyObject *self;
! PyObject *args; /* Args: file */
{
PyObject *file;
--- 1501,1505 ----
static PyObject *
! Tkapp_DeleteFileHandler(PyObject *self, PyObject *args)
{
PyObject *file;
***************
*** 1625,1631 ****
static PyObject *
! Tktt_DeleteTimerHandler(self, args)
! PyObject *self;
! PyObject *args;
{
TkttObject *v = (TkttObject *)self;
--- 1536,1540 ----
static PyObject *
! Tktt_DeleteTimerHandler(PyObject *self, PyObject *args)
{
TkttObject *v = (TkttObject *)self;
***************
*** 1654,1659 ****
static TkttObject *
! Tktt_New(func)
! PyObject *func;
{
TkttObject *v;
--- 1563,1567 ----
static TkttObject *
! Tktt_New(PyObject *func)
{
TkttObject *v;
***************
*** 1673,1678 ****
static void
! Tktt_Dealloc(self)
! PyObject *self;
{
TkttObject *v = (TkttObject *)self;
--- 1581,1585 ----
static void
! Tktt_Dealloc(PyObject *self)
{
TkttObject *v = (TkttObject *)self;
***************
*** 1685,1690 ****
static PyObject *
! Tktt_Repr(self)
! PyObject *self;
{
TkttObject *v = (TkttObject *)self;
--- 1592,1596 ----
static PyObject *
! Tktt_Repr(PyObject *self)
{
TkttObject *v = (TkttObject *)self;
***************
*** 1697,1703 ****
static PyObject *
! Tktt_GetAttr(self, name)
! PyObject *self;
! char *name;
{
return Py_FindMethod(Tktt_methods, self, name);
--- 1603,1607 ----
static PyObject *
! Tktt_GetAttr(PyObject *self, char *name)
{
return Py_FindMethod(Tktt_methods, self, name);
***************
*** 1728,1733 ****
static void
! TimerHandler(clientData)
! ClientData clientData;
{
TkttObject *v = (TkttObject *)clientData;
--- 1632,1636 ----
static void
! TimerHandler(ClientData clientData)
{
TkttObject *v = (TkttObject *)clientData;
***************
*** 1757,1763 ****
static PyObject *
! Tkapp_CreateTimerHandler(self, args)
! PyObject *self;
! PyObject *args; /* Is (milliseconds, func) */
{
int milliseconds;
--- 1660,1664 ----
static PyObject *
! Tkapp_CreateTimerHandler(PyObject *self, PyObject *args)
{
int milliseconds;
***************
*** 1782,1788 ****
static PyObject *
! Tkapp_MainLoop(self, args)
! PyObject *self;
! PyObject *args;
{
int threshold = 0;
--- 1683,1687 ----
static PyObject *
! Tkapp_MainLoop(PyObject *self, PyObject *args)
{
int threshold = 0;
***************
*** 1833,1839 ****
static PyObject *
! Tkapp_DoOneEvent(self, args)
! PyObject *self;
! PyObject *args;
{
int flags = 0;
--- 1732,1736 ----
static PyObject *
! Tkapp_DoOneEvent(PyObject *self, PyObject *args)
{
int flags = 0;
***************
*** 1850,1856 ****
static PyObject *
! Tkapp_Quit(self, args)
! PyObject *self;
! PyObject *args;
{
--- 1747,1751 ----
static PyObject *
! Tkapp_Quit(PyObject *self, PyObject *args)
{
***************
*** 1864,1870 ****
static PyObject *
! Tkapp_InterpAddr(self, args)
! PyObject *self;
! PyObject *args;
{
--- 1759,1763 ----
static PyObject *
! Tkapp_InterpAddr(PyObject *self, PyObject *args)
{
***************
*** 1923,1928 ****
static void
! Tkapp_Dealloc(self)
! PyObject *self;
{
ENTER_TCL
--- 1816,1820 ----
static void
! Tkapp_Dealloc(PyObject *self)
{
ENTER_TCL
***************
*** 1934,1940 ****
static PyObject *
! Tkapp_GetAttr(self, name)
! PyObject *self;
! char *name;
{
return Py_FindMethod(Tkapp_methods, self, name);
--- 1826,1830 ----
static PyObject *
! Tkapp_GetAttr(PyObject *self, char *name)
{
return Py_FindMethod(Tkapp_methods, self, name);
***************
*** 2113,2119 ****
#ifndef MS_WINDOWS
static void
! MyFileProc(clientData, mask)
! void *clientData;
! int mask;
{
stdin_ready = 1;
--- 2003,2007 ----
#ifndef MS_WINDOWS
static void
! MyFileProc(void *clientData, int mask)
{
stdin_ready = 1;
***************
*** 2208,2215 ****
/* all errors will be checked in one fell swoop in init_tkinter() */
static void
! ins_long(d, name, val)
! PyObject *d;
! char *name;
! long val;
{
PyObject *v = PyInt_FromLong(val);
--- 2096,2100 ----
/* all errors will be checked in one fell swoop in init_tkinter() */
static void
! ins_long(PyObject *d, char *name, long val)
{
PyObject *v = PyInt_FromLong(val);
***************
*** 2220,2227 ****
}
static void
! ins_string(d, name, val)
! PyObject *d;
! char *name;
! char *val;
{
PyObject *v = PyString_FromString(val);
--- 2105,2109 ----
}
static void
! ins_string(PyObject *d, char *name, char *val)
{
PyObject *v = PyString_FromString(val);
***************
*** 2324,2329 ****
static int
! PyMacConvertEvent(eventPtr)
! EventRecord *eventPtr;
{
WindowPtr frontwin;
--- 2206,2210 ----
static int
! PyMacConvertEvent(EventRecord *eventPtr)
{
WindowPtr frontwin;