[ 835171 ] Show hidden files in wxGenericDirCtrl

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

diff --git a/src/mgl/colour.cpp b/src/mgl/colour.cpp
index 9eaf41f563aec351f27913d6dc2cc4a597978906..2d4420112910d115babad68f5c26110c3396f9f0 100644 (file)
--- a/src/mgl/colour.cpp
+++ b/src/mgl/colour.cpp
@@ -27,54 +27,42 @@ IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
 
 // Colour
 
 
 // Colour
 

-wxColour::wxColour()
+void wxColour::Init()

 {
 {

-  m_red = m_blue = m_green = 0;
-  m_isInit = FALSE;
-}
-
-wxColour::wxColour(unsigned char r, unsigned char g, unsigned char b)
-{
-  m_red = r;
-  m_green = g;
-  m_blue = b;
-  m_isInit = TRUE;
+    m_red =
+    m_blue =
+    m_green = 0;
+    m_isInit = false;

 }
 
 wxColour::wxColour(const wxColour& col)
 {
 }
 
 wxColour::wxColour(const wxColour& col)
 {

-  m_red = col.m_red;
-  m_green = col.m_green;
-  m_blue = col.m_blue;
-  m_isInit = col.m_isInit;
+    *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_isInit = col.m_isInit;
-  return *this;
+    m_red = col.m_red;
+    m_green = col.m_green;
+    m_blue = col.m_blue;
+    m_isInit = col.m_isInit;
+    return *this;

 }
 
 }
 

-void wxColour::InitFromName(const wxString& col)
+void wxColour::InitFromName(const wxString& name)

 {
 {

-  wxColour *the_colour = wxTheColourDatabase->FindColour (col);
-  if (the_colour)
+    if ( wxTheColourDatabase )

     {
     {

-      m_red = the_colour->Red();
-      m_green = the_colour->Green();
-      m_blue = the_colour->Blue();
-      m_isInit = TRUE;
-    }
-  else
-    {
-      m_red = 0;
-      m_green = 0;
-      m_blue = 0;
-      m_isInit = FALSE;
+        wxColour col = wxTheColourDatabase->Find(name);
+        if ( col.Ok() )
+        {
+            *this = col;
+            return;
+        }

     }
     }

+
+    // leave invalid
+    Init();

 }
 
 wxColour::~wxColour()
 }
 
 wxColour::~wxColour()


@@ -83,8 +71,8 @@ wxColour::~wxColour()
 
 void wxColour::Set(unsigned char r, unsigned char g, unsigned char b)
 {
 
 void wxColour::Set(unsigned char r, unsigned char g, unsigned char b)
 {

-  m_red = r;
-  m_green = g;
-  m_blue = b;
-  m_isInit = TRUE;
+    m_red = r;
+    m_green = g;
+    m_blue = b;
+    m_isInit = true;

 }
 }