Wine fixes

[wxWidgets.git] / include / wx / mac / carbon / colour.h

diff --git a/include/wx/mac/carbon/colour.h b/include/wx/mac/carbon/colour.h
index 3abeee88ea8657a1c0b2bae291136184b8e7b4c1..40535989035294e58f59167ba719a3de0b92d5c6 100644 (file)
--- a/include/wx/mac/carbon/colour.h
+++ b/include/wx/mac/carbon/colour.h
@@ -27,14 +27,16 @@ public:
     DEFINE_STD_WXCOLOUR_CONSTRUCTORS
 
     // dtor
-    ~wxColour();
+    virtual ~wxColour();
 
     // accessors
-    bool Ok() const {return m_isInit; }
+    bool Ok() const { return IsOk(); }
+    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 Alpha() const { return m_alpha; }
 
     // comparison
     bool operator == (const wxColour& colour) const
@@ -42,7 +44,8 @@ public:
         return (m_isInit == colour.m_isInit
                 && m_red == colour.m_red
                 && m_green == colour.m_green
-                && m_blue == colour.m_blue);
+                && m_blue == colour.m_blue
+                && m_alpha == colour.m_alpha);
     }
     bool operator != (const wxColour& colour) const { return !(*this == colour); }
 
@@ -53,18 +56,20 @@ protected :
     // Helper function
     void Init();
 
-    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;
+    unsigned char m_alpha;
 
 public:
     WXCOLORREF m_pixel ;
-    void FromRGBColor( const WXCOLORREF* color ) ;
-    
+    void FromRGBColor( WXCOLORREF* color ) ;
+
 
 private:
     DECLARE_DYNAMIC_CLASS(wxColour)