summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--generic/tkInt.h2
-rw-r--r--macosx/tkMacOSXFont.c2
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);