X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5f83a4540d1044f56b00147303786decd12a2dc2..9d9b77552eeb78e0c7ee903aa265dc187651ff57:/include/wx/msw/colour.h diff --git a/include/wx/msw/colour.h b/include/wx/msw/colour.h index 52f15ed96f..7546b611c3 100644 --- a/include/wx/msw/colour.h +++ b/include/wx/msw/colour.h @@ -6,7 +6,7 @@ // Created: 01/02/97 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_COLOUR_H_ @@ -15,6 +15,7 @@ #ifdef __GNUG__ #pragma interface "colour.h" #endif +#include "wx/object.h" // Colour class WXDLLEXPORT wxColour: public wxObject @@ -64,18 +65,21 @@ public: unsigned char Blue() const { return m_blue; } // comparison - bool operator == (const wxColour& colour) + bool operator == (const wxColour& colour) const { return (m_red == colour.m_red && m_green == colour.m_green && m_blue == colour.m_blue); } - bool operator != (const wxColour& colour) { return !(*this == colour); } + bool operator != (const wxColour& colour) const { return !(*this == colour); } WXCOLORREF GetPixel() const { return m_pixel; }; +public: + WXCOLORREF m_pixel; + private: - bool m_isInit; + bool m_isInit; unsigned char m_red; unsigned char m_blue; unsigned char m_green; @@ -83,12 +87,9 @@ private: // helper func void InitFromName(const wxString& colourName); -public: - WXCOLORREF m_pixel ; - private: DECLARE_DYNAMIC_CLASS(wxColour) }; #endif - // _WX_COLOUR_H_ + // _WX_COLOUR_H_