update for bakefile 0.2.6

[wxWidgets.git] / interface / wx / colour.h

diff --git a/interface/wx/colour.h b/interface/wx/colour.h
index b1fcc6bebffa0d52429b365ad83a3f3869dbe2b8..2a2193d9ff7e5a5197852d3097666bf3e0a32004 100644 (file)
--- 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 */
 //@{
 
 /**