X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6b5d2431fc188c03bd43ef69b5ad3197646c9289..cf2918d40e990646a1277ba67a029cafe9e0fec8:/include/wx/os2/colour.h diff --git a/include/wx/os2/colour.h b/include/wx/os2/colour.h index 5f01ff010c..e1d44c1c83 100644 --- a/include/wx/os2/colour.h +++ b/include/wx/os2/colour.h @@ -15,14 +15,11 @@ #include "wx/object.h" // Colour -class WXDLLEXPORT wxColour: public wxColourBase +class WXDLLIMPEXP_CORE wxColour: public wxColourBase { public: // constructors // ------------ - - // default - wxColour(); DEFINE_STD_WXCOLOUR_CONSTRUCTORS // Copy ctors and assignment operators @@ -31,10 +28,10 @@ public: wxColour&operator = (const wxColour& rCol); // Dtor - ~wxColour(); + virtual ~wxColour(); // Accessors - bool Ok(void) const {return m_bIsInit; } + virtual 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 +62,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 ;