X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a69aabc360d54a93e355fab72c6513c75aaa7337..0ca07313fb52c48ecf6b956593d8b3e961a5de63:/include/wx/mac/carbon/colour.h?ds=sidebyside diff --git a/include/wx/mac/carbon/colour.h b/include/wx/mac/carbon/colour.h index 2cad2126ee..54fb53afba 100644 --- a/include/wx/mac/carbon/colour.h +++ b/include/wx/mac/carbon/colour.h @@ -27,7 +27,7 @@ public: DEFINE_STD_WXCOLOUR_CONSTRUCTORS // dtor - ~wxColour(); + virtual ~wxColour(); // accessors bool Ok() const {return m_isInit; } @@ -55,12 +55,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 +68,7 @@ private: public: WXCOLORREF m_pixel ; void FromRGBColor( const WXCOLORREF* color ) ; - + private: DECLARE_DYNAMIC_CLASS(wxColour)