X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d3c7fc996a73e9f6a83067bc28a3c5581a3fee65..05112735c29d896a101918aacd2224b54f6dd653:/include/wx/os2/colour.h?ds=sidebyside diff --git a/include/wx/os2/colour.h b/include/wx/os2/colour.h index f8d69fa6e2..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 @@ -34,7 +31,7 @@ public: 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 ;