Missing needed TCL_COMBINE flag (only really needed when running with…

… Tcl 9.0)
tcltk · Nov 30, 2023 · 8fd51a3 · 8fd51a3
1 parent 226daa1
commit 8fd51a3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/generic/tkInt.h b/generic/tkInt.h
@@ -80,6 +80,7 @@
 # define Tcl_UtfToWCharDString ((WCHAR * (*)(const char *, int len, Tcl_DString *))Tcl_UtfToUniCharDString)
 # define Tcl_Char16ToUtfDString Tcl_UniCharToUtfDString
 # define Tcl_UtfToChar16DString Tcl_UtfToUniCharDString
+# define TCL_COMBINE		0
 #endif
 
 #if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)

diff --git a/macosx/tkMacOSXFont.c b/macosx/tkMacOSXFont.c
@@ -164,7 +164,7 @@ static int		CreateNamedSystemFont(Tcl_Interp *interp,
 	Tcl_DStringSetLength(&_ds, 3 * [_string length]);
 	p = Tcl_DStringValue(&_ds);
 	for (index = 0; index < [_string length]; index++) {
-	    p += Tcl_UniCharToUtf([_string characterAtIndex: index], p);
+	    p += Tcl_UniCharToUtf([_string characterAtIndex: index]|TCL_COMBINE, p);
 	}
 	Tcl_DStringSetLength(&_ds, (Tcl_Size)(p - Tcl_DStringValue(&_ds)));
     }