X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2d996ed1c44a591c610e51d58d0bf9f802fac165..e63fdcd600e2eb717a19f9fa2895e9256e83c890:/include/wx/msw/colour.h diff --git a/include/wx/msw/colour.h b/include/wx/msw/colour.h index 2cf5908c8b..3f0c568c4a 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_ @@ -35,7 +35,7 @@ public: // copy ctors and assignment operators wxColour( const wxColour& col ); - wxColour( const wxColour* col ); +/* wxColour( const wxColour* col ); */ wxColour& operator = ( const wxColour& col ); // dtor @@ -75,8 +75,11 @@ public: 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; @@ -84,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_