diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-02-13 15:07:23 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-02-13 15:07:23 (GMT) |
| commit | ed7e89f24411571343e21f08baeb35984a519c30 (patch) | |
| tree | 824ba4600b5dfa23ae341e1d9fd5393133c01fad | |
| parent | 35a1e14c068ac924f1b2e74474e535cafc86f2a0 (diff) | |
| download | tk-ed7e89f24411571343e21f08baeb35984a519c30.zip tk-ed7e89f24411571343e21f08baeb35984a519c30.tar.gz tk-ed7e89f24411571343e21f08baeb35984a519c30.tar.bz2 | |
Fix compilation warning with -DDEBUG_FONTSEL
| -rw-r--r-- | library/ttk/fonts.tcl | 3 | ||||
| -rw-r--r-- | 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), |