X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b150bffc9e137b1fbcb29592512642f65ed331f2..66c2bf7b1d9326fb650acfaae22ec50528cfbf7c:/include/wx/generic/colour.h diff --git a/include/wx/generic/colour.h b/include/wx/generic/colour.h index feb4928550..5db020cacd 100644 --- a/include/wx/generic/colour.h +++ b/include/wx/generic/colour.h @@ -4,7 +4,6 @@ // Author: Julian Smart // Modified by: // Created: 01/02/97 -// RCS-ID: $Id$ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -15,25 +14,23 @@ #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 - wxColour(const wxColour& col); - wxColour& operator=(const wxColour& col); + wxColour(const wxColour& col) + { + *this = col; + } - // dtor - virtual ~wxColour(); + wxColour& operator=(const wxColour& col); // accessors - 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; }