X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ee19674c9f03aec361a86ccba39adc72baede491..fa8bc37bc20613e53136f26882aee31e11bef131:/include/wx/mac/carbon/colour.h

diff --git a/include/wx/mac/carbon/colour.h b/include/wx/mac/carbon/colour.h
index 88212da6bf..24bdf83813 100644
--- a/include/wx/mac/carbon/colour.h
+++ b/include/wx/mac/carbon/colour.h
@@ -35,6 +35,7 @@ public:
     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 +43,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,17 +55,24 @@ protected :
     // Helper function
     void Init();
 
-    void InitWith( unsigned char red, unsigned char green, unsigned char blue );
+    void InitWith( unsigned char red, unsigned char green, unsigned char blue ) 
+    {
+        InitWith( red, green, blue , 255) ;
+    }
+
+    void InitWith( unsigned char red, unsigned char green, unsigned char blue, unsigned char alpha );
 
 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 Set( const WXCOLORREF* color ) ;
+    void FromRGBColor( const WXCOLORREF* color ) ;
+    
 
 private:
     DECLARE_DYNAMIC_CLASS(wxColour)