Build fix after recent changes in wxRendererNative class.

[wxWidgets.git] / include / wx / math.h

diff --git a/include/wx/math.h b/include/wx/math.h
index a32f1b090192dd8d18bd3e57d2ca218ea8c05588..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
 */


@@ -83,6 +83,8 @@ inline bool wxIsSameDouble(double x, double y)
     // VZ: this warning, given for operators==() and !=() is not wrong, as ==
     //     shouldn't be used with doubles, but we get too many of them and
     //     removing these operators is probably not a good idea
     // VZ: this warning, given for operators==() and !=() is not wrong, as ==
     //     shouldn't be used with doubles, but we get too many of them and
     //     removing these operators is probably not a good idea

+    //
+    //     Maybe we should alway compare doubles up to some "epsilon" precision

     #pragma warning(push)
 
     // floating-point equality and inequality comparisons are unreliable
     #pragma warning(push)
 
     // floating-point equality and inequality comparisons are unreliable


@@ -95,9 +97,19 @@ inline bool wxIsSameDouble(double x, double y)
 #else /* !__INTELC__ */
 inline bool wxIsSameDouble(double x, double y) { return x == y; }
 #endif /* __INTELC__/!__INTELC__ */
 #else /* !__INTELC__ */
 inline bool wxIsSameDouble(double x, double y) { return x == y; }
 #endif /* __INTELC__/!__INTELC__ */

+
+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" {