From: Vadim Zeitlin Date: Fri, 3 Aug 2012 12:50:03 +0000 (+0000) Subject: Make wxRect2D::Get{Position,Size}() const. X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/b3b3713300ab8fc54010bbe68e982153e53baf6c?ds=inline Make wxRect2D::Get{Position,Size}() const. Accessors should be const. Closes #14555. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72289 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/geometry.h b/include/wx/geometry.h index 00e19d6c28..63d120b20e 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 diff --git a/interface/wx/geometry.h b/interface/wx/geometry.h index 5ad471c399..80f091fca7 100644 --- a/interface/wx/geometry.h +++ b/interface/wx/geometry.h @@ -147,8 +147,8 @@ public: // single attribute accessors - wxPoint2DDouble GetPosition(); - wxSize GetSize(); + wxPoint2DDouble GetPosition() const; + wxSize GetSize() const; // 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 @@ -238,8 +238,8 @@ public: // single attribute accessors - wxPoint2DInt GetPosition(); - wxSize GetSize(); + wxPoint2DInt GetPosition() const; + wxSize GetSize() const; // 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