diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-11-15 20:25:46 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-11-15 20:25:46 (GMT) |
| commit | 3c6f53cb71429832fe49f7c987955e4d31c5de1b (patch) | |
| tree | 9998b7eefaf838d5d4013f48e5d84f9af4d0bc01 /win | |
| parent | 3b704f9324a447a8eb37aee870bb3f1a9d8a7426 (diff) | |
| parent | ebac6eafdd16d8e1b81b3ea2b10149cb158faac2 (diff) | |
| download | tk-3c6f53cb71429832fe49f7c987955e4d31c5de1b.zip tk-3c6f53cb71429832fe49f7c987955e4d31c5de1b.tar.gz tk-3c6f53cb71429832fe49f7c987955e4d31c5de1b.tar.bz2 | |
Don't use TCL_ENCODING_STOPONERROR any more, it's TCL_ENCODING_PROFILE_STRICT now
Diffstat (limited to 'win')
| -rw-r--r-- | win/tkWinDialog.c | 6 | ||||
| -rw-r--r-- | win/tkWinFont.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/win/tkWinDialog.c b/win/tkWinDialog.c index 5bbd0f2..50402a8 100644 --- a/win/tkWinDialog.c +++ b/win/tkWinDialog.c @@ -1085,9 +1085,9 @@ ParseOFNOptions( if (Tcl_TranslateFileName(interp, string, &ds) == NULL) goto error_return; Tcl_UtfToExternal(NULL, TkWinGetUnicodeEncoding(), - Tcl_DStringValue(&ds), Tcl_DStringLength(&ds), 0, NULL, - (char *) &optsPtr->file[0], sizeof(optsPtr->file), - NULL, NULL, NULL); + Tcl_DStringValue(&ds), Tcl_DStringLength(&ds), + TCL_ENCODING_PROFILE_TCL8, NULL, (char *)&optsPtr->file[0], + sizeof(optsPtr->file), NULL, NULL, NULL); Tcl_DStringFree(&ds); break; case FILE_PARENT: diff --git a/win/tkWinFont.c b/win/tkWinFont.c index f9f5131..dc74aea 100644 --- a/win/tkWinFont.c +++ b/win/tkWinFont.c @@ -909,7 +909,7 @@ Tk_MeasureChars( for (p = start; p < end; ) { next = p + TkUtfToUniChar(p, &ch); Tcl_UtfToExternal(NULL, familyPtr->encoding, p, - (int) (next - p), 0, NULL, buf, sizeof(buf), NULL, + (int) (next - p), TCL_ENCODING_PROFILE_TCL8, NULL, buf, sizeof(buf), NULL, &dstWrote, NULL); Tcl_DStringAppend(&runString,buf,dstWrote); size.cx = 0; @@ -2262,7 +2262,7 @@ FontMapLoadPage( end = (row + 1) << FONTMAP_SHIFT; for (i = row << FONTMAP_SHIFT; i < end; i++) { if (Tcl_UtfToExternal(NULL, encoding, src, - TkUniCharToUtf(i, src), TCL_ENCODING_STOPONERROR, NULL, + TkUniCharToUtf(i, src), TCL_ENCODING_PROFILE_STRICT, NULL, buf, sizeof(buf), NULL, NULL, NULL) != TCL_OK) { continue; } |