X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/aea95b1c3a8ae221cc3aade5ce49a3cf848fd56a..333e57d578e9e0fb6555452b5a53698ffd85ee69:/include/wx/msw/colour.h diff --git a/include/wx/msw/colour.h b/include/wx/msw/colour.h index 1a14604305..c3854f50b8 100644 --- a/include/wx/msw/colour.h +++ b/include/wx/msw/colour.h @@ -36,11 +36,13 @@ public: // accessors // --------- - bool Ok() const { return m_isInit; } + bool Ok() const { return IsOk(); } + bool IsOk() const { return m_isInit; } unsigned char Red() const { return m_red; } unsigned char Green() const { return m_green; } unsigned char Blue() const { return m_blue; } + unsigned char Alpha() const { return m_alpha ; } // comparison bool operator==(const wxColour& colour) const @@ -48,12 +50,13 @@ public: return m_isInit == colour.m_isInit && m_red == colour.m_red && m_green == colour.m_green - && m_blue == colour.m_blue; + && m_blue == colour.m_blue + && m_alpha == colour.m_alpha; } bool operator != (const wxColour& colour) const { return !(*this == colour); } - WXCOLORREF GetPixel() const { return m_pixel; }; + WXCOLORREF GetPixel() const { return m_pixel; } public: @@ -71,6 +74,7 @@ private: unsigned char m_red; unsigned char m_blue; unsigned char m_green; + unsigned char m_alpha; private: DECLARE_DYNAMIC_CLASS(wxColour)