fix makefile (changed filelist)

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

diff --git a/src/common/geometry.cpp b/src/common/geometry.cpp
index da7506b768599dd1374bf03a7198109fc5e2af62..51fe2842eeeea6c62744a5424b5fde20328f406e 100644 (file)
--- a/src/common/geometry.cpp
+++ b/src/common/geometry.cpp
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "geometry.cpp"
 #endif
 
     #pragma implementation "geometry.cpp"
 #endif
 


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


@@ -152,6 +161,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 );


@@ -163,8 +173,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 )
     {


@@ -338,6 +349,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 );


@@ -353,5 +365,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