summaryrefslogtreecommitdiffstats
path: root/unix
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2024-02-14 19:20:53 (GMT)
committerdgp <dgp@users.sourceforge.net>2024-02-14 19:20:53 (GMT)
commit53fd6ab12c50c4fa944e381ab5a42abfab47ae3e (patch)
tree939d8e255854e1e239fbb88a9734cb76b399682e /unix
parentdafa8ea8fa9fe5d143fd60577da7feb0e4be72bb (diff)
parented7e89f24411571343e21f08baeb35984a519c30 (diff)
downloadtk-53fd6ab12c50c4fa944e381ab5a42abfab47ae3e.zip
tk-53fd6ab12c50c4fa944e381ab5a42abfab47ae3e.tar.gz
tk-53fd6ab12c50c4fa944e381ab5a42abfab47ae3e.tar.bz2
merge 8.6
Diffstat (limited to 'unix')
-rw-r--r--unix/tkUnixRFont.c6
1 files changed, 3 insertions, 3 deletions
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),