]> git.saurik.com Git - wxWidgets.git/commitdiff
Round font sizes in AdjustToSymbolicSize() instead of truncating.
authorVadim Zeitlin <vadim@wxwidgets.org>
Thu, 16 Jun 2011 15:13:49 +0000 (15:13 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Thu, 16 Jun 2011 15:13:49 +0000 (15:13 +0000)
This was mainly done to suppress g++ warning about implicit float to int
conversion but it also seems to make more sense to round the value here
instead of truncating it to int.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67960 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/common/fontcmn.cpp

index 1bc3151fcbb2f1e935ceb9488304deec0e1ab1a4..d54521c449fa92cf323fa2c009eb4f2dd5ca09c6 100644 (file)
@@ -29,6 +29,7 @@
 #ifndef WX_PRECOMP
     #include "wx/dc.h"
     #include "wx/intl.h"
+    #include "wx/math.h"
     #include "wx/dcscreen.h"
     #include "wx/log.h"
     #include "wx/gdicmn.h"
@@ -511,7 +512,7 @@ int wxFontBase::AdjustToSymbolicSize(wxFontSymbolicSize size, int base)
         WrongFontSizeFactorsSize
     );
 
-    return factors[size - wxFONTSIZE_XX_SMALL]*base;
+    return wxRound(factors[size - wxFONTSIZE_XX_SMALL]*base);
 }
 
 wxFont& wxFont::MakeBold()