X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ed9dd914653110949b5e061c3283c5554f2a7518..6362d82b3ed82aa6795e4ad03160820f94c9e4d4:/interface/wx/gdicmn.h?ds=sidebyside diff --git a/interface/wx/gdicmn.h b/interface/wx/gdicmn.h index 8a72f9352d..b06c7a331e 100644 --- a/interface/wx/gdicmn.h +++ b/interface/wx/gdicmn.h @@ -311,14 +311,19 @@ public: wxRect Inflate(wxCoord dx, wxCoord dy) const; //@} - //@{ /** - Modifies the rectangle to contain the overlapping box of this rectangle + Modifies this rectangle to contain the overlapping portion of this rectangle and the one passed in as parameter. + + @return This rectangle, modified. */ - wxRect Intersect(const wxRect& rect) const; wxRect& Intersect(const wxRect& rect); - //@} + + /** + Returns the overlapping portion of this rectangle and the one passed in as + parameter. + */ + wxRect Intersect(const wxRect& rect) const; /** Returns @true if this rectangle has a non-empty intersection with the @@ -402,7 +407,7 @@ public: /** Assignment operator. */ - void operator =(const wxRect& rect); + wxRect& operator=(const wxRect& rect); /** Equality operator. @@ -462,7 +467,7 @@ public: /** Assignment operator. */ - void operator =(const wxPoint& pt); + wxPoint& operator=(const wxPoint& pt); bool operator ==(const wxPoint& p1, const wxPoint& p2); bool operator !=(const wxPoint& p1, const wxPoint& p2); @@ -612,7 +617,7 @@ public: is, wxColour::IsOk() will return @false) if the colour wasn't found in the database. */ - wxColour Find(const wxString& colourName); + wxColour Find(const wxString& colourName) const; /** Finds a colour name given the colour. Returns an empty string if the @@ -757,7 +762,7 @@ public: /** Assignment operator. */ - void operator =(const wxSize& sz); + wxSize& operator=(const wxSize& sz); bool operator ==(const wxSize& s1, const wxSize& s2); bool operator !=(const wxSize& s1, const wxSize& s2);