diff options
author | fvogel <fvogelnew1@free.fr> | 2016-08-29 15:28:20 (GMT) |
---|---|---|
committer | fvogel <fvogelnew1@free.fr> | 2016-08-29 15:28:20 (GMT) |
commit | 992eb3df2d03dec6291784e8dca7e6d85b279c7a (patch) | |
tree | c885db53fd7bd38e3971e2b93242b2e798961ee9 /macosx/tkMacOSXFont.c | |
parent | 1052e56fe96f3ece407a6374714af0302c9a5e3c (diff) | |
parent | 76052445ac39afd2c455431d80335dd464ed755e (diff) | |
download | tk-tip_449.zip tk-tip_449.tar.gz tk-tip_449.tar.bz2 |
Rebased to trunk since TIP #449 was accepted for merging to trunk only, not to core-8-6-branchtip_449
Diffstat (limited to 'macosx/tkMacOSXFont.c')
-rw-r--r-- | macosx/tkMacOSXFont.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/macosx/tkMacOSXFont.c b/macosx/tkMacOSXFont.c index c48e56e..d3e0e41 100644 --- a/macosx/tkMacOSXFont.c +++ b/macosx/tkMacOSXFont.c @@ -672,14 +672,14 @@ void TkpGetFontAttrsForChar( Tk_Window tkwin, /* Window on the font's display */ Tk_Font tkfont, /* Font to query */ - Tcl_UniChar c, /* Character of interest */ + int c, /* Character of interest */ TkFontAttributes* faPtr) /* Output: Font attributes */ { MacFont *fontPtr = (MacFont *) tkfont; NSFont *nsFont = fontPtr->nsFont; *faPtr = fontPtr->font.fa; if (nsFont && ![[nsFont coveredCharacterSet] characterIsMember:c]) { - UTF16Char ch = c; + UTF16Char ch = (UTF16Char) c; nsFont = [nsFont bestMatchingFontForCharacters:&ch length:1 attributes:nil actualCoveredLength:NULL]; |