X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5273bf2fd3292ec3ab3da4f0c197b2f0e93df32e..5d644707ca96dcaa63dc5a24c9eb5c2b7ee0b50d:/include/wx/mac/colour.h?ds=sidebyside diff --git a/include/wx/mac/colour.h b/include/wx/mac/colour.h index c290cbefd6..02383e7ff2 100644 --- a/include/wx/mac/colour.h +++ b/include/wx/mac/colour.h @@ -28,11 +28,17 @@ public: wxColour(); // from RGB wxColour( unsigned char red, unsigned char green, unsigned char blue ); - wxColour( unsigned long colRGB ) { Set(colRGB); } + 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 ) { InitFromName(colourName); } - wxColour( const char *colourName ) { InitFromName(colourName); } + wxColour( const wxString &colourName ) + : m_isInit(FALSE), m_red(0), m_blue(0), m_green(0) + { InitFromName(colourName); } + wxColour( const char *colourName ) + : m_isInit(FALSE), m_red(0), m_blue(0), m_green(0) + { InitFromName(colourName); } // copy ctors and assignment operators wxColour( const wxColour& col ); @@ -68,11 +74,12 @@ public: // comparison bool operator == (const wxColour& colour) const { - return (m_red == colour.m_red && + return (m_isInit == colour.m_isInit && + 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); } void InitFromName(const wxString& col);