X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8f884a0dccd6b642f35c441ac9bfc87a6d5b4d35..f8b1df0b15f843b8f47efb9bee38f1de0fa95020:/include/wx/mac/carbon/colour.h diff --git a/include/wx/mac/carbon/colour.h b/include/wx/mac/carbon/colour.h index b98d292dfd..22a3925e52 100644 --- a/include/wx/mac/carbon/colour.h +++ b/include/wx/mac/carbon/colour.h @@ -25,13 +25,9 @@ class WXDLLEXPORT wxColour: public wxColourBase public: // constructors // ------------ - - // default - wxColour() { } DEFINE_STD_WXCOLOUR_CONSTRUCTORS - // dtor - virtual ~wxColour(); + // default copy ctor and dtor are ok // accessors virtual bool IsOk() const { return m_cgColour; } @@ -43,14 +39,14 @@ public: // comparison bool operator == (const wxColour& colour) const; - + bool operator != (const wxColour& colour) const { return !(*this == colour); } CGColorRef GetPixel() const { return m_cgColour; }; - + CGColorRef GetCGColor() const { return m_cgColour; }; CGColorRef CreateCGColor() const { return wxCFRetain( (CGColorRef)m_cgColour ); }; - + void GetRGBColor( RGBColor *col ) const; // Mac-specific ctor and assignment operator from the native colour @@ -59,10 +55,9 @@ public: 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 );