fix bug VC6 with returning void function

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

diff --git a/include/wx/math.h b/include/wx/math.h
index e99b37a6d6c1eff3e3e8f893f5c5d2e2076f78eb..e5fdef0a5823a83311a320686f43cd3094044641 100644 (file)
--- a/include/wx/math.h
+++ b/include/wx/math.h
@@ -22,9 +22,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./254)

 #endif
 
 #ifndef mm2inches
 #endif
 
 #ifndef mm2inches


@@ -105,13 +105,12 @@
 
     inline bool wxIsNullDouble(double x) { return wxIsSameDouble(x, 0.); }
 
 
     inline bool wxIsNullDouble(double x) { return wxIsSameDouble(x, 0.); }
 

-    #ifdef __VMS
-        //Missing definition in OpenVMS C++ header files.
-        double round(double __x);
-    #endif

     inline int wxRound(double x)
     {
     inline int wxRound(double x)
     {

-        #ifdef __VMS
+        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);
             return int(round(x));
         #else
             return (int)(x < 0 ? x - 0.5 : x + 0.5);


@@ -133,8 +132,15 @@
     extern "C" {
 #endif
     /* functions from common/extended.c */
     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
 #ifdef __cplusplus
     }
 #endif