Add some version checks to help compiling on OSX.

[wxWidgets.git] / src / common / geometry.cpp

diff --git a/src/common/geometry.cpp b/src/common/geometry.cpp
index 6c171e73a544bc7eaf16f6a17c3b564c840e256e..d979e79b3fc873beaf1b8d796af6038ba4c14b6c 100644 (file)
--- a/src/common/geometry.cpp
+++ b/src/common/geometry.cpp
@@ -1,39 +1,33 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        common/geometry.cpp
+// Name:        src/common/geometry.cpp

 // Purpose:     Common Geometry Classes
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     08/05/99
 // Purpose:     Common Geometry Classes
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     08/05/99

-// RCS-ID:
+// RCS-ID:      $Id$

 // Copyright:   (c) 1999 Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Copyright:   (c) 1999 Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-    #pragma implementation "geometry.cpp"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-

 #ifdef __BORLANDC__
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #if wxUSE_GEOMETRY
 
 #endif
 
 #if wxUSE_GEOMETRY
 

-#include "wx/log.h"
-#include <string.h>
-

 #include "wx/geometry.h"
 #include "wx/geometry.h"

-#include "wx/datstrm.h"

 
 

-// normally this is defined in <math.h>
-#ifndef M_PI
-    #define M_PI 3.14159265358979323846
+#ifndef WX_PRECOMP
+    #include "wx/log.h"

 #endif
 
 #endif
 

+#include <string.h>
+
+#include "wx/datstrm.h"
+

 //
 // wxPoint2D
 //
 //
 // wxPoint2D
 //


@@ -57,9 +51,9 @@ bool wxRect2DDouble::Intersects( const wxRect2DDouble &rect ) const
 
     if ( left < right && top < bottom )
     {
 
     if ( left < right && top < bottom )
     {

-        return TRUE;
+        return true;

     }
     }

-    return FALSE;
+    return false;

 }
 
 void wxRect2DDouble::Intersect( const wxRect2DDouble &src1 , const wxRect2DDouble &src2 , wxRect2DDouble *dest )
 }
 
 void wxRect2DDouble::Intersect( const wxRect2DDouble &src1 , const wxRect2DDouble &src2 , wxRect2DDouble *dest )


@@ -145,6 +139,15 @@ void wxRect2DDouble::ConstrainTo( const wxRect2DDouble &rect )
         SetTop( rect.GetTop() );
 }
 
         SetTop( rect.GetTop() );
 }
 

+wxRect2DDouble& wxRect2DDouble::operator=( const wxRect2DDouble &r )
+{
+    m_x = r.m_x;
+    m_y = r.m_y;
+    m_width = r.m_width;
+    m_height = r.m_height;
+    return *this;
+}
+

 // integer version
 
 // for the following calculations always remember
 // integer version
 
 // for the following calculations always remember


@@ -202,14 +205,14 @@ void wxPoint2DInt::SetVectorAngle( wxDouble degrees )
 
 wxDouble wxPoint2DDouble::GetVectorAngle() const
 {
 
 wxDouble wxPoint2DDouble::GetVectorAngle() const
 {

-    if ( m_x == 0 )
+    if ( wxIsNullDouble(m_x) )

     {
         if ( m_y >= 0 )
             return 90;
         else
             return 270;
     }
     {
         if ( m_y >= 0 )
             return 90;
         else
             return 270;
     }

-    if ( m_y == 0 )
+    if ( wxIsNullDouble(m_y) )

     {
         if ( m_x >= 0 )
             return 0;
     {
         if ( m_x >= 0 )
             return 0;


@@ -243,9 +246,9 @@ bool wxRect2DInt::Intersects( const wxRect2DInt &rect ) const
 
     if ( left < right && top < bottom )
     {
 
     if ( left < right && top < bottom )
     {

-        return TRUE;
+        return true;

     }
     }

-    return FALSE;
+    return false;

 }
 
 void wxRect2DInt::Intersect( const wxRect2DInt &src1 , const wxRect2DInt &src2 , wxRect2DInt *dest )
 }
 
 void wxRect2DInt::Intersect( const wxRect2DInt &src1 , const wxRect2DInt &src2 , wxRect2DInt *dest )