X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/aea95b1c3a8ae221cc3aade5ce49a3cf848fd56a..8e77fd8bca165aab9709649d79a7cbc6a172d4e1:/include/wx/os2/colour.h diff --git a/include/wx/os2/colour.h b/include/wx/os2/colour.h index 611a2e2512..7fc1a01c81 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; } @@ -52,7 +49,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: