X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4707b84cd074ff2ae9ada99579f864eb300f8774..b5fe7ca67bf3121959a0b5a59afd00c1708f2f03:/interface/wx/colour.h?ds=sidebyside diff --git a/interface/wx/colour.h b/interface/wx/colour.h index 33558722b0..2a2193d9ff 100644 --- a/interface/wx/colour.h +++ b/interface/wx/colour.h @@ -14,8 +14,8 @@ @{ */ #define wxC2S_NAME 1 //!< Return colour name, when possible. -#define wxC2S_CSS_SYNTAX 2 //!< Return colour in rgb(r,g,b) syntax. -#define wxC2S_HTML_SYNTAX 4 //!< Return colour in #rrggbb syntax. +#define wxC2S_CSS_SYNTAX 2 //!< Return colour in "rgb(r,g,b)" syntax. +#define wxC2S_HTML_SYNTAX 4 //!< Return colour in "#rrggbb" syntax. //@} @@ -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 */ //@{ /**