removed wxGTK2 hack, not needed any more

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

diff --git a/src/common/geometry.cpp b/src/common/geometry.cpp
index bf8591fd67ca757a9194326bb2e84f08fa5810ab..db4ff7c671ab5e0215769b5f01bf34643de01452 100644 (file)
--- a/src/common/geometry.cpp
+++ b/src/common/geometry.cpp
@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // 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"
 


@@ -26,7 +22,6 @@
 #include "wx/log.h"
 #include <string.h>
 
 #include "wx/log.h"
 #include <string.h>
 

-

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


@@ -53,9 +48,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 )


@@ -141,6 +136,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


@@ -148,6 +152,7 @@ void wxRect2DDouble::ConstrainTo( const wxRect2DDouble &rect )
 
 // wxPoint2D
 
 
 // wxPoint2D
 

+#if wxUSE_STREAMS

 void wxPoint2DInt::WriteTo( wxDataOutputStream &stream ) const
 {
     stream.Write32( m_x );
 void wxPoint2DInt::WriteTo( wxDataOutputStream &stream ) const
 {
     stream.Write32( m_x );


@@ -159,8 +164,9 @@ void wxPoint2DInt::ReadFrom( wxDataInputStream &stream )
     m_x = stream.Read32();
     m_y = stream.Read32();
 }
     m_x = stream.Read32();
     m_y = stream.Read32();
 }

+#endif // wxUSE_STREAMS

 
 

-wxDouble wxPoint2DInt::GetVectorAngle()
+wxDouble wxPoint2DInt::GetVectorAngle() const

 {
     if ( m_x == 0 )
     {
 {
     if ( m_x == 0 )
     {


@@ -177,8 +183,8 @@ wxDouble wxPoint2DInt::GetVectorAngle()
             return 180;
     }
 
             return 180;
     }
 

-    // casts needed MIPSpro compiler under SGI
-    wxDouble deg = atan2( (double)m_y , (double)m_x ) * 180 / 3.14159265359;
+    // casts needed for MIPSpro compiler under SGI
+    wxDouble deg = atan2( (double)m_y , (double)m_x ) * 180 / M_PI;

     if ( deg < 0 )
     {
         deg += 360;
     if ( deg < 0 )
     {
         deg += 360;


@@ -187,40 +193,42 @@ wxDouble wxPoint2DInt::GetVectorAngle()
 }
 
 
 }
 
 

-void wxPoint2DInt::SetVectorAngle( wxDouble degrees ) {
-       wxDouble length = this->GetVectorLength() ;
-       m_x = length * cos( degrees / 180 * 3.14159265359 ) ;
-       m_y = length * sin( degrees / 180 * 3.14159265359 ) ;
+void wxPoint2DInt::SetVectorAngle( wxDouble degrees )
+{
+    wxDouble length = GetVectorLength();
+    m_x = (int)(length * cos( degrees / 180 * M_PI ));
+    m_y = (int)(length * sin( degrees / 180 * M_PI ));

 }
 }

-       
+

 wxDouble wxPoint2DDouble::GetVectorAngle() const
 {
 wxDouble wxPoint2DDouble::GetVectorAngle() const
 {

-       if ( m_x == 0 )
-       {
-               if ( m_y >= 0 )
-                       return 90 ;
-               else
-                       return 270 ;
-       }
-       if ( m_y == 0 )
-       {
-               if ( m_x >= 0 )
-                       return 0 ;
-               else
-                       return 180 ;
-       }
-       wxDouble deg = atan2( m_y , m_x ) * 180 / 3.14159265359 ;
-       if ( deg < 0 )
-       {
-               deg += 360 ;
-       }
-       return deg ;
+    if ( wxIsNullDouble(m_x) )
+    {
+        if ( m_y >= 0 )
+            return 90;
+        else
+            return 270;
+    }
+    if ( wxIsNullDouble(m_y) )
+    {
+        if ( m_x >= 0 )
+            return 0;
+        else
+            return 180;
+    }
+    wxDouble deg = atan2( m_y , m_x ) * 180 / M_PI;
+    if ( deg < 0 )
+    {
+        deg += 360;
+    }
+    return deg;

 }
 
 }
 

-void wxPoint2DDouble::SetVectorAngle( wxDouble degrees ) {
-       wxDouble length = this->GetVectorLength() ;
-       m_x = length * cos( degrees / 180 * 3.14159265359 ) ;
-       m_y = length * sin( degrees / 180 * 3.14159265359 ) ;
+void wxPoint2DDouble::SetVectorAngle( wxDouble degrees )
+{
+    wxDouble length = GetVectorLength();
+    m_x = length * cos( degrees / 180 * M_PI );
+    m_y = length * sin( degrees / 180 * M_PI );

 }
 
 // wxRect2D
 }
 
 // wxRect2D


@@ -235,9 +243,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 )


@@ -332,6 +340,7 @@ wxRect2DInt& wxRect2DInt::operator=( const wxRect2DInt &r )
     return *this;
 }
 
     return *this;
 }
 

+#if wxUSE_STREAMS

 void wxRect2DInt::WriteTo( wxDataOutputStream &stream ) const
 {
     stream.Write32( m_x );
 void wxRect2DInt::WriteTo( wxDataOutputStream &stream ) const
 {
     stream.Write32( m_x );


@@ -347,5 +356,6 @@ void wxRect2DInt::ReadFrom( wxDataInputStream &stream )
     m_width = stream.Read32();
     m_height = stream.Read32();
 }
     m_width = stream.Read32();
     m_height = stream.Read32();
 }

+#endif // wxUSE_STREAMS

 
 #endif // wxUSE_GEOMETRY
 
 #endif // wxUSE_GEOMETRY