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/ttk | |
| 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/ttk')
| -rw-r--r-- | generic/ttk/ttkEntry.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/generic/ttk/ttkEntry.c b/generic/ttk/ttkEntry.c index d80e1fd..a25574a 100644 --- a/generic/ttk/ttkEntry.c +++ b/generic/ttk/ttkEntry.c @@ -282,11 +282,11 @@ static char *EntryDisplayString(const char *showChar, int numChars) { char *displayString, *p; int size; - Tcl_UniChar ch; - char buf[4]; + int ch; + char buf[6]; - Tcl_UtfToUniChar(showChar, &ch); - size = Tcl_UniCharToUtf(ch, buf); + TkUtfToUniChar(showChar, &ch); + size = TkUniCharToUtf(ch, buf); p = displayString = ckalloc(numChars * size + 1); while (numChars--) { @@ -406,7 +406,7 @@ ExpandPercents( int number, length; const char *string; int stringLength; - Tcl_UniChar ch; + int ch; char numStorage[2*TCL_INTEGER_SPACE]; while (*template) { @@ -430,7 +430,7 @@ ExpandPercents( */ ++template; /* skip over % */ if (*template != '\0') { - template += Tcl_UtfToUniChar(template, &ch); + template += TkUtfToUniChar(template, &ch); } else { ch = '%'; } @@ -480,7 +480,7 @@ ExpandPercents( string = Tk_PathName(entryPtr->core.tkwin); break; default: - length = Tcl_UniCharToUtf(ch, numStorage); + length = TkUniCharToUtf(ch, numStorage); numStorage[length] = '\0'; string = numStorage; break; |