applying patch 1411230

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

diff --git a/include/wx/math.h b/include/wx/math.h
index 7a8651f7e00aa3a156dcfde3fe094adcb237c868..bff0683c94c822be70ce3a0e85d71980695b8769 100644 (file)
--- a/include/wx/math.h
+++ b/include/wx/math.h
@@ -1,11 +1,11 @@
 /**
-* 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
-* RCS-ID:
-* Copyright:   (c)
+* RCS-ID:      $Id$
+* Copyright:   (c) John Labenski
 * Licence:     wxWindows licence
 */
 
@@ -14,10 +14,6 @@
 #ifndef _WX_MATH_H_
 #define _WX_MATH_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "math.h"
-#endif
-
 #include "wx/defs.h"
 
 #include <math.h>
@@ -26,7 +22,7 @@
     #define M_PI 3.1415926535897932384626433832795
 #endif
 
-// Scaling factors for various unit conversions
+/* Scaling factors for various unit conversions */
 #ifndef METRIC_CONVERSION_CONSTANT
     #define METRIC_CONVERSION_CONSTANT 0.0393700787
 #endif
@@ -80,6 +76,51 @@
     #define wxIsNaN(x) ((x) != (x))
 #endif
 
+#ifdef __cplusplus
+#ifdef __INTELC__
+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
+    //
+    //     Maybe we should alway compare doubles up to some "epsilon" precision
+    #pragma warning(push)
+
+    // floating-point equality and inequality comparisons are unreliable
+    #pragma warning(disable: 1572)
+
+    return x == y;
+
+    #pragma warning(pop)
+}
+#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 */
+
 
+#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" {
 #endif
-       /* _WX_MATH_H_ */
+    /* functions from common/extended.c */
+    extern wxFloat64 ConvertFromIeeeExtended(const wxInt8 *bytes);
+    extern void ConvertToIeeeExtended(wxFloat64 num, wxInt8 *bytes);
+#ifdef __cplusplus
+    }
+#endif
+#endif /* wxUSE_APPLE_IEEE */
+
+
+#endif /* _WX_MATH_H_ */