X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a8228fd18ce330f8d8631aef92acfae7f2bb18c1..43c42c18d36c703a88b1b7b697bac27fe5608eca:/include/wx/geometry.h diff --git a/include/wx/geometry.h b/include/wx/geometry.h index 00e19d6c28..aab6ad8166 100644 --- a/include/wx/geometry.h +++ b/include/wx/geometry.h @@ -526,9 +526,9 @@ public: */ // single attribute accessors - inline wxPoint2DDouble GetPosition() + wxPoint2DDouble GetPosition() const { return wxPoint2DDouble(m_x, m_y); } - inline wxSize GetSize() + wxSize GetSize() const { return wxSize((int) m_width, (int) m_height); } // for the edge and corner accessors there are two setters counterparts, the Set.. functions keep the other corners at their @@ -655,8 +655,8 @@ public: // single attribute accessors - inline wxPoint2DInt GetPosition() { return wxPoint2DInt(m_x, m_y); } - inline wxSize GetSize() { return wxSize(m_width, m_height); } + wxPoint2DInt GetPosition() const { return wxPoint2DInt(m_x, m_y); } + wxSize GetSize() const { return wxSize(m_width, m_height); } // for the edge and corner accessors there are two setters counterparts, the Set.. functions keep the other corners at their // position whenever sensible, the Move.. functions keep the size of the rect and move the other corners appropriately @@ -778,7 +778,7 @@ inline bool wxRect2DInt::operator != (const wxRect2DInt& rect) const return !(*this == rect); } -class wxTransform2D +class WXDLLIMPEXP_CORE wxTransform2D { public : virtual ~wxTransform2D() { } @@ -793,24 +793,6 @@ public : virtual wxRect2DInt InverseTransform( const wxRect2DInt &r ) const ; }; -inline void wxTransform2D::Transform( wxRect2DInt* r ) const - { wxPoint2DInt a = r->GetLeftTop() , b = r->GetRightBottom(); Transform( &a ); Transform( &b ); *r = wxRect2DInt( a , b ); } - -inline wxPoint2DInt wxTransform2D::Transform( const wxPoint2DInt &pt ) const - { wxPoint2DInt res = pt; Transform( &res ); return res; } - -inline wxRect2DInt wxTransform2D::Transform( const wxRect2DInt &r ) const - { wxRect2DInt res = r; Transform( &res ); return res; } - -inline void wxTransform2D::InverseTransform( wxRect2DInt* r ) const - { wxPoint2DInt a = r->GetLeftTop() , b = r->GetRightBottom(); InverseTransform( &a ); InverseTransform( &b ); *r = wxRect2DInt( a , b ); } - -inline wxPoint2DInt wxTransform2D::InverseTransform( const wxPoint2DInt &pt ) const - { wxPoint2DInt res = pt; InverseTransform( &res ); return res; } - -inline wxRect2DInt wxTransform2D::InverseTransform( const wxRect2DInt &r ) const - { wxRect2DInt res = r; InverseTransform( &res ); return res; } - #endif // wxUSE_GEOMETRY