fix undefined structs under 10.2 (tinderbox)

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

diff --git a/src/common/geometry.cpp b/src/common/geometry.cpp
index da7506b768599dd1374bf03a7198109fc5e2af62..db4ff7c671ab5e0215769b5f01bf34643de01452 100644 (file)
--- a/src/common/geometry.cpp
+++ b/src/common/geometry.cpp
@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-    #pragma implementation "geometry.cpp"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -29,11 +25,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
 //
@@ -57,9 +48,9 @@ bool wxRect2DDouble::Intersects( const wxRect2DDouble &rect ) const
 
     if ( left < right && top < bottom )
     {
-        return TRUE;
+        return true;
     }
-    return FALSE;
+    return false;
 }
 
 void wxRect2DDouble::Intersect( const wxRect2DDouble &src1 , const wxRect2DDouble &src2 , wxRect2DDouble *dest )
@@ -145,6 +136,15 @@ void wxRect2DDouble::ConstrainTo( const wxRect2DDouble &rect )
         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
@@ -152,6 +152,7 @@ void wxRect2DDouble::ConstrainTo( const wxRect2DDouble &rect )
 
 // wxPoint2D
 
+#if wxUSE_STREAMS
 void wxPoint2DInt::WriteTo( wxDataOutputStream &stream ) const
 {
     stream.Write32( m_x );
@@ -163,8 +164,9 @@ void wxPoint2DInt::ReadFrom( wxDataInputStream &stream )
     m_x = stream.Read32();
     m_y = stream.Read32();
 }
+#endif // wxUSE_STREAMS
 
-wxDouble wxPoint2DInt::GetVectorAngle()
+wxDouble wxPoint2DInt::GetVectorAngle() const
 {
     if ( m_x == 0 )
     {
@@ -200,14 +202,14 @@ void wxPoint2DInt::SetVectorAngle( wxDouble degrees )
 
 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 )
+    if ( wxIsNullDouble(m_y) )
     {
         if ( m_x >= 0 )
             return 0;
@@ -241,9 +243,9 @@ bool wxRect2DInt::Intersects( const wxRect2DInt &rect ) const
 
     if ( left < right && top < bottom )
     {
-        return TRUE;
+        return true;
     }
-    return FALSE;
+    return false;
 }
 
 void wxRect2DInt::Intersect( const wxRect2DInt &src1 , const wxRect2DInt &src2 , wxRect2DInt *dest )
@@ -338,6 +340,7 @@ wxRect2DInt& wxRect2DInt::operator=( const wxRect2DInt &r )
     return *this;
 }
 
+#if wxUSE_STREAMS
 void wxRect2DInt::WriteTo( wxDataOutputStream &stream ) const
 {
     stream.Write32( m_x );
@@ -353,5 +356,6 @@ void wxRect2DInt::ReadFrom( wxDataInputStream &stream )
     m_width = stream.Read32();
     m_height = stream.Read32();
 }
+#endif // wxUSE_STREAMS
 
 #endif // wxUSE_GEOMETRY