compilation fix for STL build; also don't pass unknown string potentially containing...

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

diff --git a/src/generic/colour.cpp b/src/generic/colour.cpp
index e9bccfc59fba116e5d0cb54b7c600aa17284ae9a..70600717d7f7c64cb78fcb24af618c5fb1a43afb 100644 (file)
--- a/src/generic/colour.cpp
+++ b/src/generic/colour.cpp
@@ -31,36 +31,17 @@ 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;
 }
 

-wxColour::wxColour()
-{
-    Init();
-}
-
-wxColour::wxColour(const wxColour& 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;
 }
 

-wxColour::~wxColour()
-{
-}
-
-void wxColour::InitWith(unsigned char r, unsigned char g, unsigned char b)
-{
-    m_red = r;
-    m_green = g;
-    m_blue = b;
-    m_isInit = true;
-}