summaryrefslogtreecommitdiffstats
path: root/macosx
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2017-05-19 12:57:59 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2017-05-19 12:57:59 (GMT)
commit8f56293a6faf629fa90092d966ad634247c76389 (patch)
tree5db13901c256ec3f40b154b0af58944cef02c52c /macosx
parentbfa63c7740a0f5a2251012014fd7f2b67d3389b9 (diff)
parent2ff5fda0fe162179358a1fdd26adefa380b72286 (diff)
downloadtk-8f56293a6faf629fa90092d966ad634247c76389.zip
tk-8f56293a6faf629fa90092d966ad634247c76389.tar.gz
tk-8f56293a6faf629fa90092d966ad634247c76389.tar.bz2
merge core-8-6-branch
Diffstat (limited to 'macosx')
-rw-r--r--macosx/tkMacOSXFont.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/macosx/tkMacOSXFont.c b/macosx/tkMacOSXFont.c
index b5ae1a3..fd4c19a 100644
--- a/macosx/tkMacOSXFont.c
+++ b/macosx/tkMacOSXFont.c
@@ -515,7 +515,7 @@ TkpGetFontFromAttributes(
/* Set of attributes to match. */
{
MacFont *fontPtr;
- int points = TkFontGetPoints(tkwin, faPtr->size);
+ int points = (int)(TkFontGetPoints(tkwin, faPtr->size) + 0.5);
NSFontTraitMask traits = GetNSFontTraitsFromTkFontAttributes(faPtr);
NSInteger weight = (faPtr->weight == TK_FW_BOLD ? 9 : 5);
NSFont *nsFont;