math.h/PI integration

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

diff --git a/samples/rotate/rotate.cpp b/samples/rotate/rotate.cpp
index c5409832397180c53427b6bceccf3a3daa648da4..f2baa3715cea3ec90c259ffe7bc0df93253367f6 100644 (file)
--- a/samples/rotate/rotate.cpp
+++ b/samples/rotate/rotate.cpp
@@ -23,15 +23,6 @@
 #include "wx/image.h"
 #include "wx/numdlg.h"
 
-/* GRG: This is not ANSI standard, define M_PI explicitly
-#include <math.h>       // M_PI
-*/
-
-#ifndef M_PI
-#define M_PI 3.1415926535897932384626433832795
-#endif
-
-
 class MyApp: public wxApp
 {
 public:

diff --git a/src/common/dcbase.cpp b/src/common/dcbase.cpp
index fadb078d01ba56eaa8703cbc3436937a31aeb167..4b596ac2f97b87ff675394b1c631ebe75c463ac1 100644 (file)
--- a/src/common/dcbase.cpp
+++ b/src/common/dcbase.cpp
@@ -30,8 +30,6 @@
 
 #include "wx/dc.h"
 
-#include <math.h>
-
 // bool wxDCBase::sm_cacheing = false;
 
 // ============================================================================
@@ -319,7 +317,7 @@ void wxDCBase::DoDrawSpline( wxList *points )
     if (node == NULL)
         // empty list
         return;
-    
+
     p = (wxPoint *)node->GetData();
 
     x1 = p->x;
@@ -766,7 +764,7 @@ void wxDCBase::Rotate( wxList* points, double angle, wxPoint center )
 {
     if( angle != 0.0 )
     {
-        double pi(3.1415926536);
+        double pi(M_PI);
         double dSinA = -sin(angle*2.0*pi/360.0);
         double dCosA = cos(angle*2.0*pi/360.0);
         for ( wxNode* node = points->First(); node; node = node->Next() )
@@ -794,7 +792,7 @@ void wxDCBase::CalculateEllipticPoints( wxList* points,
                                         wxCoord w, wxCoord h,
                                         double sa, double ea )
 {
-    double pi = 3.1415926535;
+    double pi = M_PI;
     double sar = 0;
     double ear = 0;
     int xsa = 0;

diff --git a/src/common/geometry.cpp b/src/common/geometry.cpp
index b78f2e79ee6dc2777b8f7619252e974f1b031cdb..d74af422a9272237cf26a05bde1096685063506a 100644 (file)
--- a/src/common/geometry.cpp
+++ b/src/common/geometry.cpp
@@ -29,11 +29,6 @@
 #include "wx/geometry.h"
 #include "wx/datstrm.h"
 
-// normally this is defined in <math.h>
-#ifndef M_PI
-    #define M_PI 3.14159265358979323846
-#endif
-
 //
 // wxPoint2D
 //

diff --git a/src/common/matrix.cpp b/src/common/matrix.cpp
index 78a42518917487310c2730925bb243887686ae15..d324a852dd0dc696d1fc2f836616743894b0d884 100644 (file)
--- a/src/common/matrix.cpp
+++ b/src/common/matrix.cpp
@@ -25,12 +25,12 @@
 
 #ifndef WX_PRECOMP
 #include "wx/defs.h"
+#include "wx/math.h"
 #endif
 
 #include "wx/matrix.h"
-#include <math.h>
 
-static const double pi = 3.1415926535;
+static const double pi = M_PI;
 
 wxTransformMatrix::wxTransformMatrix(void)
 {

diff --git a/src/mac/carbon/dc.cpp b/src/mac/carbon/dc.cpp
index 93b10723b96b450531443d82bd179ea892466b2e..028c3cd0fcfbccf3a712b08158880b2eb55c44ce 100644 (file)
--- a/src/mac/carbon/dc.cpp
+++ b/src/mac/carbon/dc.cpp
@@ -23,7 +23,6 @@
 #include "wx/log.h"
 
 #if __MSL__ >= 0x6000
-#include "math.h"
 namespace std {}
 using namespace std ;
 #endif
@@ -47,11 +46,7 @@ IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject)
 #define twips2mm        0.0176388888889
 #define mm2pt            2.83464566929
 #define pt2mm            0.352777777778
-#if !defined( __DARWIN__ ) || defined(__MWERKS__)
-#ifndef M_PI
-const double M_PI = 3.14159265358979 ;
-#endif
-#endif
+
 const double RAD2DEG  = 180.0 / M_PI;
 const short kEmulatedMode = -1 ;
 const short kUnsupportedMode = -2 ;

diff --git a/src/mac/classic/dc.cpp b/src/mac/classic/dc.cpp
index 9fa09930032e48afc35a242c76c68792adcaff3a..5be3660fc2a7e35b546dc5d6901219942413379e 100644 (file)
--- a/src/mac/classic/dc.cpp
+++ b/src/mac/classic/dc.cpp
@@ -23,7 +23,7 @@
 #include "wx/log.h"
 
 #if __MSL__ >= 0x6000
-#include "math.h"
+namespace std {}
 using namespace std ;
 #endif
 
@@ -46,11 +46,7 @@ IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject)
 #define twips2mm        0.0176388888889
 #define mm2pt            2.83464566929
 #define pt2mm            0.352777777778
-#if !defined( __DARWIN__ ) || defined(__MWERKS__)
-#ifndef M_PI
-const double M_PI = 3.14159265358979 ;
-#endif
-#endif
+
 const double RAD2DEG  = 180.0 / M_PI;
 const short kEmulatedMode = -1 ;
 const short kUnsupportedMode = -2 ;

diff --git a/src/mgl/dc.cpp b/src/mgl/dc.cpp
index 5b4101fd20ccd7adb98e6b5c2c69e24d7fb94bec..3fb64cab409a014507f1d8e94fe701ea395a8667 100644 (file)
--- a/src/mgl/dc.cpp
+++ b/src/mgl/dc.cpp
@@ -39,7 +39,6 @@
 #include "wx/log.h"
 
 #include <string.h>
-#include <math.h>
 #include <mgraph.hpp>
 
 
@@ -48,10 +47,6 @@
 // constants
 //-----------------------------------------------------------------------------
 
-#ifndef M_PI
-#define M_PI 3.14159265358979323846
-#endif
-
 const double mm2inches      = 0.0393700787402;
 const double inches2mm      = 25.4;
 const double mm2twips       = 56.6929133859;

diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp
index c6f000a7963437eac8594c2deb605d0754ef1e72..0ec26a8b0e9737fbd964f7e66d8476faea68a190 100644 (file)
--- a/src/msw/dc.cpp
+++ b/src/msw/dc.cpp
@@ -54,7 +54,6 @@
 #endif
 
 #include <string.h>
-#include <math.h>
 
 #if wxUSE_COMMON_DIALOGS && !defined(__WXMICROWIN__)
     #include <commdlg.h>
@@ -94,11 +93,6 @@ static const int VIEWPORT_EXTENT = 1000;
 static const int MM_POINTS = 9;
 static const int MM_METRIC = 10;
 
-// usually this is defined in math.h
-#ifndef M_PI
-    static const double M_PI = 3.14159265358979323846;
-#endif // M_PI
-
 // ROPs which don't have standard names (see "Ternary Raster Operations" in the
 // MSDN docs for how this and other numbers in wxDC::Blit() are obtained)
 #define DSTCOPY 0x00AA0029      // a.k.a. NOP operation

diff --git a/src/os2/dc.cpp b/src/os2/dc.cpp
index 696c32f4a1176bca7aa8a2bf4661ddbd7484ce6b..56f4dacc081eccc61f98197f5add4a86e7a7e844 100644 (file)
--- a/src/os2/dc.cpp
+++ b/src/os2/dc.cpp
@@ -32,7 +32,6 @@
 #include "wx/dcprint.h"
 
 #include <string.h>
-#include <math.h>
 
 #include "wx/os2/private.h"
 
@@ -68,11 +67,6 @@ static const int VIEWPORT_EXTENT = 1000;
 static const int MM_POINTS = 9;
 static const int MM_METRIC = 10;
 
-// usually this is defined in math.h
-#ifndef M_PI
-    static const double M_PI = 3.14159265358979323846;
-#endif // M_PI
-
 // ---------------------------------------------------------------------------
 // private functions
 // ---------------------------------------------------------------------------

diff --git a/src/palmos/dc.cpp b/src/palmos/dc.cpp
index 46471e3ee6ad06319b3e6095b11a9280c9abbda6..6ac50f18228bf700dacd7ab77111ed346423bdaf 100644 (file)
--- a/src/palmos/dc.cpp
+++ b/src/palmos/dc.cpp
@@ -4,7 +4,7 @@
 // Author:      William Osborne
 // Modified by:
 // Created:     10/13/04
-// RCS-ID:      $Id: 
+// RCS-ID:      $Id:
 // Copyright:   (c) William Osborne
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -50,7 +50,6 @@
 #endif
 
 #include <string.h>
-#include <math.h>
 
 #ifndef AC_SRC_ALPHA
 #define AC_SRC_ALPHA 1
@@ -72,11 +71,6 @@ static const int VIEWPORT_EXTENT = 1000;
 static const int MM_POINTS = 9;
 static const int MM_METRIC = 10;
 
-// usually this is defined in math.h
-#ifndef M_PI
-    static const double M_PI = 3.14159265358979323846;
-#endif // M_PI
-
 #define DSTCOPY 0x00AA0029
 
 // ---------------------------------------------------------------------------