From: Włodzimierz Skiba <abx@abx.art.pl>
Date: Mon, 13 Dec 2004 19:54:38 +0000 (+0000)
Subject: math.h/PI integration
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/19edb09cd9448dc612608df48809683e292f0c06

math.h/PI integration


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30990 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/include/wx/dc.h b/include/wx/dc.h
index bb485c7aca..9ace93ce83 100644
--- a/include/wx/dc.h
+++ b/include/wx/dc.h
@@ -31,6 +31,7 @@
 #include "wx/palette.h"
 #include "wx/list.h"            // we use wxList in inline functions
 #include "wx/dynarray.h"
+#include "wx/math.h"
 
 class WXDLLEXPORT wxDC;
 class WXDLLEXPORT wxDCBase;
diff --git a/include/wx/geometry.h b/include/wx/geometry.h
index 0b21a02f57..1d42615fa0 100644
--- a/include/wx/geometry.h
+++ b/include/wx/geometry.h
@@ -18,15 +18,11 @@
 
 #include "wx/defs.h"
 
-#ifndef wxUSE_GEOMETRY
-    #define wxUSE_GEOMETRY 0
-#endif
-
 #if wxUSE_GEOMETRY
 
 #include "wx/utils.h"
 #include "wx/gdicmn.h"
-#include <math.h>
+#include "wx/math.h"
 
 #ifdef __WXMSW__
     #define wxMulDivInt32( a , b , c ) ::MulDiv( a , b , c )
diff --git a/include/wx/math.h b/include/wx/math.h
index 93841cf6ed..6babb4d48b 100644
--- a/include/wx/math.h
+++ b/include/wx/math.h
@@ -18,6 +18,12 @@
 
 #include "wx/defs.h"
 
+#include <math.h>
+
+#ifndef M_PI
+    #define M_PI 3.1415926535897932384626433832795
+#endif
+
 // unknown __VISAGECC__, __SYMANTECCC__
 
 #if defined(__VISUALC__) || defined(__BORLANDC__) || defined(__WATCOMC__)