From d60f101215d8a454cad75cb9365d894e2cc43709 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Sun, 13 Jan 2002 17:56:22 +0000 Subject: [PATCH] changed the MulDiv Macro removing macheader dep. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13550 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/geometry.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/include/wx/geometry.h b/include/wx/geometry.h index 0aafb0f855..40ae634205 100644 --- a/include/wx/geometry.h +++ b/include/wx/geometry.h @@ -31,8 +31,7 @@ #ifdef __WXMSW__ #define wxMulDivInt32( a , b , c ) ::MulDiv( a , b , c ) #elif defined( __WXMAC__ ) - #include "Math64.h" - #define wxMulDivInt32( a , b , c ) S32Set( S64Div( S64Multiply( S64Set(a) , S64Set(b) ) , S64Set(c) ) ) + #define wxMulDivInt32( a , b , c ) ( (wxInt32) ( ( (wxInt64)(a) * (wxInt64)(b) ) / (wxInt64)(c) ) ) #else #define wxMulDivInt32( a , b , c ) ((wxInt32)((a)*(((wxDouble)b)/((wxDouble)c)))) #endif -- 2.47.2