X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/40989e46b86777dd211faeb3e5d2366cdcc6d8cd..9bd5c5fcda3fe2222bf37f1615961516d6b40e7f:/include/wx/cocoa/colour.h?ds=sidebyside diff --git a/include/wx/cocoa/colour.h b/include/wx/cocoa/colour.h index db7a4e9444..3209d94f0c 100644 --- a/include/wx/cocoa/colour.h +++ b/include/wx/cocoa/colour.h @@ -19,20 +19,16 @@ // wxColour // ======================================================================== -class WXDLLEXPORT wxColour : public wxColourBase +class WXDLLIMPEXP_CORE wxColour : public wxColourBase { public: // constructors // ------------ - - // default - wxColour() { Init(); } DEFINE_STD_WXCOLOUR_CONSTRUCTORS // initialization using existing NSColor wxColour( WX_NSColor aColor ); - // copy ctors and assignment operators wxColour( const wxColour& col ); wxColour& operator = ( const wxColour& col ); @@ -40,39 +36,56 @@ public: virtual ~wxColour(); // accessors - bool Ok() const { return m_cocoaNSColor; } + virtual bool IsOk() const { return m_cocoaNSColor; } WX_NSColor GetNSColor() { return m_cocoaNSColor; } + WX_NSColor GetNSColor() const { 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, + unsigned char alpha = wxALPHA_OPAQUE) + { wxColourBase::Set(red, green, blue, alpha); } + + bool Set(const wxString &str) + { return wxColourBase::Set(str); } + + void Set(unsigned long 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) };