diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-03-16 09:37:12 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-03-16 09:37:12 (GMT) |
| commit | 2b27bfdd758f6c35adfaf96148424d06f51c9292 (patch) | |
| tree | 7465ca15ecd709c305220786dadca2fa2b2acc90 /macosx | |
| parent | d7f29e1ccf269fa5f4cb2cd8d02f35193ebc67be (diff) | |
| download | tk-2b27bfdd758f6c35adfaf96148424d06f51c9292.zip tk-2b27bfdd758f6c35adfaf96148424d06f51c9292.tar.gz tk-2b27bfdd758f6c35adfaf96148424d06f51c9292.tar.bz2 | |
Make Tk compile warning-free against TIP-389-enabled Tcl 8.7. No change of functionality, since font-names generally don't contain out-of-BMP Unicode characters (if they do in the future, that still can be fixed then).
Diffstat (limited to 'macosx')
| -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]; |