diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-05-18 12:19:10 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-05-18 12:19:10 (GMT) |
| commit | 87d12d1ccc63df37fd805599bf29388c1d164e36 (patch) | |
| tree | 3f3352b166163e06c4fa6d647bc34651c34bc1a1 /generic | |
| parent | bb089fa3ae014082fd1642a5c932f8c0c7422924 (diff) | |
| parent | 6409149a9a89dbed7c247ed2b0e7e4317277da4a (diff) | |
| download | tk-87d12d1ccc63df37fd805599bf29388c1d164e36.zip tk-87d12d1ccc63df37fd805599bf29388c1d164e36.tar.gz tk-87d12d1ccc63df37fd805599bf29388c1d164e36.tar.bz2 | |
merge trunk.
Make "font actual" return integers, for compatibility.
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tkFont.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/generic/tkFont.c b/generic/tkFont.c index 9a70a65..7b6a759 100644 --- a/generic/tkFont.c +++ b/generic/tkFont.c @@ -3501,7 +3501,11 @@ GetAttributeInfoObj( break; case FONT_SIZE: - valuePtr = Tcl_NewDoubleObj(faPtr->size); + if (faPtr->size >= 0.0) { + valuePtr = Tcl_NewIntObj((int)(faPtr->size + 0.5)); + } else { + valuePtr = Tcl_NewIntObj(-(int)(-faPtr->size + 0.5)); + } break; case FONT_WEIGHT: |