diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-10-08 17:09:44 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-10-08 17:09:44 (GMT) |
| commit | 19d738be7eddc36b785675d13571c353c234baa8 (patch) | |
| tree | c23c596965fdc9b779b5664d8853965e1b0f08cc | |
| parent | 089a364ffa502039ae4d42853857206dbeddc250 (diff) | |
| parent | b65c340a10683ce423ea0d8c63b1c2af9065757f (diff) | |
| download | tk-19d738be7eddc36b785675d13571c353c234baa8.zip tk-19d738be7eddc36b785675d13571c353c234baa8.tar.gz tk-19d738be7eddc36b785675d13571c353c234baa8.tar.bz2 | |
Merge 8.6
| -rw-r--r-- | unix/tkUnixRFont.c | 3 |
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; |