X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/47b378bd88260611387af8604a1c8f62355350ab..66c2bf7b1d9326fb650acfaae22ec50528cfbf7c:/include/wx/msw/colour.h diff --git a/include/wx/msw/colour.h b/include/wx/msw/colour.h index c3854f50b8..4b359fb370 100644 --- a/include/wx/msw/colour.h +++ b/include/wx/msw/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 ///////////////////////////////////////////////////////////////////////////// @@ -18,26 +17,17 @@ // Colour // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxColour : public wxColourBase +class WXDLLIMPEXP_CORE wxColour : public wxColourBase { public: // constructors // ------------ - - // default - wxColour() { Init(); } DEFINE_STD_WXCOLOUR_CONSTRUCTORS - - // dtor - virtual ~wxColour(); - - // 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; } @@ -54,11 +44,10 @@ public: && m_alpha == colour.m_alpha; } - bool operator != (const wxColour& colour) const { return !(*this == colour); } + bool operator!=(const wxColour& colour) const { return !(*this == colour); } WXCOLORREF GetPixel() const { return m_pixel; } - public: WXCOLORREF m_pixel; @@ -80,5 +69,4 @@ private: DECLARE_DYNAMIC_CLASS(wxColour) }; -#endif - // _WX_COLOUR_H_ +#endif // _WX_COLOUR_H_