summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2020-05-18 21:08:06 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2020-05-18 21:08:06 (GMT)
commit7f88ead86800c2b727d5d8c89c970a9506f92372 (patch)
tree0bf449b343d012b9b621e613fcc17a7ccbc404bf /win
parente1536be3400277b049bebfe6c91b24db95b93cbf (diff)
parent1d435ce1f0cd4775332957c719ee82d78bf926b7 (diff)
downloadtk-7f88ead86800c2b727d5d8c89c970a9506f92372.zip
tk-7f88ead86800c2b727d5d8c89c970a9506f92372.tar.gz
tk-7f88ead86800c2b727d5d8c89c970a9506f92372.tar.bz2
Merge 8.6
Diffstat (limited to 'win')
-rw-r--r--win/tkWinX.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/win/tkWinX.c b/win/tkWinX.c
index 3a55c0c..661ad29 100644
--- a/win/tkWinX.c
+++ b/win/tkWinX.c
@@ -1516,7 +1516,11 @@ UpdateInputLanguage(
return;
}
- sprintf(codepage, "cp%d", charsetInfo.ciACP);
+ if (charsetInfo.ciACP == CP_UTF8) {
+ strcpy(codepage, "utf-8");
+ } else {
+ sprintf(codepage, "cp%d", charsetInfo.ciACP);
+ }
if ((encoding = Tcl_GetEncoding(NULL, codepage)) == NULL) {
/*