added CreateByName(), use it in wxColourDatabase

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

include/wx/gtk/colour.h

@@ -80,6 +80,9 @@ public:
     unsigned char Blue() const;
 
 
+    // Get colour from name or wxNullColour
+    static wxColour CreateByName(const wxString& name);
+
     // Implementation part
     void CalcPixel( GdkColormap *cmap );
     int GetPixel() const;

include/wx/gtk1/colour.h

@@ -80,6 +80,9 @@ public:
     unsigned char Blue() const;
 
 
+    // Get colour from name or wxNullColour
+    static wxColour CreateByName(const wxString& name);
+
     // Implementation part
     void CalcPixel( GdkColormap *cmap );
     int GetPixel() const;

src/common/gdicmn.cpp

@@ -408,11 +408,9 @@ wxColour wxColourDatabase::Find(const wxString& colour) const
     if ( it != m_map->end() )
         return *(it->second);
 
-    // if we didn't find it,query the system, maybe it knows about it
+    // if we didn't find it, query the system, maybe it knows about it
-    //
+#if defined(__WXGTK__) || defined(__X__)
-    // TODO: move this into platform-specific files
+    wxColour col = wxColour::CreateByName(colour);
-#ifdef __WXGTK__
-    wxColour col( colour );
 
     if ( col.Ok() )
     {
@@ -422,6 +420,7 @@ wxColour wxColourDatabase::Find(const wxString& colour) const
 
     return col;
 #elif defined(__X__)
+    // TODO: move this to wxColour::CreateByName()
     XColor xcolour;
 
 #ifdef __WXMOTIF__

src/gtk/colour.cpp

@@ -159,34 +159,44 @@ wxColour::wxColour( unsigned char red, unsigned char green, unsigned char blue )
     M_COLDATA->m_color.pixel = 0;
 }
 
+/* static */
+wxColour wxColour::CreateByName(const wxString& name)
+{
+    wxColour col;
+
+    GdkColor colGDK;
+    if ( gdk_color_parse( wxGTK_CONV( name ), &colGDK ) )
+    {
+        wxColourRefData *refData = new wxColourRefData;
+        refData->m_color = colGDK;
+        col.m_refData = refData;
+    }
+
+    return col;
+}
 
 
 void wxColour::InitFromName( const wxString &colourName )
 {
-    wxColour* col = NULL;
+    // check the cache first
-    if ( (wxTheColourDatabase) && (col = wxTheColourDatabase->FindColourNoAdd(colourName)) )
+    wxColour col;
+    if ( wxTheColourDatabase )
     {
-        UnRef();
+        col = wxTheColourDatabase->Find(colourName);
-        if (col) Ref( *col );
+    }
+
+    if ( !col.Ok() )
+    {
+        col = CreateByName(colourName);
+    }
+
+    if ( col.Ok() )
+    {
+        *this = col;
     }
     else
     {
-        m_refData = new wxColourRefData();
+        wxFAIL_MSG( wxT("wxColour: couldn't find colour") );
-        
-        if (!gdk_color_parse( wxGTK_CONV( colourName ), &M_COLDATA->m_color ))
-        {
-            // VZ: asserts are good in general but this one is triggered by
-            //     calling wxColourDatabase::FindColour() with an
-            //     unrecognized colour name and this can't be avoided from the
-            //     user code, so don't give it here
-            //
-            //     a better solution would be to changed code in FindColour()
-
-            //wxFAIL_MSG( wxT("wxColour: couldn't find colour") );
-
-            delete m_refData;
-            m_refData = (wxObjectRefData *) NULL;
-        }
     }
 }
 
@@ -196,17 +206,17 @@ wxColour::~wxColour()
 
 bool wxColour::operator == ( const wxColour& col ) const
 {
-    if (m_refData == col.m_refData) return TRUE;
+    if (m_refData == col.m_refData)
+        return TRUE;
 
-    if (!m_refData || !col.m_refData) return FALSE;
+    if (!m_refData || !col.m_refData)
+        return FALSE;
 
     GdkColor *own = &(((wxColourRefData*)m_refData)->m_color);
     GdkColor *other = &(((wxColourRefData*)col.m_refData)->m_color);
-    if (own->red != other->red) return FALSE;
+    return own->red == other->red &&
-    if (own->blue != other->blue) return FALSE;
+                own->blue == other->blue &&
-    if (own->green != other->green) return FALSE;
+                     own->green == other->green;
-
-    return TRUE;
 }
 
 wxObjectRefData *wxColour::CreateRefData() const

src/gtk1/colour.cpp

@@ -159,34 +159,44 @@ wxColour::wxColour( unsigned char red, unsigned char green, unsigned char blue )
     M_COLDATA->m_color.pixel = 0;
 }
 
+/* static */
+wxColour wxColour::CreateByName(const wxString& name)
+{
+    wxColour col;
+
+    GdkColor colGDK;
+    if ( gdk_color_parse( wxGTK_CONV( name ), &colGDK ) )
+    {
+        wxColourRefData *refData = new wxColourRefData;
+        refData->m_color = colGDK;
+        col.m_refData = refData;
+    }
+
+    return col;
+}
 
 
 void wxColour::InitFromName( const wxString &colourName )
 {
-    wxColour* col = NULL;
+    // check the cache first
-    if ( (wxTheColourDatabase) && (col = wxTheColourDatabase->FindColourNoAdd(colourName)) )
+    wxColour col;
+    if ( wxTheColourDatabase )
     {
-        UnRef();
+        col = wxTheColourDatabase->Find(colourName);
-        if (col) Ref( *col );
+    }
+
+    if ( !col.Ok() )
+    {
+        col = CreateByName(colourName);
+    }
+
+    if ( col.Ok() )
+    {
+        *this = col;
     }
     else
     {
-        m_refData = new wxColourRefData();
+        wxFAIL_MSG( wxT("wxColour: couldn't find colour") );
-        
-        if (!gdk_color_parse( wxGTK_CONV( colourName ), &M_COLDATA->m_color ))
-        {
-            // VZ: asserts are good in general but this one is triggered by
-            //     calling wxColourDatabase::FindColour() with an
-            //     unrecognized colour name and this can't be avoided from the
-            //     user code, so don't give it here
-            //
-            //     a better solution would be to changed code in FindColour()
-
-            //wxFAIL_MSG( wxT("wxColour: couldn't find colour") );
-
-            delete m_refData;
-            m_refData = (wxObjectRefData *) NULL;
-        }
     }
 }
 
@@ -196,17 +206,17 @@ wxColour::~wxColour()
 
 bool wxColour::operator == ( const wxColour& col ) const
 {
-    if (m_refData == col.m_refData) return TRUE;
+    if (m_refData == col.m_refData)
+        return TRUE;
 
-    if (!m_refData || !col.m_refData) return FALSE;
+    if (!m_refData || !col.m_refData)
+        return FALSE;
 
     GdkColor *own = &(((wxColourRefData*)m_refData)->m_color);
     GdkColor *other = &(((wxColourRefData*)col.m_refData)->m_color);
-    if (own->red != other->red) return FALSE;
+    return own->red == other->red &&
-    if (own->blue != other->blue) return FALSE;
+                own->blue == other->blue &&
-    if (own->green != other->green) return FALSE;
+                     own->green == other->green;
-
-    return TRUE;
 }
 
 wxObjectRefData *wxColour::CreateRefData() const