diff options
author | dgp <dgp@users.sourceforge.net> | 2002-01-17 03:35:00 (GMT) |
---|---|---|
committer | dgp <dgp@users.sourceforge.net> | 2002-01-17 03:35:00 (GMT) |
commit | e2d6df79c697064b173e14f29a157733ad3a9a6f (patch) | |
tree | 7ba4bea8b33aeafeff8e5bd19ed918e15cfec84a /generic | |
parent | ce1f89bf15dec76c7845f7678f3c12cb56e0bc4a (diff) | |
download | tk-e2d6df79c697064b173e14f29a157733ad3a9a6f.zip tk-e2d6df79c697064b173e14f29a157733ad3a9a6f.tar.gz tk-e2d6df79c697064b173e14f29a157733ad3a9a6f.tar.bz2 |
* Updated callers of Tcl_Utf* and Tcl_Regexp* APIs to reflect TIP 27
API changes (see Tcl Patch 471509). [Patch 471513]
Diffstat (limited to 'generic')
-rw-r--r-- | generic/tkCanvText.c | 5 | ||||
-rw-r--r-- | generic/tkEntry.c | 12 | ||||
-rw-r--r-- | generic/tkSelect.c | 4 | ||||
-rw-r--r-- | generic/tkText.c | 4 | ||||
-rw-r--r-- | generic/tkTextIndex.c | 6 |
5 files changed, 17 insertions, 14 deletions
diff --git a/generic/tkCanvText.c b/generic/tkCanvText.c index ef57473..f8d0d7b 100644 --- a/generic/tkCanvText.c +++ b/generic/tkCanvText.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkCanvText.c,v 1.10 2001/08/17 21:08:28 drh Exp $ + * RCS: @(#) $Id: tkCanvText.c,v 1.11 2002/01/17 03:35:00 dgp Exp $ */ #include <stdio.h> @@ -1376,7 +1376,8 @@ GetSelText(canvas, itemPtr, offset, buffer, maxBytes) { TextItem *textPtr = (TextItem *) itemPtr; int byteCount; - char *text, *selStart, *selEnd; + char *text; + CONST char *selStart, *selEnd; Tk_CanvasTextInfo *textInfoPtr = textPtr->textInfoPtr; if ((textInfoPtr->selectFirst < 0) || diff --git a/generic/tkEntry.c b/generic/tkEntry.c index 43c3429..55dc56b 100644 --- a/generic/tkEntry.c +++ b/generic/tkEntry.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: tkEntry.c,v 1.23 2001/09/21 22:08:19 hobbs Exp $ + * RCS: @(#) $Id: tkEntry.c,v 1.24 2002/01/17 03:35:00 dgp Exp $ */ #include "tkInt.h" @@ -702,7 +702,7 @@ static int EntryValidate _ANSI_ARGS_((Entry *entryPtr, static int EntryValidateChange _ANSI_ARGS_((Entry *entryPtr, char *change, char *new, int index, int type)); static void ExpandPercents _ANSI_ARGS_((Entry *entryPtr, - char *before, char *change, char *new, + CONST char *before, char *change, char *new, int index, int type, Tcl_DString *dsPtr)); static void EntryValueChanged _ANSI_ARGS_((Entry *entryPtr, char *newValue)); @@ -2955,7 +2955,8 @@ EntryFetchSelection(clientData, offset, buffer, maxBytes) { Entry *entryPtr = (Entry *) clientData; int byteCount; - char *string, *selStart, *selEnd; + char *string; + CONST char *selStart, *selEnd; if ((entryPtr->selectFirst < 0) || !(entryPtr->exportSelection)) { return -1; @@ -3526,7 +3527,8 @@ EntryValidateChange(entryPtr, change, new, index, type) static void ExpandPercents(entryPtr, before, change, new, index, type, dsPtr) register Entry *entryPtr; /* Entry that needs validation. */ - register char *before; /* Command containing percent + register CONST char *before; + /* Command containing percent * expressions to be replaced. */ char *change; /* Characters to added/deleted * (NULL-terminated string). */ @@ -3539,7 +3541,7 @@ ExpandPercents(entryPtr, before, change, new, index, type, dsPtr) int spaceNeeded, cvtFlags; /* Used to substitute string as proper Tcl * list element. */ int number, length; - register char *string; + register CONST char *string; Tcl_UniChar ch; char numStorage[2*TCL_INTEGER_SPACE]; diff --git a/generic/tkSelect.c b/generic/tkSelect.c index a8335c4..71b73d0 100644 --- a/generic/tkSelect.c +++ b/generic/tkSelect.c @@ -11,7 +11,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkSelect.c,v 1.8 2002/01/04 16:35:04 dgp Exp $ + * RCS: @(#) $Id: tkSelect.c,v 1.9 2002/01/17 03:35:00 dgp Exp $ */ #include "tkInt.h" @@ -1336,7 +1336,7 @@ HandleTclCommand(clientData, offset, buffer, maxBytes) Tcl_DString oldResult; Tcl_Obj *objPtr; int extraBytes, charOffset, count, numChars; - char *p; + CONST char *p; /* * We must also protect the interpreter and the command from being diff --git a/generic/tkText.c b/generic/tkText.c index fd76b94..cd8e78c 100644 --- a/generic/tkText.c +++ b/generic/tkText.c @@ -14,7 +14,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.c,v 1.23 2001/12/05 18:18:22 hobbs Exp $ + * RCS: @(#) $Id: tkText.c,v 1.24 2002/01/17 03:35:00 dgp Exp $ */ #include "default.h" @@ -1964,7 +1964,7 @@ TextSearchCmd(textPtr, interp, argc, argv) i = p - startOfLine; thisLength = patLength; } else { - char *start, *end; + CONST char *start, *end; int match; match = Tcl_RegExpExec(interp, regexp, diff --git a/generic/tkTextIndex.c b/generic/tkTextIndex.c index 8376419..1ee3b05 100644 --- a/generic/tkTextIndex.c +++ b/generic/tkTextIndex.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: tkTextIndex.c,v 1.3 1999/04/16 01:51:24 stanton Exp $ + * RCS: @(#) $Id: tkTextIndex.c,v 1.4 2002/01/17 03:35:00 dgp Exp $ */ #include "default.h" @@ -64,7 +64,7 @@ TkTextMakeByteIndex(tree, lineIndex, byteIndex, indexPtr) { TkTextSegment *segPtr; int index; - char *p, *start; + CONST char *p, *start; Tcl_UniChar ch; indexPtr->tree = tree; @@ -977,7 +977,7 @@ TkTextIndexBackChars(srcPtr, charCount, dstPtr) { TkTextSegment *segPtr, *oldPtr; int lineIndex, segSize; - char *p, *start, *end; + CONST char *p, *start, *end; if (charCount <= 0) { TkTextIndexForwChars(srcPtr, -charCount, dstPtr); |