Fix missing or broken interface items for Phoenix

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

diff --git a/include/wx/math.h b/include/wx/math.h
index 611971d471e5d04ee3bc62bd36f9636f0aec3fbb..7de104caecd149acd013a211a7bf0baeb8de9e2f 100644 (file)
--- a/include/wx/math.h
+++ b/include/wx/math.h
@@ -24,7 +24,7 @@
 
 /* Scaling factors for various unit conversions: 1 inch = 2.54 cm */
 #ifndef METRIC_CONVERSION_CONSTANT
 
 /* Scaling factors for various unit conversions: 1 inch = 2.54 cm */
 #ifndef METRIC_CONVERSION_CONSTANT

-    #define METRIC_CONVERSION_CONSTANT (1./254)
+    #define METRIC_CONVERSION_CONSTANT (1/25.4)

 #endif
 
 #ifndef mm2inches
 #endif
 
 #ifndef mm2inches


@@ -58,8 +58,10 @@
     #include <float.h>
     #define wxFinite(x) _finite(x)
 #elif defined(__MINGW64__)
     #include <float.h>
     #define wxFinite(x) _finite(x)
 #elif defined(__MINGW64__)

-    // add more compilers with C99 support here: using C99 isfinite() is
-    // preferable to using BSD-ish finite()
+    /*
+        add more compilers with C99 support here: using C99 isfinite() is
+        preferable to using BSD-ish finite()
+     */

     #define wxFinite(x) isfinite(x)
 #elif ( defined(__GNUG__)||defined(__GNUWIN32__)||defined(__DJGPP__)|| \
       defined(__SGI_CC__)||defined(__SUNCC__)||defined(__XLC__)|| \
     #define wxFinite(x) isfinite(x)
 #elif ( defined(__GNUG__)||defined(__GNUWIN32__)||defined(__DJGPP__)|| \
       defined(__SGI_CC__)||defined(__SUNCC__)||defined(__XLC__)|| \


@@ -93,7 +95,7 @@
             //     shouldn't be used with doubles, but we get too many of them and
             //     removing these operators is probably not a good idea
             //
             //     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
+            //     Maybe we should always 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


@@ -115,7 +117,7 @@
     inline int wxRound(double x)
     {
         wxASSERT_MSG( x > INT_MIN - 0.5 && x < INT_MAX + 0.5,
     inline int wxRound(double x)
     {
         wxASSERT_MSG( x > INT_MIN - 0.5 && x < INT_MAX + 0.5,

-                      _T("argument out of supported range") );
+                      wxT("argument out of supported range") );

 
         #if defined(HAVE_ROUND)
             return int(round(x));
 
         #if defined(HAVE_ROUND)
             return int(round(x));


@@ -128,10 +130,8 @@
 
 #if defined(__WXMSW__) && !defined(__WXWINCE__)
     #define wxMulDivInt32( a , b , c ) ::MulDiv( a , b , c )
 
 #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
 #else

-    #define wxMulDivInt32( a , b , c ) ((wxInt32)((a)*(((wxDouble)b)/((wxDouble)c))))
+    #define wxMulDivInt32( a , b , c ) (wxRound((a)*(((wxDouble)b)/((wxDouble)c))))

 #endif
 
 #if wxUSE_APPLE_IEEE
 #endif
 
 #if wxUSE_APPLE_IEEE


@@ -146,7 +146,7 @@
 #if WXWIN_COMPATIBILITY_2_8
     wxDEPRECATED( WXDLLIMPEXP_BASE wxFloat64 ConvertFromIeeeExtended(const wxInt8 *bytes) );
     wxDEPRECATED( WXDLLIMPEXP_BASE void ConvertToIeeeExtended(wxFloat64 num, wxInt8 *bytes) );
 #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
+#endif

 
 #ifdef __cplusplus
     }
 
 #ifdef __cplusplus
     }