X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b34497d885c68acefc7f04f7b129a141f5ade7d0..5c7b506103cfc078a821860766e31c47d595e07f:/include/wx/math.h

diff --git a/include/wx/math.h b/include/wx/math.h
index de561737dd..e5fdef0a58 100644
--- a/include/wx/math.h
+++ b/include/wx/math.h
@@ -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
@@ -105,11 +105,11 @@
 
     inline bool wxIsNullDouble(double x) { return wxIsSameDouble(x, 0.); }
 
-    #if defined(HAVE_ROUND) && !defined(HAVE_DECL_ROUND)
-        extern "C" double round(double);
-    #endif
     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
@@ -132,8 +132,15 @@
     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