summaryrefslogtreecommitdiffstats
path: root/unix
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2020-10-08 17:09:44 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2020-10-08 17:09:44 (GMT)
commit19d738be7eddc36b785675d13571c353c234baa8 (patch)
treec23c596965fdc9b779b5664d8853965e1b0f08cc /unix
parent089a364ffa502039ae4d42853857206dbeddc250 (diff)
parentb65c340a10683ce423ea0d8c63b1c2af9065757f (diff)
downloadtk-19d738be7eddc36b785675d13571c353c234baa8.zip
tk-19d738be7eddc36b785675d13571c353c234baa8.tar.gz
tk-19d738be7eddc36b785675d13571c353c234baa8.tar.bz2
Merge 8.6
Diffstat (limited to 'unix')
-rw-r--r--unix/tkUnixRFont.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/unix/tkUnixRFont.c b/unix/tkUnixRFont.c
index d277db8..e10d320 100644
--- a/unix/tkUnixRFont.c
+++ b/unix/tkUnixRFont.c
@@ -671,7 +671,7 @@ TkpGetSubFonts(
void
TkpGetFontAttrsForChar(
- Tk_Window tkwin, /* Window on the font's display */
+ TCL_UNUSED(Tk_Window), /* Window on the font's display */
Tk_Font tkfont, /* Font to query */
int c, /* Character of interest */
TkFontAttributes *faPtr) /* Output: Font attributes */
@@ -682,7 +682,6 @@ TkpGetFontAttrsForChar(
/* UCS-4 character to map */
XftFont *ftFont = GetFont(fontPtr, ucs4, 0.0);
/* Actual font used to render the character */
- (void)tkwin;
GetTkFontAttributes(ftFont, faPtr);
faPtr->underline = fontPtr->font.fa.underline;