diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-03-14 08:32:07 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-03-14 08:32:07 (GMT) |
commit | fa083c8aaf7ff3d22de606e25adb0b598dba0dd6 (patch) | |
tree | 51134cd671ebf8759cc2b4ff148cd7d9d3797725 /generic/tkEntry.c | |
parent | 6eb17d212faf798cf9cd89c85467d8f8893ca614 (diff) | |
download | tk-fa083c8aaf7ff3d22de606e25adb0b598dba0dd6.zip tk-fa083c8aaf7ff3d22de606e25adb0b598dba0dd6.tar.gz tk-fa083c8aaf7ff3d22de606e25adb0b598dba0dd6.tar.bz2 |
Better approach, using "Tk" prefix for UTF-32 versions of API
Diffstat (limited to 'generic/tkEntry.c')
-rw-r--r-- | generic/tkEntry.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/generic/tkEntry.c b/generic/tkEntry.c index dfb2ce2..404836c 100644 --- a/generic/tkEntry.c +++ b/generic/tkEntry.c @@ -2164,7 +2164,7 @@ InsertChars( char *newStr; string = entryPtr->string; - byteIndex = Tcl_UtfAtIndex(string, index) - string; + byteIndex = TkUtfAtIndex(string, index) - string; byteCount = strlen(value); if (byteCount == 0) { return TCL_OK; @@ -2197,7 +2197,7 @@ InsertChars( */ oldChars = entryPtr->numChars; - entryPtr->numChars = Tcl_NumUtfChars(newStr, TCL_INDEX_NONE); + entryPtr->numChars = TkNumUtfChars(newStr, TCL_INDEX_NONE); charsAdded = entryPtr->numChars - oldChars; entryPtr->numBytes += byteCount; @@ -2268,8 +2268,8 @@ DeleteChars( } string = entryPtr->string; - byteIndex = Tcl_UtfAtIndex(string, index) - string; - byteCount = Tcl_UtfAtIndex(string + byteIndex, count) - (string+byteIndex); + byteIndex = TkUtfAtIndex(string, index) - string; + byteCount = TkUtfAtIndex(string + byteIndex, count) - (string+byteIndex); newByteCount = entryPtr->numBytes + 1 - byteCount; newStr = (char *)ckalloc(newByteCount); @@ -2497,7 +2497,7 @@ EntrySetValue( entryPtr->string = tmp; } entryPtr->numBytes = valueLen; - entryPtr->numChars = Tcl_NumUtfChars(value, valueLen); + entryPtr->numChars = TkNumUtfChars(value, valueLen); if (entryPtr->displayString == oldSource) { entryPtr->displayString = entryPtr->string; @@ -2927,8 +2927,8 @@ EntryFetchSelection( return -1; } string = entryPtr->displayString; - selStart = Tcl_UtfAtIndex(string, entryPtr->selectFirst); - selEnd = Tcl_UtfAtIndex(selStart, + selStart = TkUtfAtIndex(string, entryPtr->selectFirst); + selEnd = TkUtfAtIndex(selStart, entryPtr->selectLast - entryPtr->selectFirst); if (selEnd <= selStart + offset) { return 0; |