Replaced Ok() occurrences with IsOk() throughout trunk.
Additionally renamed wxOSX' private wxNativePrinterDC::Ok() function to IsOk(). Didn't deprecate the various Ok() functions: given the amount of changes already introduced in 3.0 a trivial one like this seems more suitable for after 3.0. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67681 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -315,7 +315,7 @@ void wxGenericColourDialog::InitializeColours(void)
|
||||
for (i = 0; i < WXSIZEOF(wxColourDialogNames); i++)
|
||||
{
|
||||
wxColour col = wxTheColourDatabase->Find(wxColourDialogNames[i]);
|
||||
if (col.Ok())
|
||||
if (col.IsOk())
|
||||
m_standardColours[i].Set(col.Red(), col.Green(), col.Blue());
|
||||
else
|
||||
m_standardColours[i].Set(0, 0, 0);
|
||||
@@ -324,14 +324,14 @@ void wxGenericColourDialog::InitializeColours(void)
|
||||
for (i = 0; i < WXSIZEOF(m_customColours); i++)
|
||||
{
|
||||
wxColour c = m_colourData.GetCustomColour(i);
|
||||
if (c.Ok())
|
||||
if (c.IsOk())
|
||||
m_customColours[i] = m_colourData.GetCustomColour(i);
|
||||
else
|
||||
m_customColours[i] = wxColour(255, 255, 255);
|
||||
}
|
||||
|
||||
wxColour curr = m_colourData.GetColour();
|
||||
if ( curr.Ok() )
|
||||
if ( curr.IsOk() )
|
||||
{
|
||||
bool m_initColourFound = false;
|
||||
|
||||
|
Reference in New Issue
Block a user