Move wxMulDivInt32 to common math.

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

diff --git a/include/wx/geometry.h b/include/wx/geometry.h
index 4c1e5ad871c70a879c7292e3de9485c47a33f97b..2aa92a80f9c1d0b4a669e6457834b5781b814cd1 100644 (file)
--- a/include/wx/geometry.h
+++ b/include/wx/geometry.h
@@ -20,14 +20,6 @@
 #include "wx/gdicmn.h"
 #include "wx/math.h"
 
 #include "wx/gdicmn.h"
 #include "wx/math.h"
 

-#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))))
-#endif
-

 class WXDLLIMPEXP_BASE wxDataInputStream;
 class WXDLLIMPEXP_BASE wxDataOutputStream;
 
 class WXDLLIMPEXP_BASE wxDataInputStream;
 class WXDLLIMPEXP_BASE wxDataOutputStream;
 

diff --git a/include/wx/math.h b/include/wx/math.h
index 5c7b91e7d8a7ee702012417905ed8ac5b54fb0f2..bff0683c94c822be70ce3a0e85d71980695b8769 100644 (file)
--- a/include/wx/math.h
+++ b/include/wx/math.h
@@ -1,10 +1,10 @@
 /**
 /**

-* Name:        math.h
+* Name:        wx/math.h

 * Purpose:     Declarations/definitions of common math functions
 * Author:      John Labenski and others
 * Modified by:
 * Created:     02/02/03
 * Purpose:     Declarations/definitions of common math functions
 * Author:      John Labenski and others
 * Modified by:
 * Created:     02/02/03

-* RCS-ID:
+* RCS-ID:      $Id$

 * Copyright:   (c) John Labenski
 * Licence:     wxWindows licence
 */
 * Copyright:   (c) John Labenski
 * Licence:     wxWindows licence
 */


@@ -102,6 +102,14 @@ inline bool wxIsNullDouble(double x) { return wxIsSameDouble(x, 0.); }
 #endif /* __cplusplus */
 
 
 #endif /* __cplusplus */
 
 

+#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))))
+#endif
+

 #if wxUSE_APPLE_IEEE
 #ifdef __cplusplus
     extern "C" {
 #if wxUSE_APPLE_IEEE
 #ifdef __cplusplus
     extern "C" {

diff --git a/src/msw/ole/activex.cpp b/src/msw/ole/activex.cpp
index 41c5756c1d6f319871f945a24189b03162410d1f..6bc9bf36a1bb005f7b77e4291a2cdd2968fb07b9 100644 (file)
--- a/src/msw/ole/activex.cpp
+++ b/src/msw/ole/activex.cpp
@@ -24,7 +24,7 @@
 #endif
 
 #include "wx/dcclient.h"
 #endif
 
 #include "wx/dcclient.h"

-#include "wx/geometry.h"
+#include "wx/math.h"

 #include "wx/msw/ole/activex.h"
 
 
 #include "wx/msw/ole/activex.h"