only declare AddProcessCallback for wxMotif and wxGTK

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

diff --git a/include/wx/math.h b/include/wx/math.h
index 12443b630cfd0cd54f0e0b6b24ce32342f1e47c8..b7096cbfdb04152e94e458defb5dd717758f6ce4 100644 (file)
--- 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
@@ -60,6 +60,9 @@
 #elif defined(__GNUG__)||defined(__GNUWIN32__)||defined(__DJGPP__)|| \
       defined(__SGI_CC__)||defined(__SUNCC__)||defined(__XLC__)|| \
       defined(__HPUX__)||defined(__MWERKS__)
+#ifdef __SOLARIS__
+#include <ieeefp.h>
+#endif
     #define wxFinite(x) finite(x)
 #else
     #define wxFinite(x) ((x) == (x))
@@ -132,8 +135,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