diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-12-04 23:11:16 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-12-04 23:11:16 (GMT) |
| commit | de1031fb6be21ea195cf59b90028d18329175eac (patch) | |
| tree | 9d94456c98c934ed041fc78ae4540fc01475f55e | |
| parent | 5d520c9fa3ed9d7c13c10e66301a4a90ee61fce1 (diff) | |
| download | tk-de1031fb6be21ea195cf59b90028d18329175eac.zip tk-de1031fb6be21ea195cf59b90028d18329175eac.tar.gz tk-de1031fb6be21ea195cf59b90028d18329175eac.tar.bz2 | |
Use Tcl_UtfToChar16DString() in stead of Tcl_UtfToUniCharDString(), since the first is guaranteed to be 16-bit for any TCL_UTF_MAX value.
| -rw-r--r-- | generic/tkInt.h | 2 | ||||
| -rw-r--r-- | macosx/tkMacOSXFont.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/generic/tkInt.h b/generic/tkInt.h index 282ac8f..7ef7862 100644 --- a/generic/tkInt.h +++ b/generic/tkInt.h @@ -69,6 +69,8 @@ #if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION < 7) # define Tcl_WCharToUtfDString Tcl_UniCharToUtfDString # define Tcl_UtfToWCharDString Tcl_UtfToUniCharDString +# define Tcl_Char16ToUtfDString Tcl_UniCharToUtfDString +# define Tcl_UtfToChar16DString Tcl_UtfToUniCharDString #endif /* diff --git a/macosx/tkMacOSXFont.c b/macosx/tkMacOSXFont.c index a402345..6cc5da2 100644 --- a/macosx/tkMacOSXFont.c +++ b/macosx/tkMacOSXFont.c @@ -135,7 +135,7 @@ TkUtfToNSString( Tcl_DString ds; Tcl_DStringInit(&ds); - Tcl_UtfToUniCharDString(source, numBytes, &ds); + Tcl_UtfToChar16DString(source, numBytes, &ds); string = [[NSString alloc] initWithCharacters:(const unichar *)Tcl_DStringValue(&ds) length:(Tcl_DStringLength(&ds)>>1)]; Tcl_DStringFree(&ds); |