]> git.saurik.com Git - wxWidgets.git/commitdiff
Fix wxMulDivInt32() to round the result like win32 MulDiv() does.
authorVáclav Slavík <vslavik@fastmail.fm>
Tue, 19 Jan 2010 22:02:59 +0000 (22:02 +0000)
committerVáclav Slavík <vslavik@fastmail.fm>
Tue, 19 Jan 2010 22:02:59 +0000 (22:02 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63194 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/math.h

index a17bb9d092653f26f3a37b660a48826df9845e15..33831c274df6f4f12653e54e0b0c24e3f26ef7a8 100644 (file)
 
 #if defined(__WXMSW__) && !defined(__WXWINCE__)
     #define wxMulDivInt32( a , b , c ) ::MulDiv( a , b , c )
-#elif defined( __WXMAC__ )
-    #define wxMulDivInt32( a , b , c ) ( (wxInt32) ( ( (wxInt64)(a) * (wxInt64)(b) ) / (wxInt64)(c) ) )
 #else
-    #define wxMulDivInt32( a , b , c ) ((wxInt32)((a)*(((wxDouble)b)/((wxDouble)c))))
+    #define wxMulDivInt32( a , b , c ) (wxRound((a)*(((wxDouble)b)/((wxDouble)c))))
 #endif
 
 #if wxUSE_APPLE_IEEE