diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-09-19 10:14:52 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-09-19 10:14:52 (GMT) |
| commit | bdb580aa2563588e6e1f5090bb9b89369e2f2d4f (patch) | |
| tree | 011764b9a1c9b1b47f5d61b56f1627526961f832 /win/tkWinFont.c | |
| parent | 7a5d64437977cc14b7b79e336b3b2a20785348e5 (diff) | |
| download | tk-bdb580aa2563588e6e1f5090bb9b89369e2f2d4f.zip tk-bdb580aa2563588e6e1f5090bb9b89369e2f2d4f.tar.gz tk-bdb580aa2563588e6e1f5090bb9b89369e2f2d4f.tar.bz2 | |
More simplifications
Diffstat (limited to 'win/tkWinFont.c')
| -rw-r--r-- | win/tkWinFont.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/win/tkWinFont.c b/win/tkWinFont.c index 30638ca..7c6c0ba 100644 --- a/win/tkWinFont.c +++ b/win/tkWinFont.c @@ -858,7 +858,7 @@ Tk_MeasureChars( start = source; end = start + numBytes; for (p = start; p < end; ) { - next = p + TkUtfToUniChar2(p, &ch); + next = p + TkUtfToUniChar(p, &ch); thisSubFontPtr = FindSubFontForChar(fontPtr, ch, &lastSubFontPtr); if (thisSubFontPtr != lastSubFontPtr) { familyPtr = lastSubFontPtr->familyPtr; @@ -920,7 +920,7 @@ Tk_MeasureChars( familyPtr = lastSubFontPtr->familyPtr; Tcl_DStringInit(&runString); for (p = start; p < end; ) { - next = p + TkUtfToUniChar2(p, &ch); + next = p + TkUtfToUniChar(p, &ch); Tcl_UtfToExternal(NULL, familyPtr->encoding, p, (int) (next - p), 0, NULL, buf, sizeof(buf), NULL, &dstWrote, NULL); @@ -975,7 +975,7 @@ Tk_MeasureChars( p = source; ch = ' '; while (p < end) { - next = p + TkUtfToUniChar2(p, &ch2); + next = p + TkUtfToUniChar(p, &ch2); if ((ch != ' ') && (ch2 == ' ')) { lastWordBreak = p; } @@ -1457,7 +1457,7 @@ MultiFontTextOut( end = source + numBytes; for (p = source; p < end; ) { - next = p + TkUtfToUniChar2(p, &ch); + next = p + TkUtfToUniChar(p, &ch); thisSubFontPtr = FindSubFontForChar(fontPtr, ch, &lastSubFontPtr); if (thisSubFontPtr != lastSubFontPtr) { if (p > source) { |