X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f03fc89fff2d6e823e7d4d14fbe14822ad6777b1..801aa1782caa8f612fec05278d6c63a1aa6a9e6a:/include/wx/gdicmn.h?ds=sidebyside diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h index 63abe6c8d1..564ed2e3fe 100644 --- a/include/wx/gdicmn.h +++ b/include/wx/gdicmn.h @@ -105,7 +105,7 @@ enum wxStockCursor wxCURSOR_CROSS_REVERSE, wxCURSOR_DOUBLE_ARROW, wxCURSOR_BASED_ARROW_UP, - wxCURSOR_BASED_ARROW_DOWN + wxCURSOR_BASED_ARROW_DOWN, #endif // X11 wxCURSOR_MAX @@ -223,11 +223,13 @@ public: class WXDLLEXPORT wxRect { public: - wxRect(); - wxRect(long x, long y, long w, long h); + wxRect() { x = y = width = height = 0; } + wxRect(long xx, long yy, long ww, long hh) + { x = xx; y = yy; width = ww; height = hh; } wxRect(const wxPoint& topLeft, const wxPoint& bottomRight); wxRect(const wxPoint& pos, const wxSize& size); - wxRect(const wxRect& rect); + + // default copy ctor and assignment operators ok long GetX() const { return x; } void SetX(long xx) { x = xx; } @@ -249,9 +251,8 @@ public: long GetBottom() const { return y + height; } long GetRight() const { return x + width; } - wxRect& operator = (const wxRect& rect); - bool operator == (const wxRect& rect); - bool operator != (const wxRect& rect); + bool operator == (const wxRect& rect) const; + bool operator != (const wxRect& rect) const { return !(*this == rect); } public: long x, y, width, height;