X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f84a986cfc6e512240b77fcdfbacc769b8a0cd02..09b895cb4a954494063eb17d3dc302a654fd99e5:/include/wx/mac/carbon/colour.h

diff --git a/include/wx/mac/carbon/colour.h b/include/wx/mac/carbon/colour.h
index 9acf4d42b9..431149f060 100644
--- a/include/wx/mac/carbon/colour.h
+++ b/include/wx/mac/carbon/colour.h
@@ -15,63 +15,61 @@
 #include "wx/object.h"
 #include "wx/string.h"
 
+#include "wx/mac/corefoundation/cfref.h"
+
+struct RGBColor;
+
 // Colour
-class WXDLLEXPORT wxColour: public wxColourBase
+class WXDLLIMPEXP_CORE wxColour: public wxColourBase
 {
 public:
     // constructors
     // ------------
-
-    // default
-    wxColour() { Init(); }
     DEFINE_STD_WXCOLOUR_CONSTRUCTORS
 
-    // dtor
-    virtual ~wxColour();
+    // default copy ctor and dtor are ok
 
     // accessors
-    bool Ok() const { return IsOk(); }
-    bool IsOk() const;
+    virtual bool IsOk() const { return m_cgColour; }
 
-    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; }
+    ChannelType Red() const { return m_red; }
+    ChannelType Green() const { return m_green; }
+    ChannelType Blue() const { return m_blue; }
+    ChannelType Alpha() const { return m_alpha; }
 
     // comparison
-    bool operator == (const wxColour& colour) const
-    {
-        return (m_isInit == colour.m_isInit
-                && m_red == colour.m_red
-                && m_green == colour.m_green
-                && m_blue == colour.m_blue
-                && m_alpha == colour.m_alpha);
-    }
+    bool operator == (const wxColour& colour) const;
+
     bool operator != (const wxColour& colour) const { return !(*this == colour); }
 
-    const WXCOLORREF& GetPixel() const { return m_pixel; };
+    CGColorRef GetPixel() const { return m_cgColour; };
 
-protected :
+    CGColorRef GetCGColor() const { return m_cgColour; };
+    CGColorRef CreateCGColor() const { return wxCFRetain( (CGColorRef)m_cgColour ); };
 
-    // Helper function
-    void Init();
+    void GetRGBColor( RGBColor *col ) const;
 
-    virtual void
-    InitRGBA(unsigned char r, unsigned char g, unsigned char b, unsigned char a);
+    // Mac-specific ctor and assignment operator from the native colour
+    // assumes ownership of CGColorRef
+    wxColour( CGColorRef col );
+    wxColour(const RGBColor& col);
+    wxColour& operator=(const RGBColor& col);
+    wxColour& operator=(CGColorRef col);
+    wxColour& operator=(const wxColour& col);
 
+protected :
+    virtual void
+    InitRGBA(ChannelType r, ChannelType g, ChannelType b, ChannelType a);
+    void InitRGBColor( const RGBColor& col );
+    void InitCGColorRef( CGColorRef col );
 private:
-    bool          m_isInit;
-    unsigned char m_red;
-    unsigned char m_blue;
-    unsigned char m_green;
-    unsigned char m_alpha;
+    wxCFRef<CGColorRef>     m_cgColour;
 
-public:
-    WXCOLORREF m_pixel ;
-    void FromRGBColor( WXCOLORREF* color ) ;
+    ChannelType             m_red;
+    ChannelType             m_blue;
+    ChannelType             m_green;
+    ChannelType             m_alpha;
 
-
-private:
     DECLARE_DYNAMIC_CLASS(wxColour)
 };