diff options
| author | fvogel <fvogelnew1@free.fr> | 2019-11-01 20:57:15 (GMT) |
|---|---|---|
| committer | fvogel <fvogelnew1@free.fr> | 2019-11-01 20:57:15 (GMT) |
| commit | ff9f71c974f69fc7957ea48b687ed49aa1d2548e (patch) | |
| tree | 99f60aef70044656a3d18326129839bb63514d53 /win | |
| parent | 7843d440f23b0627f128c63a083f12c77211442f (diff) | |
| parent | c8a03246258dcb64fa73c5692e8fcfbcfef60b36 (diff) | |
| download | tk-ff9f71c974f69fc7957ea48b687ed49aa1d2548e.zip tk-ff9f71c974f69fc7957ea48b687ed49aa1d2548e.tar.gz tk-ff9f71c974f69fc7957ea48b687ed49aa1d2548e.tar.bz2 | |
merge core-8-6-branch, in particular, push a different fix for the 'Column ... out of range' error reported in [caacf1f082], this time without any regression...
Diffstat (limited to 'win')
| -rw-r--r-- | win/tkWinFont.c | 2 | ||||
| -rw-r--r-- | win/tkWinKey.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/win/tkWinFont.c b/win/tkWinFont.c index 11385ed..e4f0624 100644 --- a/win/tkWinFont.c +++ b/win/tkWinFont.c @@ -2232,7 +2232,7 @@ FontMapLoadPage( end = (row + 1) << FONTMAP_SHIFT; for (i = row << FONTMAP_SHIFT; i < end; i++) { if (Tcl_UtfToExternal(NULL, encoding, src, - Tcl_UniCharToUtf(i, src), TCL_ENCODING_STOPONERROR, NULL, + TkUniCharToUtf(i, src), TCL_ENCODING_STOPONERROR, NULL, buf, sizeof(buf), NULL, NULL, NULL) != TCL_OK) { continue; } diff --git a/win/tkWinKey.c b/win/tkWinKey.c index c3816bf..8a83874 100644 --- a/win/tkWinKey.c +++ b/win/tkWinKey.c @@ -124,7 +124,7 @@ TkpGetString( if (((keysym != NoSymbol) && (keysym > 0) && (keysym < 256)) || (keysym == XK_Return) || (keysym == XK_Tab)) { - len = Tcl_UniCharToUtf(keysym & 255, buf); + len = TkUniCharToUtf(keysym & 255, buf); Tcl_DStringAppend(dsPtr, buf, len); } } |