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

replaced all occurences of wxColourDatabase::FindColour() with Find(); minor code cleanup here and there

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24231 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-10-18 23:51:01 +00:00
parent 5d398dbae0
commit 564a150b1f
19 changed files with 158 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/generic/colrdlgg.cpp
View File

@@ -304,14 +304,14 @@ void wxGenericColourDialog::InitializeColours(void)
for (i = 0; i < WXSIZEOF(wxColourDialogNames); i++)
{
wxColour *col = wxTheColourDatabase->FindColour(wxColourDialogNames[i]);
if (col)
standardColours[i].Set(col->Red(), col->Green(), col->Blue());
wxColour col = wxTheColourDatabase->Find(wxColourDialogNames[i]);
if (col.Ok())
standardColours[i].Set(col.Red(), col.Green(), col.Blue());
else
standardColours[i].Set(0, 0, 0);
}
for (i = 0; i < 16; i++)
for (i = 0; i < WXSIZEOF(customColours); i++)
{
customColours[i] = colourData.GetCustomColour(i);
}
@@ -333,7 +333,7 @@ void wxGenericColourDialog::InitializeColours(void)
}
if ( !initColourFound )
{
for ( i = 0; i < 16; i++ )
for ( i = 0; i < WXSIZEOF(customColours); i++ )
{
if ( customColours[i] == curr )
{