make wxSetEnv compatible with ANSI and Unicode, deprecate passing NULL to it in favou...

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

diff --git a/include/wx/math.h b/include/wx/math.h
index f1f4d889f75dd68c401c13447144778448853104..9d03f185d1bd6add4e3e9121e16016329e77c39c 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
@@ -107,6 +107,9 @@
 
     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