Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

enabling alpha on msw colour

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41526 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2006-09-30 13:29:45 +00:00
parent 6fea499ca8
commit c2b9ae5f7f
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/wx/msw/colour.h
View File

@@ -41,6 +41,7 @@ public:
unsigned char Red() const { return m_red; } unsigned char Red() const { return m_red; }
unsigned char Green() const { return m_green; } unsigned char Green() const { return m_green; }
unsigned char Blue() const { return m_blue; } unsigned char Blue() const { return m_blue; }
unsigned char Alpha() const { return m_alpha ; }
// comparison // comparison
bool operator==(const wxColour& colour) const bool operator==(const wxColour& colour) const
@@ -48,7 +49,8 @@ public:
return m_isInit == colour.m_isInit return m_isInit == colour.m_isInit
&& m_red == colour.m_red && m_red == colour.m_red
&& m_green == colour.m_green && 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); } bool operator != (const wxColour& colour) const { return !(*this == colour); }
@@ -71,6 +73,7 @@ private:
unsigned char m_red; unsigned char m_red;
unsigned char m_blue; unsigned char m_blue;
unsigned char m_green; unsigned char m_green;
unsigned char m_alpha;
private: private:
DECLARE_DYNAMIC_CLASS(wxColour) DECLARE_DYNAMIC_CLASS(wxColour)

4
src/msw/colour.cpp
View File

@@ -68,6 +68,7 @@ void wxColour::Init()
{ {
m_isInit = false; m_isInit = false;
m_pixel = 0; m_pixel = 0;
m_alpha =
m_red = m_red =
m_blue = m_blue =
m_green = 0; m_green = 0;
@@ -78,11 +79,12 @@ wxColour::~wxColour()
} }
void wxColour::InitRGBA(unsigned char r, unsigned char g, unsigned char b, void wxColour::InitRGBA(unsigned char r, unsigned char g, unsigned char b,
unsigned char WXUNUSED(a)) unsigned char a)
{ {
m_red = r; m_red = r;
m_green = g; m_green = g;
m_blue = b; m_blue = b;
m_alpha = a;
m_isInit = true; m_isInit = true;
m_pixel = PALETTERGB(m_red, m_green, m_blue); m_pixel = PALETTERGB(m_red, m_green, m_blue);
} }