X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b5dbe15d0bacde245539f54c4d97af6b4696f01f..a4301b8f14d21b7d28fc4f6a247b740d945ca6dc:/include/wx/geometry.h?ds=inline diff --git a/include/wx/geometry.h b/include/wx/geometry.h index 237f84dca5..63d120b20e 100644 --- a/include/wx/geometry.h +++ b/include/wx/geometry.h @@ -34,7 +34,7 @@ enum wxOutCode wxOutBottom = 0x04 }; -class WXDLLEXPORT wxPoint2DInt +class WXDLLIMPEXP_CORE wxPoint2DInt { public : inline wxPoint2DInt(); @@ -88,12 +88,9 @@ inline wxPoint2DInt operator+(const wxPoint2DInt& pt1 , const wxPoint2DInt& pt2) inline wxPoint2DInt operator-(const wxPoint2DInt& pt1 , const wxPoint2DInt& pt2); inline wxPoint2DInt operator*(const wxPoint2DInt& pt1 , const wxPoint2DInt& pt2); inline wxPoint2DInt operator*(wxInt32 n , const wxPoint2DInt& pt); -inline wxPoint2DInt operator*(wxInt32 n , const wxPoint2DInt& pt); -inline wxPoint2DInt operator*(const wxPoint2DInt& pt , wxInt32 n); inline wxPoint2DInt operator*(const wxPoint2DInt& pt , wxInt32 n); inline wxPoint2DInt operator/(const wxPoint2DInt& pt1 , const wxPoint2DInt& pt2); inline wxPoint2DInt operator/(const wxPoint2DInt& pt , wxInt32 n); -inline wxPoint2DInt operator/(const wxPoint2DInt& pt , wxInt32 n); inline wxPoint2DInt::wxPoint2DInt() { @@ -182,8 +179,11 @@ inline wxPoint2DInt wxPoint2DInt::operator-() inline wxPoint2DInt& wxPoint2DInt::operator=(const wxPoint2DInt& pt) { - m_x = pt.m_x; - m_y = pt.m_y; + if (this != &pt) + { + m_x = pt.m_x; + m_y = pt.m_y; + } return *this; } @@ -278,7 +278,7 @@ inline wxPoint2DInt operator/(const wxPoint2DInt& pt , wxDouble n) // wxPoint2Ds represent a point or a vector in a 2d coordinate system -class WXDLLEXPORT wxPoint2DDouble +class WXDLLIMPEXP_CORE wxPoint2DDouble { public : inline wxPoint2DDouble(); @@ -411,8 +411,11 @@ inline wxPoint2DDouble wxPoint2DDouble::operator-() inline wxPoint2DDouble& wxPoint2DDouble::operator=(const wxPoint2DDouble& pt) { - m_x = pt.m_x; - m_y = pt.m_y; + if (this != &pt) + { + m_x = pt.m_x; + m_y = pt.m_y; + } return *this; } @@ -509,7 +512,7 @@ inline wxPoint2DDouble operator/(const wxPoint2DDouble& pt , wxInt32 n) // top left and bottom right corner, or by the top left corner and size. A point is contained within the rectangle if // left <= x < right and top <= m_y < bottom , thus it is a half open interval. -class WXDLLEXPORT wxRect2DDouble +class WXDLLIMPEXP_CORE wxRect2DDouble { public: wxRect2DDouble() @@ -523,13 +526,13 @@ 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 conterparts, 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 apropriately + // 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 inline wxDouble GetLeft() const { return m_x; } inline void SetLeft( wxDouble n ) { m_width += m_x - n; m_x = n; } @@ -640,7 +643,7 @@ public: // top left and bottom right corner, or by the top left corner and size. A point is contained within the rectangle if // left <= x < right and top <= m_y < bottom , thus it is a half open interval. -class WXDLLEXPORT wxRect2DInt +class WXDLLIMPEXP_CORE wxRect2DInt { public: wxRect2DInt() { m_x = m_y = m_width = m_height = 0; } @@ -652,11 +655,11 @@ 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 conterparts, 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 apropriately + // 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 inline wxInt32 GetLeft() const { return m_x; } inline void SetLeft( wxInt32 n ) { m_width += m_x - n; m_x = n; }