wxchar.h doesn't have to be C file anymore, it's C++

[wxWidgets.git] / src / generic / colour.cpp

diff --git a/src/generic/colour.cpp b/src/generic/colour.cpp
index e9bccfc59fba116e5d0cb54b7c600aa17284ae9a..6cda3d1e84adf32793bfea27cf4ea9b77c2e5cd0 100644 (file)
--- a/src/generic/colour.cpp
+++ b/src/generic/colour.cpp
@@ -31,6 +31,7 @@ void wxColour::Init()
     m_red =
     m_blue =
     m_green = 0;
     m_red =
     m_blue =
     m_green = 0;

+    m_alpha = wxALPHA_OPAQUE;

     m_isInit = false;
 }
 
     m_isInit = false;
 }
 


@@ -44,11 +45,12 @@ wxColour::wxColour(const wxColour& col)
     *this = col;
 }
 
     *this = col;
 }
 

-wxColour& wxColour::operator =(const wxColour& col)
+wxColour& wxColour::operator=(const wxColour& col)

 {
     m_red = col.m_red;
     m_green = col.m_green;
     m_blue = col.m_blue;
 {
     m_red = col.m_red;
     m_green = col.m_green;
     m_blue = col.m_blue;

+    m_alpha = col.m_alpha;

     m_isInit = col.m_isInit;
     return *this;
 }
     m_isInit = col.m_isInit;
     return *this;
 }


@@ -57,10 +59,14 @@ wxColour::~wxColour()
 {
 }
 
 {
 }
 

-void wxColour::InitWith(unsigned char r, unsigned char g, unsigned char b)
+void wxColour::InitRGBA(unsigned char r,
+                        unsigned char g,
+                        unsigned char b,
+                        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_isInit = true;
 }