summaryrefslogtreecommitdiffstats
path: root/generic/tkCanvas.c
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2003-09-29 23:15:18 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2003-09-29 23:15:18 (GMT)
commitdc24f0b30e8fbb81e9012b809dae38285844a640 (patch)
tree17d2b2dbfc25eb233c8b2a045f9dbaf3c410056a /generic/tkCanvas.c
parent0f9217cf63ff7594570b15dfdd6398cda1c88d8c (diff)
downloadtk-dc24f0b30e8fbb81e9012b809dae38285844a640.zip
tk-dc24f0b30e8fbb81e9012b809dae38285844a640.tar.gz
tk-dc24f0b30e8fbb81e9012b809dae38285844a640.tar.bz2
Private functions should be either static or prefixed with 'Tk' (thanks GPS!)
Diffstat (limited to 'generic/tkCanvas.c')
-rw-r--r--generic/tkCanvas.c20
1 files changed, 10 insertions, 10 deletions
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[];
{