X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/40fcf546f6168f51c070d4ded3c40a75c0780fe8..a70ab3b804b6c363f8bcbed0b4fce94b7fb03612:/interface/wx/gdicmn.h diff --git a/interface/wx/gdicmn.h b/interface/wx/gdicmn.h index fb9d647fab..4872365ac3 100644 --- a/interface/wx/gdicmn.h +++ b/interface/wx/gdicmn.h @@ -402,7 +402,7 @@ public: /** Assignment operator. */ - void operator =(const wxRect& rect); + wxRect& operator=(const wxRect& rect); /** Equality operator. @@ -462,7 +462,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 +612,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 +757,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); @@ -857,6 +857,9 @@ wxRect wxGetClientDisplayRect(); /** Returns the display resolution in pixels per inch. + The @c x component of the returned wxSize object contains the horizontal + resolution and the @c y one -- the vertical resolution. + @header{wx/gdicmn.h} @since 2.9.0 @@ -869,6 +872,9 @@ wxSize wxGetDisplayPPI(); /** Returns the display size in pixels. + For the version taking @a width and @a header arguments, either of them + can be @NULL if the caller is not interested in the returned value. + @header{wx/gdicmn.h} */ void wxDisplaySize(int* width, int* height); @@ -880,6 +886,11 @@ wxSize wxGetDisplaySize(); /** Returns the display size in millimeters. + For the version taking @a width and @a header arguments, either of them + can be @NULL if the caller is not interested in the returned value. + + @see wxGetDisplayPPI() + @header{wx/gdicmn.h} */ void wxDisplaySizeMM(int* width, int* height);