added CreateByName(), use it in wxColourDatabase

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24212 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-10-17 17:39:28 +00:00
parent 551b5391ae
commit 4e6b83091a
5 changed files with 100 additions and 75 deletions

View File

@@ -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
//
// TODO: move this into platform-specific files
#ifdef __WXGTK__
wxColour col( colour );
// if we didn't find it, query the system, maybe it knows about it
#if defined(__WXGTK__) || defined(__X__)
wxColour col = wxColour::CreateByName(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__