X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a3bf7524f394af039efe196a186f7969cbabcc19..06f6df7d4657582a637ac79f3452b61b1cbb10cc:/include/wx/mac/colour.h diff --git a/include/wx/mac/colour.h b/include/wx/mac/colour.h index 25b6d3b726..88deff7b3c 100644 --- a/include/wx/mac/colour.h +++ b/include/wx/mac/colour.h @@ -25,19 +25,17 @@ class WXDLLEXPORT wxColour: public wxObject public: // ctors // default - wxColour(); + wxColour() { Init(); } // from RGB - wxColour( unsigned char red, unsigned char green, unsigned char blue ); + wxColour( unsigned char red, unsigned char green, unsigned char blue ) + { Set(red, green, blue); } wxColour( unsigned long colRGB ) - : m_isInit(FALSE), m_red(0), m_blue(0), m_green(0) { Set(colRGB); } // implicit conversion from the colour name wxColour( const wxString &colourName ) - : m_isInit(FALSE), m_red(0), m_blue(0), m_green(0) { InitFromName(colourName); } wxColour( const wxChar *colourName ) - : m_isInit(FALSE), m_red(0), m_blue(0), m_green(0) { InitFromName(colourName); } // copy ctors and assignment operators @@ -86,6 +84,8 @@ private: unsigned char m_blue; unsigned char m_green; + void Init(); + public: WXCOLORREF m_pixel ; void Set( const WXCOLORREF* color ) ;