1. changed wxIconBundle to use m_refData and COW to make copying icon bundles

[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..b024afe21814c48774b7a2a5780d2b27d95b551d 100644 (file)
--- a/include/wx/mac/carbon/colour.h
+++ b/include/wx/mac/carbon/colour.h
@@ -15,6 +15,8 @@
 #include "wx/object.h"
 #include "wx/string.h"
 
 #include "wx/object.h"
 #include "wx/string.h"
 

+struct RGBColor;
+

 // Colour
 class WXDLLEXPORT wxColour: public wxColourBase
 {
 // Colour
 class WXDLLEXPORT wxColour: public wxColourBase
 {


@@ -27,14 +29,16 @@ public:
     DEFINE_STD_WXCOLOUR_CONSTRUCTORS
 
     // dtor
     DEFINE_STD_WXCOLOUR_CONSTRUCTORS
 
     // dtor

-    ~wxColour();
+    virtual ~wxColour();

 
     // accessors
 
     // accessors

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

 
     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
     bool operator == (const wxColour& colour) const
 
     // comparison
     bool operator == (const wxColour& colour) const


@@ -42,29 +46,36 @@ public:
         return (m_isInit == colour.m_isInit
                 && m_red == colour.m_red
                 && m_green == colour.m_green
         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); }
 
     const WXCOLORREF& GetPixel() const { return m_pixel; };
 
     }
     bool operator != (const wxColour& colour) const { return !(*this == colour); }
 
     const WXCOLORREF& GetPixel() const { return m_pixel; };
 

+    // Mac-specific ctor and assignment operator from the native colour
+    wxColour(const RGBColor& col);
+    wxColour& operator=(const RGBColor& col);
+

 protected :
 
     // Helper function
     void Init();
 
 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;
 
 private:
     bool          m_isInit;
     unsigned char m_red;
     unsigned char m_blue;
     unsigned char m_green;

+    unsigned char m_alpha;

 
 public:
     WXCOLORREF m_pixel ;
 
 public:
     WXCOLORREF m_pixel ;

-    void FromRGBColor( const WXCOLORREF* color ) ;
-    
+    void FromRGBColor( WXCOLORREF* color ) ;
+

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