X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/40989e46b86777dd211faeb3e5d2366cdcc6d8cd..5abefd049eaed7d83ed60ddf2750bea830ce06b6:/include/wx/os2/colour.h diff --git a/include/wx/os2/colour.h b/include/wx/os2/colour.h index 807d673645..f0538eab36 100644 --- a/include/wx/os2/colour.h +++ b/include/wx/os2/colour.h @@ -22,7 +22,7 @@ public: // ------------ // default - wxColour() { Init(); } + wxColour(); DEFINE_STD_WXCOLOUR_CONSTRUCTORS // Copy ctors and assignment operators @@ -31,10 +31,11 @@ public: wxColour&operator = (const wxColour& rCol); // Dtor - ~wxColour(); + virtual ~wxColour(); // Accessors - bool Ok(void) const {return m_bIsInit; } + bool Ok() const { return IsOk(); } + bool IsOk(void) const {return m_bIsInit; } unsigned char Red(void) const { return m_cRed; } unsigned char Green(void) const { return m_cGreen; } @@ -65,7 +66,8 @@ private: unsigned char m_cBlue; unsigned char m_cGreen; - virtual void InitWith( unsigned char cRed, unsigned char cGreen, unsigned char cBlue); + virtual void + InitRGBA(unsigned char r, unsigned char g, unsigned char b, unsigned char a); public: WXCOLORREF m_vPixel ;