X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d3c7fc996a73e9f6a83067bc28a3c5581a3fee65..687b91d266990129fbbb8c21d92fa4298b458352:/include/wx/mac/carbon/colour.h diff --git a/include/wx/mac/carbon/colour.h b/include/wx/mac/carbon/colour.h index 219761c48f..05fa12dc8f 100644 --- a/include/wx/mac/carbon/colour.h +++ b/include/wx/mac/carbon/colour.h @@ -30,7 +30,8 @@ public: virtual ~wxColour(); // accessors - bool Ok() const {return m_isInit; } + bool Ok() const { return IsOk(); } + bool IsOk() const {return m_isInit; } unsigned char Red() const { return m_red; } unsigned char Green() const { return m_green; } @@ -55,12 +56,8 @@ protected : // Helper function void Init(); - void InitWith( unsigned char red, unsigned char green, unsigned char blue ) - { - InitWith( red, green, blue , wxALPHA_OPAQUE ) ; - } - - void InitWith( unsigned char red, unsigned char green, unsigned char blue, unsigned char alpha ); + virtual void + InitRGBA(unsigned char r, unsigned char g, unsigned char b, unsigned char a); private: bool m_isInit; @@ -72,7 +69,7 @@ private: public: WXCOLORREF m_pixel ; void FromRGBColor( const WXCOLORREF* color ) ; - + private: DECLARE_DYNAMIC_CLASS(wxColour)