summaryrefslogtreecommitdiffstats
path: root/generic/tkTextDisp.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2016-09-16 12:17:59 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2016-09-16 12:17:59 (GMT)
commit7a5d64437977cc14b7b79e336b3b2a20785348e5 (patch)
tree7a98c5e25eb278af7eb4c7fa58ab73d819c2c739 /generic/tkTextDisp.c
parent41d3c8f67e62fe307c46c91e5a42b71e39c59334 (diff)
downloadtk-7a5d64437977cc14b7b79e336b3b2a20785348e5.zip
tk-7a5d64437977cc14b7b79e336b3b2a20785348e5.tar.gz
tk-7a5d64437977cc14b7b79e336b3b2a20785348e5.tar.bz2
Rename TkUtfToUniChar32 to TkUtfToUniChar2, and various simplifications needing less #ifdef's
Diffstat (limited to 'generic/tkTextDisp.c')
-rw-r--r--generic/tkTextDisp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/generic/tkTextDisp.c b/generic/tkTextDisp.c
index 5faab36..026023e 100644
--- a/generic/tkTextDisp.c
+++ b/generic/tkTextDisp.c
@@ -7581,8 +7581,8 @@ TkTextCharLayoutProc(
if (bytesThatFit < maxBytes) {
if ((bytesThatFit == 0) && noCharsYet) {
- Tcl_UniChar ch;
- int chLen = Tcl_UtfToUniChar(p, &ch);
+ int ch;
+ int chLen = TkUtfToUniChar2(p, &ch);
#if TK_LAYOUT_WITH_BASE_CHUNKS
bytesThatFit = CharChunkMeasureChars(chunkPtr, line,