From ed7e89f24411571343e21f08baeb35984a519c30 Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Tue, 13 Feb 2024 15:07:23 +0000 Subject: Fix compilation warning with -DDEBUG_FONTSEL --- library/ttk/fonts.tcl | 3 --- unix/tkUnixRFont.c | 6 +++--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/library/ttk/fonts.tcl b/library/ttk/fonts.tcl index bf4ccd0..4f735a8 100644 --- 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 index 2c017e2..baf9071 100644 --- a/unix/tkUnixRFont.c +++ b/unix/tkUnixRFont.c @@ -498,7 +498,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) { @@ -941,7 +941,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), @@ -1200,7 +1200,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), -- cgit v0.12