remove miniframe stuff from GtkOnSize(), it's handled by wxFrame

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

diff --git a/include/wx/cocoa/colour.h b/include/wx/cocoa/colour.h
index f0e3829a73ddfc03f8008ae074c191ca13dc756c..c1bbc340ed4e56d5b71ac746414576d93017e369 100644 (file)
--- a/include/wx/cocoa/colour.h
+++ b/include/wx/cocoa/colour.h
@@ -27,7 +27,16 @@ public:
 
     // default
     wxColour() { Init(); }
-    DEFINE_STD_WXCOLOUR_CONSTRUCTORS
+
+    // the other standard ones: notice that we can't use
+    // DEFINE_STD_WXCOLOUR_CONSTRUCTORS here because we need to call Init() to
+    // initialize m_cocoaNSColor and the macro doesn't do it
+    wxColour( ChannelType red, ChannelType green, ChannelType blue,
+              ChannelType alpha = wxALPHA_OPAQUE )
+        { Init(); Set(red, green, blue, alpha); }
+    wxColour(unsigned long colRGB) { Init(); Set(colRGB); }
+    wxColour(const wxString &colourName) { Init(); Set(colourName); }
+    wxColour(const wxChar *colourName) { Init(); Set(colourName); }
 
     // initialization using existing NSColor
     wxColour( WX_NSColor aColor );
@@ -40,53 +49,59 @@ public:
     virtual ~wxColour();
 
     // accessors
-    bool Ok() const { return m_cocoaNSColor; }
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const { return m_cocoaNSColor; }
     WX_NSColor GetNSColor() { return m_cocoaNSColor; }
 
     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
     {
-        // TODO: Really compare the NSColor
-        return (m_cocoaNSColor == colour.m_cocoaNSColor
-            || (m_red == colour.m_red
-            && m_green == colour.m_green
-            && m_blue == colour.m_blue));
+        return m_cocoaNSColor == colour.m_cocoaNSColor ||
+               (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
-    {   return !(*this == colour); }
+        { return !(*this == colour); }
 
     // Set() functions
     void Set( WX_NSColor aColor );
-    
+
     // reroute the inherited ones
-    void Set(unsigned char red, unsigned char green, unsigned char blue)
-    { wxColourBase::Set(red,green,blue); }
-    
-    // implemented in colourcmn.cpp
+    void Set(unsigned char red,
+             unsigned char green,
+             unsigned char blue,
+             unsigned char alpha = wxALPHA_OPAQUE)
+        { wxColourBase::Set(red, green, blue, alpha); }
+
     bool Set(const wxChar *str)
-    { return wxColourBase::Set(str); }
-    
+        { return wxColourBase::Set(str); }
+
     bool Set(const wxString &str)
-    { return wxColourBase::Set(str); }
-    
+        { return wxColourBase::Set(str); }
+
     void Set(unsigned long colRGB)
-    { wxColourBase::Set(colRGB); }
-    
+        { wxColourBase::Set(colRGB); }
+
 protected:
     // puts the object in an invalid, uninitialized state
     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:
     WX_NSColor m_cocoaNSColor;
     unsigned char m_red;
     unsigned char m_green;
     unsigned char m_blue;
+    unsigned char m_alpha;
 
     DECLARE_DYNAMIC_CLASS(wxColour)
 };