X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f11af0933155f94c7de5934738b0407c89e16e3f..243ef54b39f83d4a805dbeaa5ea80232ac66a1b8:/include/wx/math.h?ds=sidebyside diff --git a/include/wx/math.h b/include/wx/math.h index 12443b630c..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 @@ -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