Merge 8.6

tcltk · Feb 13, 2024 · 535f5f5 · 535f5f5
2 parents d7b1c0d + ed7e89f
commit 535f5f5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/library/ttk/fonts.tcl b/library/ttk/fonts.tcl
@@ -45,9 +45,6 @@
 #	There does not appear to be any recommendations for fixed-width fonts.
 #
 # X11:
-#	Need a way to tell if Xft is enabled or not.
-#	For now, assume patch #971980 applied.
-#
 #	"Classic" look used Helvetica bold for everything except
 #	for entry widgets, which use Helvetica medium.
 #	Most other toolkits use medium weight for all UI elements,

diff --git a/unix/tkUnixRFont.c b/unix/tkUnixRFont.c
@@ -505,7 +505,7 @@ TkpGetFontFromAttributes(
 
 #ifdef DEBUG_FONTSEL
     printf("TkpGetFontFromAttributes %s-%d %d %d\n", faPtr->family,
-	    faPtr->size, faPtr->weight, faPtr->slant);
+	    (int)faPtr->size, faPtr->weight, faPtr->slant);
 #endif /* DEBUG_FONTSEL */
     pattern = XftPatternCreate();
     if (faPtr->family) {
@@ -949,7 +949,7 @@ Tk_DrawChars(
 
     if (fontPtr->ftDraw == 0) {
 #ifdef DEBUG_FONTSEL
-	printf("Switch to drawable 0x%x\n", drawable);
+	printf("Switch to drawable 0x%lx\n", drawable);
 #endif /* DEBUG_FONTSEL */
 	fontPtr->ftDraw = XftDrawCreate(display, drawable,
 		DefaultVisual(display, fontPtr->screen),
@@ -1209,7 +1209,7 @@ TkDrawAngledChars(
 
     if (fontPtr->ftDraw == 0) {
 #ifdef DEBUG_FONTSEL
-	printf("Switch to drawable 0x%x\n", drawable);
+	printf("Switch to drawable 0x%lx\n", drawable);
 #endif /* DEBUG_FONTSEL */
 	fontPtr->ftDraw = XftDrawCreate(display, drawable,
 		DefaultVisual(display, fontPtr->screen),