Remove DLL export declaration from wxScrolled.

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

diff --git a/include/wx/math.h b/include/wx/math.h
index 3053d11f5645833b2ef259d8a82f81065f125e0b..a17bb9d092653f26f3a37b660a48826df9845e15 100644 (file)
--- a/include/wx/math.h
+++ b/include/wx/math.h
@@ -24,7 +24,7 @@
 
 /* Scaling factors for various unit conversions: 1 inch = 2.54 cm */
 #ifndef METRIC_CONVERSION_CONSTANT
 
 /* Scaling factors for various unit conversions: 1 inch = 2.54 cm */
 #ifndef METRIC_CONVERSION_CONSTANT

-    #define METRIC_CONVERSION_CONSTANT (1./254)
+    #define METRIC_CONVERSION_CONSTANT (1/25.4)

 #endif
 
 #ifndef mm2inches
 #endif
 
 #ifndef mm2inches


@@ -115,7 +115,7 @@
     inline int wxRound(double x)
     {
         wxASSERT_MSG( x > INT_MIN - 0.5 && x < INT_MAX + 0.5,
     inline int wxRound(double x)
     {
         wxASSERT_MSG( x > INT_MIN - 0.5 && x < INT_MAX + 0.5,

-                      _T("argument out of supported range") );
+                      wxT("argument out of supported range") );

 
         #if defined(HAVE_ROUND)
             return int(round(x));
 
         #if defined(HAVE_ROUND)
             return int(round(x));