X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/aea95b1c3a8ae221cc3aade5ce49a3cf848fd56a..9869c26285dc51d13607cddaa04f65ce983653a5:/include/wx/os2/colour.h?ds=sidebyside diff --git a/include/wx/os2/colour.h b/include/wx/os2/colour.h index 611a2e2512..857e533c41 100644 --- a/include/wx/os2/colour.h +++ b/include/wx/os2/colour.h @@ -4,7 +4,6 @@ // Author: David Webster // Modified by: // Created: 10/13/99 -// RCS-ID: $Id$ // Copyright: (c) David Webster // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -15,14 +14,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 +30,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; } @@ -52,7 +48,7 @@ public: bool operator != (const wxColour& rColour) const { return !(*this == rColour); } - WXCOLORREF GetPixel(void) const { return m_vPixel; }; + WXCOLORREF GetPixel(void) const { return m_vPixel; } private: