X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c0e97a5ec44e77322eb830c084b317eb68680128..574be073c070a9bbe81ad68e98187b0b9e82c2df:/interface/wx/colour.h?ds=sidebyside diff --git a/interface/wx/colour.h b/interface/wx/colour.h index b1fcc6bebf..2a2193d9ff 100644 --- a/interface/wx/colour.h +++ b/interface/wx/colour.h @@ -128,7 +128,7 @@ public: Returns @true if the colour object is valid (the colour has been initialised with RGB values). */ - bool IsOk() const; + virtual bool IsOk() const; /** Returns the red intensity. @@ -164,15 +164,12 @@ public: */ bool operator !=(const wxColour& colour) const; - //@{ /** Assignment operator, using a colour name to be found in the colour database. @see wxColourDatabase */ - wxColour operator =(const wxColour& colour); - wxColour operator =(const wxString& colourName); - //@} + wxColour& operator=(const wxColour& colour); /** Tests the equality of two colours by comparing individual red, green, blue @@ -200,7 +197,7 @@ wxColour* wxWHITE; // Global functions/macros // ============================================================================ -/** @ingroup group_funcmacro_misc */ +/** @addtogroup group_funcmacro_misc */ //@{ /**