further wxABI_VERSION fixes

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

diff --git a/include/wx/math.h b/include/wx/math.h
index cd96cd6bee948a38afcfa64e828f538bf3892d50..c1d945c1e212dad1f7b23ff11b9457e8db84588a 100644 (file)
--- a/include/wx/math.h
+++ b/include/wx/math.h
@@ -5,7 +5,7 @@
 * Modified by:
 * Created:     02/02/03
 * RCS-ID:
-* Copyright:   (c)
+* Copyright:   (c) John Labenski
 * Licence:     wxWindows licence
 */
 
@@ -26,6 +26,36 @@
     #define M_PI 3.1415926535897932384626433832795
 #endif
 
+/* Scaling factors for various unit conversions */
+#ifndef METRIC_CONVERSION_CONSTANT
+    #define METRIC_CONVERSION_CONSTANT 0.0393700787
+#endif
+
+#ifndef mm2inches
+    #define mm2inches (METRIC_CONVERSION_CONSTANT)
+#endif
+
+#ifndef inches2mm
+    #define inches2mm (1/(mm2inches))
+#endif
+
+#ifndef mm2twips
+    #define mm2twips (METRIC_CONVERSION_CONSTANT*1440)
+#endif
+
+#ifndef twips2mm
+    #define twips2mm (1/(mm2twips))
+#endif
+
+#ifndef mm2pt
+    #define mm2pt (METRIC_CONVERSION_CONSTANT*72)
+#endif
+
+#ifndef pt2mm
+    #define pt2mm (1/(mm2pt))
+#endif
+
+
 /* unknown __VISAGECC__, __SYMANTECCC__ */
 
 #if defined(__VISUALC__) || defined(__BORLANDC__) || defined(__WATCOMC__)
@@ -51,5 +81,4 @@
 #endif
 
 
-#endif
-       /* _WX_MATH_H_ */
+#endif /* _WX_MATH_H_ */