Add wxCocoa to the list of ports which don't need wxColour to derive from wxGDIObject.

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

diff --git a/include/wx/math.h b/include/wx/math.h
index 5c7b91e7d8a7ee702012417905ed8ac5b54fb0f2..e5fdef0a5823a83311a320686f43cd3094044641 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
-* RCS-ID:
+* RCS-ID:      $Id$
 * Copyright:   (c) John Labenski
 * Licence:     wxWindows licence
 */
@@ -22,9 +22,9 @@
     #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
-    #define METRIC_CONVERSION_CONSTANT 0.0393700787
+    #define METRIC_CONVERSION_CONSTANT (1./254)
 #endif
 
 #ifndef mm2inches
@@ -77,38 +77,70 @@
 #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.); }
+
+    #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.); }
+
+    inline int wxRound(double x)
+    {
+        wxASSERT_MSG( x > INT_MIN - 0.5 && x < INT_MAX + 0.5,
+                      _T("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 */
 
 
+#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
     /* functions from common/extended.c */
-    extern wxFloat64 ConvertFromIeeeExtended(const wxInt8 *bytes);
-    extern void ConvertToIeeeExtended(wxFloat64 num, wxInt8 *bytes);
+    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 // WXWIN_COMPATIBILITY_2_8
+
 #ifdef __cplusplus
     }
 #endif