Removed dummy wxFont == operator implementation (IIRC was needed to compile with...

[wxWidgets.git] / include / wx / generic / colour.h

diff --git a/include/wx/generic/colour.h b/include/wx/generic/colour.h
index 04e36452540423b92b0c0853dae9048a03023aa7..edaf6a19e3ce83e154d9802448e4ee25234d5945 100644 (file)
--- a/include/wx/generic/colour.h
+++ b/include/wx/generic/colour.h
@@ -15,53 +15,55 @@
 #include "wx/object.h"
 
 // Colour
 #include "wx/object.h"
 
 // Colour

-class WXDLLEXPORT wxColour: public wxColourBase
+class WXDLLIMPEXP_CORE wxColour: public wxColourBase

 {
 public:
     // constructors
     // ------------
 {
 public:
     // constructors
     // ------------

-
-    // default
-    wxColour();

     DEFINE_STD_WXCOLOUR_CONSTRUCTORS
 
     // copy ctors and assignment operators
     DEFINE_STD_WXCOLOUR_CONSTRUCTORS
 
     // copy ctors and assignment operators

-    wxColour(const wxColour& col);
-    wxColour& operator = (const wxColour& col);
+    wxColour(const wxColour& col)
+    {
+        *this = col;
+    }

 
 

-    // dtor
-    ~wxColour();
+    wxColour& operator=(const wxColour& col);

 
     // accessors
 
     // accessors

-    bool Ok() const { return m_isInit; }
+    virtual bool IsOk() const { return m_isInit; }

 
     unsigned char Red() const { return m_red; }
     unsigned char Green() const { return m_green; }
     unsigned char Blue() const { return m_blue; }
 
     unsigned char Red() const { return m_red; }
     unsigned char Green() const { return m_green; }
     unsigned char Blue() const { return m_blue; }

+    unsigned char Alpha() const { return m_alpha; }

 
     // comparison
 
     // comparison

-    bool operator == (const wxColour& colour) const
+    bool operator==(const wxColour& colour) const

     {
         return (m_red == colour.m_red &&
                 m_green == colour.m_green &&
                 m_blue == colour.m_blue &&
     {
         return (m_red == colour.m_red &&
                 m_green == colour.m_green &&
                 m_blue == colour.m_blue &&

+                m_alpha == colour.m_alpha &&

                 m_isInit == colour.m_isInit);
     }
                 m_isInit == colour.m_isInit);
     }

-    bool operator != (const wxColour& colour) const { return !(*this == colour); }

 
 

+    bool operator!=(const wxColour& colour) const { return !(*this == colour); }

 
 protected:
 
     // Helper function
     void Init();
 
 
 protected:
 
     // Helper function
     void Init();
 

-    virtual void InitWith(unsigned char red, unsigned char green, unsigned char blue);
+    virtual void
+    InitRGBA(unsigned char r, unsigned char g, unsigned char b, unsigned char a);

 
 private:
     bool m_isInit;
     unsigned char m_red;
     unsigned char m_blue;
     unsigned char m_green;
 
 private:
     bool m_isInit;
     unsigned char m_red;
     unsigned char m_blue;
     unsigned char m_green;

+    unsigned char m_alpha;

 
 private:
     DECLARE_DYNAMIC_CLASS(wxColour)
 
 private:
     DECLARE_DYNAMIC_CLASS(wxColour)