X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d6f0a4b367c6d68d9fea84817f5a982163665f37..ec75d791f043b3b43cac9825a2c62e9d5321e616:/include/wx/msw/colour.h diff --git a/include/wx/msw/colour.h b/include/wx/msw/colour.h index 3f0c568c4a..56ef566d85 100644 --- a/include/wx/msw/colour.h +++ b/include/wx/msw/colour.h @@ -30,12 +30,11 @@ public: // implicit conversion from the colour name wxColour( const wxString &colourName ) { InitFromName(colourName); } - wxColour( const char *colourName ) { InitFromName(colourName); } + wxColour( const wxChar *colourName ) { InitFromName(colourName); } // copy ctors and assignment operators wxColour( const wxColour& col ); -/* wxColour( const wxColour* col ); */ wxColour& operator = ( const wxColour& col ); // dtor @@ -65,12 +64,14 @@ public: unsigned char Blue() const { return m_blue; } // comparison - bool operator == (const wxColour& colour) const + bool operator==(const wxColour& colour) const { - return (m_red == colour.m_red && - m_green == colour.m_green && - m_blue == colour.m_blue); + 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) const { return !(*this == colour); } WXCOLORREF GetPixel() const { return m_pixel; };