diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | generic/tkCanvas.c | 20 | ||||
| -rw-r--r-- | generic/tkPanedWindow.c | 6 | ||||
| -rw-r--r-- | generic/tkText.h | 4 | ||||
| -rw-r--r-- | generic/tkTextImage.c | 4 |
5 files changed, 24 insertions, 17 deletions
@@ -1,3 +1,10 @@ +2003-09-30 Donal K. Fellows <fellowsd@cs.man.ac.uk> + + * generic/tkCanvas.c (TkGetStringsFromObjs): + * generic/tkPanedWindow.c (PanedWindowWorldChanged): Private + functions should be either static or prefixed with 'Tk' (thanks to + George Staplin for spotting this.) + 2003-09-27 Pat Thoyts <patthoyts@users.sourceforge.net> * win/makefile.vc: Implementation of TIP #150, "Provide diff --git a/generic/tkCanvas.c b/generic/tkCanvas.c index 0636c5e..4bc01dd 100644 --- a/generic/tkCanvas.c +++ b/generic/tkCanvas.c @@ -12,7 +12,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkCanvas.c,v 1.22 2003/05/19 13:04:23 vincentdarley Exp $ + * RCS: @(#) $Id: tkCanvas.c,v 1.23 2003/09/29 23:15:19 dkf Exp $ */ /* #define USE_OLD_TAG_SEARCH 1 */ @@ -291,7 +291,7 @@ static int FindArea _ANSI_ARGS_((Tcl_Interp *interp, TkCanvas *canvasPtr, Tcl_Obj *CONST *argv, Tk_Uid uid, int enclosed)); static double GridAlign _ANSI_ARGS_((double coord, double spacing)); -CONST char** GetStringsFromObjs _ANSI_ARGS_((int argc, +CONST char** TkGetStringsFromObjs _ANSI_ARGS_((int argc, Tcl_Obj *CONST *objv)); static void InitCanvas _ANSI_ARGS_((void)); #ifdef USE_OLD_TAG_SEARCH @@ -900,7 +900,7 @@ CanvasWidgetCmd(clientData, interp, objc, objv) result = (*itemPtr->typePtr->coordProc)(interp, (Tk_Canvas) canvasPtr, itemPtr, objc-3, objv+3); } else { - CONST char **args = GetStringsFromObjs(objc-3, objv+3); + CONST char **args = TkGetStringsFromObjs(objc-3, objv+3); result = (*itemPtr->typePtr->coordProc)(interp, (Tk_Canvas) canvasPtr, itemPtr, objc-3, (Tcl_Obj **) args); if (args) ckfree((char *) args); @@ -967,7 +967,7 @@ CanvasWidgetCmd(clientData, interp, objc, objv) result = (*typePtr->createProc)(interp, (Tk_Canvas) canvasPtr, itemPtr, objc-3, objv+3); } else { - CONST char **args = GetStringsFromObjs(objc-3, objv+3); + CONST char **args = TkGetStringsFromObjs(objc-3, objv+3); result = (*typePtr->createProc)(interp, (Tk_Canvas) canvasPtr, itemPtr, objc-3, (Tcl_Obj **) args); if (args) ckfree((char *) args); @@ -1445,7 +1445,7 @@ CanvasWidgetCmd(clientData, interp, objc, objv) (Tk_Canvas) canvasPtr, itemPtr, objc-3, objv+3, TK_CONFIG_ARGV_ONLY); } else { - CONST char **args = GetStringsFromObjs(objc-3, objv+3); + CONST char **args = TkGetStringsFromObjs(objc-3, objv+3); result = (*itemPtr->typePtr->configProc)(interp, (Tk_Canvas) canvasPtr, itemPtr, objc-3, (Tcl_Obj **) args, TK_CONFIG_ARGV_ONLY); @@ -1534,7 +1534,7 @@ CanvasWidgetCmd(clientData, interp, objc, objv) break; } case CANV_POSTSCRIPT: { - CONST char **args = GetStringsFromObjs(objc, objv); + CONST char **args = TkGetStringsFromObjs(objc, objv); result = TkCanvPostscriptCmd(canvasPtr, interp, objc, args); if (args) ckfree((char *) args); break; @@ -1827,7 +1827,7 @@ CanvasWidgetCmd(clientData, interp, objc, objv) - canvasPtr->inset, canvasPtr->scrollX1, canvasPtr->scrollX2)); } else { - CONST char **args = GetStringsFromObjs(objc, objv); + CONST char **args = TkGetStringsFromObjs(objc, objv); type = Tk_GetScrollInfo(interp, objc, args, &fraction, &count); if (args) ckfree((char *) args); switch (type) { @@ -1871,7 +1871,7 @@ CanvasWidgetCmd(clientData, interp, objc, objv) - canvasPtr->inset, canvasPtr->scrollY1, canvasPtr->scrollY2)); } else { - CONST char **args = GetStringsFromObjs(objc, objv); + CONST char **args = TkGetStringsFromObjs(objc, objv); type = Tk_GetScrollInfo(interp, objc, args, &fraction, &count); if (args) ckfree((char *) args); switch (type) { @@ -5482,7 +5482,7 @@ CanvasSetOrigin(canvasPtr, xOrigin, yOrigin) /* *---------------------------------------------------------------------- * - * GetStringsFromObjs + * TkGetStringsFromObjs -- * * Results: * Converts object list into string list. @@ -5495,7 +5495,7 @@ CanvasSetOrigin(canvasPtr, xOrigin, yOrigin) */ /* ARGSUSED */ CONST char ** -GetStringsFromObjs(argc, objv) +TkGetStringsFromObjs(argc, objv) int argc; Tcl_Obj *CONST objv[]; { diff --git a/generic/tkPanedWindow.c b/generic/tkPanedWindow.c index a95514b..80e2cb8 100644 --- a/generic/tkPanedWindow.c +++ b/generic/tkPanedWindow.c @@ -12,7 +12,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkPanedWindow.c,v 1.17 2003/08/19 21:00:43 jenglish Exp $ + * RCS: @(#) $Id: tkPanedWindow.c,v 1.18 2003/09/29 23:15:19 dkf Exp $ */ #include "tkPort.h" @@ -164,7 +164,7 @@ static void PanedWindowEventProc _ANSI_ARGS_((ClientData clientData, static void ProxyWindowEventProc _ANSI_ARGS_((ClientData clientData, XEvent *eventPtr)); static void DisplayProxyWindow _ANSI_ARGS_((ClientData clientData)); -void PanedWindowWorldChanged _ANSI_ARGS_((ClientData instanceData)); +static void PanedWindowWorldChanged _ANSI_ARGS_((ClientData instanceData)); static int PanedWindowWidgetObjCmd _ANSI_ARGS_((ClientData clientData, Tcl_Interp *, int objc, Tcl_Obj * CONST objv[])); static void PanedWindowLostSlaveProc _ANSI_ARGS_((ClientData clientData, @@ -1214,7 +1214,7 @@ ConfigurePanedWindow(interp, pwPtr, objc, objv) *---------------------------------------------------------------------- */ -void +static void PanedWindowWorldChanged(instanceData) ClientData instanceData; /* Information about the paned window. */ { diff --git a/generic/tkText.h b/generic/tkText.h index d17735c..efe872d 100644 --- a/generic/tkText.h +++ b/generic/tkText.h @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkText.h,v 1.15 2003/05/27 15:35:53 vincentdarley Exp $ + * RCS: @(#) $Id: tkText.h,v 1.16 2003/09/29 23:15:20 dkf Exp $ */ #ifndef _TKTEXT @@ -950,7 +950,7 @@ EXTERN int TkTextXviewCmd _ANSI_ARGS_((TkText *textPtr, EXTERN int TkTextYviewCmd _ANSI_ARGS_((TkText *textPtr, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])); /* Use a helper from tkCanvas.c */ -EXTERN CONST char** GetStringsFromObjs _ANSI_ARGS_((int argc, +EXTERN CONST char** TkGetStringsFromObjs _ANSI_ARGS_((int argc, Tcl_Obj *CONST *objv)); # undef TCL_STORAGE_CLASS diff --git a/generic/tkTextImage.c b/generic/tkTextImage.c index a7ae581..ef3dd93 100644 --- a/generic/tkTextImage.c +++ b/generic/tkTextImage.c @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkTextImage.c,v 1.7 2003/05/19 14:37:20 dkf Exp $ + * RCS: @(#) $Id: tkTextImage.c,v 1.8 2003/09/29 23:15:20 dkf Exp $ */ #include "tk.h" @@ -314,7 +314,7 @@ EmbImageConfigure(textPtr, eiPtr, objc, objv) unsigned int len; /* length of image name */ CONST char **argv; - argv = GetStringsFromObjs(objc, objv); + argv = TkGetStringsFromObjs(objc, objv); if (Tk_ConfigureWidget(textPtr->interp, textPtr->tkwin, configSpecs, objc, argv, (char *) &eiPtr->body.ei,TK_CONFIG_ARGV_ONLY) != TCL_OK) { |