X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b7cacb43db1e69b87b257a67912b4d52995b070a..a4f6fe43c33bd7933645d110ad2719871dab043d:/include/wx/motif/colour.h?ds=sidebyside diff --git a/include/wx/motif/colour.h b/include/wx/motif/colour.h index 3f628a90d6..66adbec41e 100644 --- a/include/wx/motif/colour.h +++ b/include/wx/motif/colour.h @@ -16,15 +16,12 @@ #include "wx/string.h" // Colour -class WXDLLEXPORT wxColour : public wxColourBase +class WXDLLIMPEXP_CORE wxColour : public wxColourBase { DECLARE_DYNAMIC_CLASS(wxColour) public: // constructors // ------------ - - // default - wxColour() { Init(); } DEFINE_STD_WXCOLOUR_CONSTRUCTORS // copy ctors and assignment operators @@ -36,14 +33,13 @@ public: // accessors - bool Ok() const { return IsOk(); } - bool IsOk() const {return m_isInit; } + virtual bool IsOk() const {return m_isInit; } unsigned char Red() const { return m_red; } unsigned char Green() const { return m_green; } unsigned char Blue() const { return m_blue; } - WXPixel GetPixel() const { return m_pixel; }; - void SetPixel(WXPixel pixel) { m_pixel = pixel; m_isInit = true; }; + WXPixel GetPixel() const { return m_pixel; } + void SetPixel(WXPixel pixel) { m_pixel = pixel; m_isInit = true; } inline bool operator == (const wxColour& colour) const { return (m_red == colour.m_red && m_green == colour.m_green && m_blue == colour.m_blue); }