Somehow, setting a tint color makes gauge work :/.

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

diff --git a/include/wx/math.h b/include/wx/math.h
index 72628269cf7855d11caf4e8c278a9a42c8754e45..89a1b94473ad3b467f2976f045dc0a022ec58961 100644 (file)
--- a/include/wx/math.h
+++ b/include/wx/math.h
@@ -1,10 +1,9 @@
 /**
 /**

-* 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:

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


@@ -22,9 +21,9 @@
     #define M_PI 3.1415926535897932384626433832795
 #endif
 
     #define M_PI 3.1415926535897932384626433832795
 #endif
 

-/* Scaling factors for various unit conversions */
+/* Scaling factors for various unit conversions: 1 inch = 2.54 cm */

 #ifndef METRIC_CONVERSION_CONSTANT
 #ifndef METRIC_CONVERSION_CONSTANT

-    #define METRIC_CONVERSION_CONSTANT 0.0393700787
+    #define METRIC_CONVERSION_CONSTANT (1/25.4)

 #endif
 
 #ifndef mm2inches
 #endif
 
 #ifndef mm2inches


@@ -52,14 +51,32 @@
 #endif
 
 
 #endif
 
 

-/* unknown __VISAGECC__, __SYMANTECCC__ */
+#ifdef __cplusplus

 
 

-#if defined(__VISUALC__) || defined(__BORLANDC__) || defined(__WATCOMC__)
+/* Any C++11 compiler should provide isfinite() */
+#if __cplusplus >= 201103
+    #include <cmath>
+    #define wxFinite(x) std::isfinite(x)
+#elif defined(__VISUALC__) || defined(__BORLANDC__) || defined(__WATCOMC__)

     #include <float.h>
     #define wxFinite(x) _finite(x)
     #include <float.h>
     #define wxFinite(x) _finite(x)

-#elif defined(__GNUG__)||defined(__GNUWIN32__)||defined(__DJGPP__)|| \
+#elif defined(__MINGW64_TOOLCHAIN__) || defined(__clang__)
+    /*
+        add more compilers with C99 support here: using C99 isfinite() is
+        preferable to using BSD-ish finite()
+     */
+    #if defined(_GLIBCXX_CMATH) || defined(_LIBCPP_CMATH)
+        // these <cmath> headers #undef isfinite
+        #define wxFinite(x) std::isfinite(x)
+    #else
+        #define wxFinite(x) isfinite(x)
+    #endif
+#elif ( defined(__GNUG__)||defined(__GNUWIN32__)||defined(__DJGPP__)|| \

       defined(__SGI_CC__)||defined(__SUNCC__)||defined(__XLC__)|| \
       defined(__SGI_CC__)||defined(__SUNCC__)||defined(__XLC__)|| \

-      defined(__HPUX__)||defined(__MWERKS__)
+      defined(__HPUX__) ) && ( !defined(wxOSX_USE_IPHONE) || wxOSX_USE_IPHONE == 0 )
+#ifdef __SOLARIS__
+#include <ieeefp.h>
+#endif

     #define wxFinite(x) finite(x)
 #else
     #define wxFinite(x) ((x) == (x))
     #define wxFinite(x) finite(x)
 #else
     #define wxFinite(x) ((x) == (x))


@@ -70,32 +87,79 @@
     #define wxIsNaN(x) _isnan(x)
 #elif defined(__GNUG__)||defined(__GNUWIN32__)||defined(__DJGPP__)|| \
       defined(__SGI_CC__)||defined(__SUNCC__)||defined(__XLC__)|| \
     #define wxIsNaN(x) _isnan(x)
 #elif defined(__GNUG__)||defined(__GNUWIN32__)||defined(__DJGPP__)|| \
       defined(__SGI_CC__)||defined(__SUNCC__)||defined(__XLC__)|| \

-      defined(__HPUX__)||defined(__MWERKS__)
+      defined(__HPUX__)

     #define wxIsNaN(x) isnan(x)
 #else
     #define wxIsNaN(x) ((x) != (x))
 #endif
 
     #define wxIsNaN(x) isnan(x)
 #else
     #define wxIsNaN(x) ((x) != (x))
 #endif
 

-#ifdef __cplusplus

 #ifdef __INTELC__
 #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
-    #pragma warning(push)

 
 

-    // floating-point equality and inequality comparisons are unreliable
-    #pragma warning(disable: 1572)
+    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 always compare doubles up to some "epsilon" precision
+        #pragma warning(push)

 
 

-    return x == y;
+        // floating-point equality and inequality comparisons are unreliable
+        #pragma warning(disable: 1572)
+
+        return x == y;
+
+        #pragma warning(pop)
+    }

 
 

-    #pragma warning(pop)
-}

 #else /* !__INTELC__ */
 #else /* !__INTELC__ */

-inline bool wxIsSameDouble(double x, double y) { return x == y; }
+    wxGCC_WARNING_SUPPRESS(float-equal)
+    inline bool wxIsSameDouble(double x, double y) { return x == y; }
+    wxGCC_WARNING_RESTORE(float-equal)
+

 #endif /* __INTELC__/!__INTELC__ */
 #endif /* __INTELC__/!__INTELC__ */

+
+inline bool wxIsNullDouble(double x) { return wxIsSameDouble(x, 0.); }
+
+inline int wxRound(double x)
+{
+    wxASSERT_MSG( x > INT_MIN - 0.5 && x < INT_MAX + 0.5,
+                  wxT("argument out of supported range") );
+
+    #if defined(HAVE_ROUND)
+        return int(round(x));
+    #else
+        return (int)(x < 0 ? x - 0.5 : x + 0.5);
+    #endif
+}
+

 #endif /* __cplusplus */
 
 
 #endif /* __cplusplus */
 
 

+#if defined(__WINDOWS__) && !defined(__WXWINCE__)
+    #define wxMulDivInt32( a , b , c ) ::MulDiv( a , b , c )
+#else
+    #define wxMulDivInt32( a , b , c ) (wxRound((a)*(((wxDouble)b)/((wxDouble)c))))
+#endif
+
+#if wxUSE_APPLE_IEEE
+#ifdef __cplusplus
+    extern "C" {
+#endif
+    /* functions from common/extended.c */
+    WXDLLIMPEXP_BASE wxFloat64 wxConvertFromIeeeExtended(const wxInt8 *bytes);
+    WXDLLIMPEXP_BASE void wxConvertToIeeeExtended(wxFloat64 num, wxInt8 *bytes);
+
+    /* use wxConvertFromIeeeExtended() and wxConvertToIeeeExtended() instead */
+#if WXWIN_COMPATIBILITY_2_8
+    wxDEPRECATED( WXDLLIMPEXP_BASE wxFloat64 ConvertFromIeeeExtended(const wxInt8 *bytes) );
+    wxDEPRECATED( WXDLLIMPEXP_BASE void ConvertToIeeeExtended(wxFloat64 num, wxInt8 *bytes) );
+#endif
+
+#ifdef __cplusplus
+    }
+#endif
+#endif /* wxUSE_APPLE_IEEE */
+
+

 #endif /* _WX_MATH_H_ */
 #endif /* _WX_MATH_H_ */