X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/eb00016c5abd4ffe052418ddcc4e9d253212bb47..e9e8b38179b147dd04f5c19af7e56a94342e93a7:/include/wx/math.h diff --git a/include/wx/math.h b/include/wx/math.h index 19518085f1..33831c274d 100644 --- a/include/wx/math.h +++ b/include/wx/math.h @@ -115,7 +115,7 @@ inline int wxRound(double x) { wxASSERT_MSG( x > INT_MIN - 0.5 && x < INT_MAX + 0.5, - _T("argument out of supported range") ); + wxT("argument out of supported range") ); #if defined(HAVE_ROUND) return int(round(x)); @@ -128,10 +128,8 @@ #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