X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0624ce56d83b31d187146374cc0cb97128d01816..31ad423e4fb556ec225a63b161154d3bf3445c1b:/include/wx/geometry.h diff --git a/include/wx/geometry.h b/include/wx/geometry.h index 0c61a813ba..98f0453799 100644 --- a/include/wx/geometry.h +++ b/include/wx/geometry.h @@ -12,7 +12,7 @@ #ifndef _WX_GEOMETRY_H_ #define _WX_GEOMETRY_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "geometry.cpp" #endif @@ -36,8 +36,8 @@ #define wxMulDivInt32( a , b , c ) ((wxInt32)((a)*(((wxDouble)b)/((wxDouble)c)))) #endif -class wxDataInputStream; -class wxDataOutputStream; +class WXDLLIMPEXP_BASE wxDataInputStream; +class WXDLLIMPEXP_BASE wxDataOutputStream; // clipping from Cohen-Sutherland @@ -59,11 +59,11 @@ public : inline wxPoint2DInt( const wxPoint &pt ); // noops for this class, just return the coords - inline void GetFloor( wxInt32 *x , wxInt32 *y ); - inline void GetRounded( wxInt32 *x , wxInt32 *y ); + inline void GetFloor( wxInt32 *x , wxInt32 *y ) const; + inline void GetRounded( wxInt32 *x , wxInt32 *y ) const; - inline wxDouble GetVectorLength(); - wxDouble GetVectorAngle(); + inline wxDouble GetVectorLength() const; + wxDouble GetVectorAngle() const; inline void SetVectorLength( wxDouble length ); void SetVectorAngle( wxDouble degrees ); void SetPolarCoordinates( wxInt32 angle , wxInt32 length ); @@ -91,8 +91,10 @@ public : inline bool operator==(const wxPoint2DInt& pt) const; inline bool operator!=(const wxPoint2DInt& pt) const; +#if wxUSE_STREAMS void WriteTo( wxDataOutputStream &stream ) const; void ReadFrom( wxDataInputStream &stream ); +#endif // wxUSE_STREAMS wxInt32 m_x; wxInt32 m_y; @@ -133,7 +135,7 @@ inline wxPoint2DInt::wxPoint2DInt( const wxPoint &pt ) m_y = pt.y; } -inline void wxPoint2DInt::GetFloor( wxInt32 *x , wxInt32 *y ) +inline void wxPoint2DInt::GetFloor( wxInt32 *x , wxInt32 *y ) const { if ( x ) *x = m_x; @@ -141,12 +143,12 @@ inline void wxPoint2DInt::GetFloor( wxInt32 *x , wxInt32 *y ) *y = m_y; } -inline void wxPoint2DInt::GetRounded( wxInt32 *x , wxInt32 *y ) +inline void wxPoint2DInt::GetRounded( wxInt32 *x , wxInt32 *y ) const { GetFloor(x, y); } -inline wxDouble wxPoint2DInt::GetVectorLength() +inline wxDouble wxPoint2DInt::GetVectorLength() const { // cast needed MIPSpro compiler under SGI return sqrt( (double)(m_x)*(m_x) + (m_y)*(m_y) ); @@ -304,8 +306,8 @@ public : { m_x = (wxDouble) pt.x ; m_y = (wxDouble) pt.y ; } // two different conversions to integers, floor and rounding - inline void GetFloor( wxInt32 *x , wxInt32 *y ); - inline void GetRounded( wxInt32 *x , wxInt32 *y ); + inline void GetFloor( wxInt32 *x , wxInt32 *y ) const; + inline void GetRounded( wxInt32 *x , wxInt32 *y ) const; inline wxDouble GetVectorLength() const; wxDouble GetVectorAngle() const ; @@ -315,10 +317,10 @@ public : // set the vector length to 1.0, preserving the angle void Normalize(); - inline wxDouble GetDistance( const wxPoint2DDouble &pt ); - inline wxDouble GetDistanceSquare( const wxPoint2DDouble &pt ); - inline wxDouble GetDotProduct( const wxPoint2DDouble &vec ); - inline wxDouble GetCrossProduct( const wxPoint2DDouble &vec ); + inline wxDouble GetDistance( const wxPoint2DDouble &pt ) const; + inline wxDouble GetDistanceSquare( const wxPoint2DDouble &pt ) const; + inline wxDouble GetDotProduct( const wxPoint2DDouble &vec ) const; + inline wxDouble GetCrossProduct( const wxPoint2DDouble &vec ) const; // the reflection of this point inline wxPoint2DDouble operator-(); @@ -369,13 +371,13 @@ inline wxPoint2DDouble::wxPoint2DDouble( const wxPoint2DDouble &pt ) m_y = pt.m_y; } -inline void wxPoint2DDouble::GetFloor( wxInt32 *x , wxInt32 *y ) +inline void wxPoint2DDouble::GetFloor( wxInt32 *x , wxInt32 *y ) const { *x = (wxInt32) floor( m_x ); *y = (wxInt32) floor( m_y ); } -inline void wxPoint2DDouble::GetRounded( wxInt32 *x , wxInt32 *y ) +inline void wxPoint2DDouble::GetRounded( wxInt32 *x , wxInt32 *y ) const { *x = (wxInt32) floor( m_x + 0.5 ); *y = (wxInt32) floor( m_y + 0.5); @@ -393,22 +395,22 @@ inline void wxPoint2DDouble::SetVectorLength( wxDouble length ) m_y = (m_y * length / before) ; } -inline wxDouble wxPoint2DDouble::GetDistance( const wxPoint2DDouble &pt ) +inline wxDouble wxPoint2DDouble::GetDistance( const wxPoint2DDouble &pt ) const { return sqrt( GetDistanceSquare( pt ) ); } -inline wxDouble wxPoint2DDouble::GetDistanceSquare( const wxPoint2DDouble &pt ) +inline wxDouble wxPoint2DDouble::GetDistanceSquare( const wxPoint2DDouble &pt ) const { return ( (pt.m_x-m_x)*(pt.m_x-m_x) + (pt.m_y-m_y)*(pt.m_y-m_y) ); } -inline wxDouble wxPoint2DDouble::GetDotProduct( const wxPoint2DDouble &vec ) +inline wxDouble wxPoint2DDouble::GetDotProduct( const wxPoint2DDouble &vec ) const { return ( m_x * vec.m_x + m_y * vec.m_y ); } -inline wxDouble wxPoint2DDouble::GetCrossProduct( const wxPoint2DDouble &vec ) +inline wxDouble wxPoint2DDouble::GetCrossProduct( const wxPoint2DDouble &vec ) const { return ( m_x * vec.m_y - vec.m_x * m_y ); } @@ -585,9 +587,9 @@ public: { m_x += pt.m_x - (m_x+m_width/2) , m_y += pt.m_y -(m_y+m_height/2); } inline wxOutCode GetOutCode( const wxPoint2DDouble &pt ) const { return (wxOutCode) (( ( pt.m_x < m_x ) ? wxOutLeft : 0 ) + - ( ( pt.m_x >= m_x + m_width ) ? wxOutRight : 0 ) + + ( ( pt.m_x > m_x + m_width ) ? wxOutRight : 0 ) + ( ( pt.m_y < m_y ) ? wxOutTop : 0 ) + - ( ( pt.m_y >= m_y + m_height ) ? wxOutBottom : 0 )); } + ( ( pt.m_y > m_y + m_height ) ? wxOutBottom : 0 )); } inline wxOutCode GetOutcode(const wxPoint2DDouble &pt) const { return GetOutCode(pt) ; } inline bool Contains( const wxPoint2DDouble &pt ) const @@ -632,11 +634,11 @@ public: { m_x *= ((wxDouble)num)/((wxDouble)denum); m_y *= ((wxDouble)num)/((wxDouble)denum); m_width *= ((wxDouble)num)/((wxDouble)denum); m_height *= ((wxDouble)num)/((wxDouble)denum);} -/* wxRect2DDouble& operator = (const wxRect2DDouble& rect); - bool operator == (const wxRect2DDouble& rect); - bool operator != (const wxRect2DDouble& rect); -*/ + inline bool operator == (const wxRect2DDouble& rect) + { return (m_x==rect.m_x && m_y==rect.m_y && m_width==rect.m_width && m_height==rect.m_height); } + inline bool operator != (const wxRect2DDouble& rect) + { return !(*this == rect); } wxDouble m_x; wxDouble m_y; @@ -735,16 +737,18 @@ public: m_width *= ((wxInt32)num)/((wxInt32)denum); m_height *= ((wxInt32)num)/((wxInt32)denum);} wxRect2DInt& operator = (const wxRect2DInt& rect); - bool operator == (const wxRect2DInt& rect); - bool operator != (const wxRect2DInt& rect); + bool operator == (const wxRect2DInt& rect) const; + bool operator != (const wxRect2DInt& rect) const; - void WriteTo( wxDataOutputStream &stream ) const; - void ReadFrom( wxDataInputStream &stream ); +#if wxUSE_STREAMS + void WriteTo( wxDataOutputStream &stream ) const; + void ReadFrom( wxDataInputStream &stream ); +#endif // wxUSE_STREAMS wxInt32 m_x; - wxInt32 m_y; - wxInt32 m_width; - wxInt32 m_height; + wxInt32 m_y; + wxInt32 m_width; + wxInt32 m_height; }; inline wxRect2DInt::wxRect2DInt( const wxRect2DInt &r ) @@ -763,6 +767,25 @@ inline wxRect2DInt::wxRect2DInt( const wxPoint2DInt &a , const wxPoint2DInt &b) m_height = abs( a.m_y - b.m_y ); } +inline wxRect2DInt::wxRect2DInt( const wxPoint2DInt& pos, const wxSize& size) +{ + m_x = pos.m_x; + m_y = pos.m_y; + m_width = size.x; + m_height = size.y; +} + +inline bool wxRect2DInt::operator == (const wxRect2DInt& rect) const +{ + return (m_x==rect.m_x && m_y==rect.m_y && + m_width==rect.m_width && m_height==rect.m_height); +} + +inline bool wxRect2DInt::operator != (const wxRect2DInt& rect) const +{ + return !(*this == rect); +} + class wxTransform2D { public :