fixed last commit to not break ToString() for negative numbers but still fix it for...

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

diff --git a/src/mgl/colour.cpp b/src/mgl/colour.cpp
index ebab19fba22f0f7c7dfeab0d7d38f9451d30a2b8..da27128ada14634ac94cb7319c717925d86089d3 100644 (file)
--- a/src/mgl/colour.cpp
+++ b/src/mgl/colour.cpp
@@ -32,7 +32,12 @@ void wxColour::Init()
     m_red =
     m_blue =
     m_green = 0;
-    m_isInit = FALSE;
+    m_isInit = false;
+}
+
+wxColour::wxColour()
+{
+    Init();
 }
 
 wxColour::wxColour(const wxColour& col)
@@ -51,15 +56,18 @@ wxColour& wxColour::operator =(const wxColour& col)
 
 void wxColour::InitFromName(const wxString& name)
 {
-    wxColour *col = wxTheColourDatabase->Find(name);
-    if ( col.Ok() )
+    if ( wxTheColourDatabase )
     {
-        *this = col;
-    }
-    else
-    {
-        Init();
+        wxColour col = wxTheColourDatabase->Find(name);
+        if ( col.Ok() )
+        {
+            *this = col;
+            return;
+        }
     }
+
+    // leave invalid
+    Init();
 }
 
 wxColour::~wxColour()
@@ -71,5 +79,5 @@ 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_isInit = true;
 }