diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-02-13 16:06:04 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-02-13 16:06:04 (GMT) |
| commit | 535f5f5059e888e034ce33f8419a16b64da97e40 (patch) | |
| tree | 23e34d4147de5a2c4fa1bdf80e622d4be56af44f | |
| parent | d7b1c0dfc86c10806a92c481a75d883e1d8b1b2e (diff) | |
| parent | ed7e89f24411571343e21f08baeb35984a519c30 (diff) | |
| download | tk-535f5f5059e888e034ce33f8419a16b64da97e40.zip tk-535f5f5059e888e034ce33f8419a16b64da97e40.tar.gz tk-535f5f5059e888e034ce33f8419a16b64da97e40.tar.bz2 | |
Merge 8.6
| -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 3d68272..5138c89 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 72692fc..4ea454d 100644 --- 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), |