From c2b9ae5f7fdabc38a9814b5a1a8d16932a610024 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Sat, 30 Sep 2006 13:29:45 +0000 Subject: [PATCH] enabling alpha on msw colour git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41526 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/msw/colour.h | 5 ++++- src/msw/colour.cpp | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/include/wx/msw/colour.h b/include/wx/msw/colour.h index 1a14604305..c2e259ef45 100644 --- a/include/wx/msw/colour.h +++ b/include/wx/msw/colour.h @@ -41,6 +41,7 @@ public: 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,7 +49,8 @@ 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); } @@ -71,6 +73,7 @@ private: unsigned char m_red; unsigned char m_blue; unsigned char m_green; + unsigned char m_alpha; private: DECLARE_DYNAMIC_CLASS(wxColour) diff --git a/src/msw/colour.cpp b/src/msw/colour.cpp index d79ebc9af7..acd528ef63 100644 --- a/src/msw/colour.cpp +++ b/src/msw/colour.cpp @@ -68,6 +68,7 @@ void wxColour::Init() { m_isInit = false; m_pixel = 0; + m_alpha = m_red = m_blue = m_green = 0; @@ -78,11 +79,12 @@ wxColour::~wxColour() } void wxColour::InitRGBA(unsigned char r, unsigned char g, unsigned char b, - unsigned char WXUNUSED(a)) + unsigned char a) { m_red = r; m_green = g; m_blue = b; + m_alpha = a; m_isInit = true; m_pixel = PALETTERGB(m_red, m_green, m_blue); } -- 2.45.2