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:
@@ -76,7 +76,7 @@ void wxFontPreviewer::OnPaint(wxPaintEvent& WXUNUSED(event))
|
||||
dc.SetBrush(*wxWHITE_BRUSH);
|
||||
dc.DrawRectangle(0, 0, size.x, size.y);
|
||||
|
||||
if ( font.Ok() )
|
||||
if ( font.IsOk() )
|
||||
{
|
||||
dc.SetFont(font);
|
||||
dc.SetTextForeground(GetForegroundColour());
|
||||
@@ -550,7 +550,7 @@ void wxGenericFontDialog::InitializeFont()
|
||||
int fontSize = 12;
|
||||
bool fontUnderline = false;
|
||||
|
||||
if (m_fontData.m_initialFont.Ok())
|
||||
if (m_fontData.m_initialFont.IsOk())
|
||||
{
|
||||
fontFamily = m_fontData.m_initialFont.GetFamily();
|
||||
fontWeight = m_fontData.m_initialFont.GetWeight();
|
||||
@@ -602,7 +602,7 @@ void wxGenericFontDialog::DoChangeFont()
|
||||
if ( !m_colourChoice->GetStringSelection().empty() )
|
||||
{
|
||||
wxColour col = wxTheColourDatabase->Find(m_colourChoice->GetStringSelection());
|
||||
if (col.Ok())
|
||||
if (col.IsOk())
|
||||
{
|
||||
m_fontData.m_fontColour = col;
|
||||
}
|
||||
@@ -610,7 +610,7 @@ void wxGenericFontDialog::DoChangeFont()
|
||||
}
|
||||
// Update color here so that we can also use the color originally passed in
|
||||
// (EnableEffects may be false)
|
||||
if (m_fontData.m_fontColour.Ok())
|
||||
if (m_fontData.m_fontColour.IsOk())
|
||||
m_previewer->SetForegroundColour(m_fontData.m_fontColour);
|
||||
|
||||
m_previewer->Refresh();
|
||||
|
Reference in New Issue
Block a user