diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-09-29 12:38:54 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-09-29 12:38:54 (GMT) |
| commit | 5020e5e41bb04e9bde15b10902c3dd8edcf0b1eb (patch) | |
| tree | 27b23d9828d8e560c051b9ff8b3130101c014b23 /generic/tkEntry.c | |
| parent | 5ae24215a70e8cd5bdbd14ad619bd4230bd22f9a (diff) | |
| parent | 4c158f250ca869188d30dcf7628676f0b0de236f (diff) | |
| download | tk-5020e5e41bb04e9bde15b10902c3dd8edcf0b1eb.zip tk-5020e5e41bb04e9bde15b10902c3dd8edcf0b1eb.tar.gz tk-5020e5e41bb04e9bde15b10902c3dd8edcf0b1eb.tar.bz2 | |
Fix [6c0d7aec67]: unicode text input Windows 8
Diffstat (limited to 'generic/tkEntry.c')
| -rw-r--r-- | generic/tkEntry.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/generic/tkEntry.c b/generic/tkEntry.c index a66cf18..acfdd31 100644 --- a/generic/tkEntry.c +++ b/generic/tkEntry.c @@ -1926,8 +1926,8 @@ EntryComputeGeometry( */ if (entryPtr->showChar != NULL) { - Tcl_UniChar ch; - char buf[4]; + int ch; + char buf[6]; int size; /* @@ -1937,8 +1937,8 @@ EntryComputeGeometry( * resulting string. */ - Tcl_UtfToUniChar(entryPtr->showChar, &ch); - size = Tcl_UniCharToUtf(ch, buf); + TkUtfToUniChar(entryPtr->showChar, &ch); + size = TkUniCharToUtf(ch, buf); entryPtr->numDisplayBytes = entryPtr->numChars * size; p = ckalloc(entryPtr->numDisplayBytes + 1); @@ -3414,7 +3414,7 @@ ExpandPercents( * list element. */ int number, length; register const char *string; - Tcl_UniChar ch; + int ch; char numStorage[2*TCL_INTEGER_SPACE]; while (1) { @@ -3447,7 +3447,7 @@ ExpandPercents( before++; /* skip over % */ if (*before != '\0') { - before += Tcl_UtfToUniChar(before, &ch); + before += TkUtfToUniChar(before, &ch); } else { ch = '%'; } @@ -3467,7 +3467,7 @@ ExpandPercents( string = Tk_PathName(entryPtr->tkwin); break; default: - length = Tcl_UniCharToUtf(ch, numStorage); + length = TkUniCharToUtf(ch, numStorage); numStorage[length] = '\0'; string = numStorage; break; @@ -3527,7 +3527,7 @@ ExpandPercents( string = Tk_PathName(entryPtr->tkwin); break; default: - length = Tcl_UniCharToUtf(ch, numStorage); + length = TkUniCharToUtf(ch, numStorage); numStorage[length] = '\0'; string = numStorage; break; |