X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7f5426f09c68bf42e58e3932e2bcb0322caa6b41..992527a5738f7fb629d2aaeee64cfc733ddb7e1c:/include/wx/generic/colour.h diff --git a/include/wx/generic/colour.h b/include/wx/generic/colour.h index a5707e3039..28627daa0a 100644 --- a/include/wx/generic/colour.h +++ b/include/wx/generic/colour.h @@ -30,10 +30,11 @@ public: wxColour& operator=(const wxColour& col); // dtor - ~wxColour(); + 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; } @@ -57,12 +58,8 @@ protected: // Helper function void Init(); - virtual void InitWith(unsigned char red, unsigned char green, unsigned char blue) - { - InitWith(red, green, blue, wxALPHA_OPAQUE); - } - - virtual 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;