Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

compilation fix

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7705 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2000-07-07 09:58:42 +00:00
parent 678ddc9aa9
commit 78067d6c40
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/common/gdicmn.cpp
View File

@@ -240,17 +240,17 @@ wxColour *wxColourDatabase::FindColour(const wxString& colour)
{
// VZ: make the comparaison case insensitive and also match both grey and
// gray
wxString col = colour;
col.MakeUpper();
wxString col2 = col;
if ( !col2.Replace(_T("GRAY"), _T("GREY")) )
col2.clear();
wxString colName = colour;
colName.MakeUpper();
wxString colName2 = colName;
if ( !colName2.Replace(_T("GRAY"), _T("GREY")) )
colName2.clear();
wxNode *node = First();
while ( node )
{
const wxChar *key = node->GetKeyString();
if ( col == key || col2 == key )
if ( colName == key || colName2 == key )
{
return (wxColour *)node->Data();
}
@@ -276,7 +276,7 @@ wxColour *wxColourDatabase::FindColour(const wxString& colour)
#ifdef __WXGTK__
wxColour *col = new wxColour( colour );
if (!(col->Ok())) {
delete col;
return (wxColour *) NULL;