X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ade7e576a12a85c6422ed266a07062ef222b1c4b..fb8a56b77ce195d0bd9ac6984e3e5cbb7136faca:/src/common/geometry.cpp diff --git a/src/common/geometry.cpp b/src/common/geometry.cpp index da7506b768..51fe2842ee 100644 --- a/src/common/geometry.cpp +++ b/src/common/geometry.cpp @@ -9,7 +9,7 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "geometry.cpp" #endif @@ -145,6 +145,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 +161,7 @@ void wxRect2DDouble::ConstrainTo( const wxRect2DDouble &rect ) // wxPoint2D +#if wxUSE_STREAMS 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(); } +#endif // wxUSE_STREAMS -wxDouble wxPoint2DInt::GetVectorAngle() +wxDouble wxPoint2DInt::GetVectorAngle() const { if ( m_x == 0 ) { @@ -338,6 +349,7 @@ wxRect2DInt& wxRect2DInt::operator=( const wxRect2DInt &r ) return *this; } +#if wxUSE_STREAMS 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(); } +#endif // wxUSE_STREAMS #endif // wxUSE_GEOMETRY