enabling alpha on msw colour

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41526 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/msw/colour.h b/include/wx/msw/colour.h
index 1a1460430517d12e1f69bf4a570d0044c54a5cc8..c2e259ef45a871d1b5baa658c86239ef0c9a81f3 100644 (file)
--- 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 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
 
     // 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
         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); }
     }
 
     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_red;
     unsigned char m_blue;
     unsigned char m_green;

+    unsigned char m_alpha;

 
 private:
     DECLARE_DYNAMIC_CLASS(wxColour)
 
 private:
     DECLARE_DYNAMIC_CLASS(wxColour)

diff --git a/src/msw/colour.cpp b/src/msw/colour.cpp
index d79ebc9af7edd36a66457132e2fa630a00d198d1..acd528ef631d73a5247c9deaf8776e7b6e24ce7e 100644 (file)
--- a/src/msw/colour.cpp
+++ b/src/msw/colour.cpp
@@ -68,6 +68,7 @@ void wxColour::Init()
 {
     m_isInit = false;
     m_pixel = 0;
 {
     m_isInit = false;
     m_pixel = 0;

+    m_alpha =

     m_red =
     m_blue =
     m_green = 0;
     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,
 }
 
 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_red = r;
     m_green = g;
     m_blue = b;

+    m_alpha = a;

     m_isInit = true;
     m_pixel = PALETTERGB(m_red, m_green, m_blue);
 }
     m_isInit = true;
     m_pixel = PALETTERGB(m_red, m_green, m_blue);
 }