diff options
| author | culler <culler> | 2019-07-01 20:04:13 (GMT) |
|---|---|---|
| committer | culler <culler> | 2019-07-01 20:04:13 (GMT) |
| commit | 0b5d89c392a4d6e49fabdf2f4be45ee6ae561545 (patch) | |
| tree | 872ae23a58fda232931ced16a79def4f9862dae1 /win | |
| parent | fb38383a729f6ef159fb0f6a89f6b269d9331e5e (diff) | |
| parent | 4d37dc35b57252cbd904008b843dce0354c01669 (diff) | |
| download | tk-0b5d89c392a4d6e49fabdf2f4be45ee6ae561545.zip tk-0b5d89c392a4d6e49fabdf2f4be45ee6ae561545.tar.gz tk-0b5d89c392a4d6e49fabdf2f4be45ee6ae561545.tar.bz2 | |
merge 8.6
Diffstat (limited to 'win')
| -rw-r--r-- | win/tkWinX.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/win/tkWinX.c b/win/tkWinX.c index 75064b5..e7428e5 100644 --- a/win/tkWinX.c +++ b/win/tkWinX.c @@ -1594,7 +1594,10 @@ Tcl_Encoding TkWinGetUnicodeEncoding(void) { if (unicodeEncoding == NULL) { - unicodeEncoding = Tcl_GetEncoding(NULL, "unicode"); + unicodeEncoding = Tcl_GetEncoding(NULL, "utf-16"); + if (unicodeEncoding == NULL) { + unicodeEncoding = Tcl_GetEncoding(NULL, "unicode"); + } } return unicodeEncoding; } |