X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cd501207cfda493fe6d3043e266e280d570c0282..156194e1d525407e90c21552f8f7aa05756e0ddc:/include/wx/geometry.h diff --git a/include/wx/geometry.h b/include/wx/geometry.h index 80016c0a09..18fa889e1b 100644 --- a/include/wx/geometry.h +++ b/include/wx/geometry.h @@ -12,7 +12,7 @@ #ifndef _WX_GEOMETRY_H_ #define _WX_GEOMETRY_H_ -#if defined(__GNUG__) && !defined(__APPLE__) +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "geometry.cpp" #endif @@ -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; @@ -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; @@ -738,8 +740,10 @@ public: bool operator == (const wxRect2DInt& rect) const; bool operator != (const wxRect2DInt& rect) const; +#if wxUSE_STREAMS void WriteTo( wxDataOutputStream &stream ) const; void ReadFrom( wxDataInputStream &stream ); +#endif // wxUSE_STREAMS wxInt32 m_x; wxInt32 m_y; @@ -763,6 +767,14 @@ 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 &&