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:
Dimitri Schoolwerth
2011-05-03 16:29:04 +00:00
parent ddd7e4307b
commit a1b806b982
322 changed files with 1261 additions and 1260 deletions

View File

@@ -658,11 +658,11 @@ void wxHtmlHelpWindow::AddToolbarButtons(wxToolBar *toolBar, int style)
wxBitmap woptionsBitmap =
wxArtProvider::GetBitmap(wxART_HELP_SETTINGS, wxART_TOOLBAR);
wxASSERT_MSG( (wpanelBitmap.Ok() && wbackBitmap.Ok() &&
wforwardBitmap.Ok() && wupnodeBitmap.Ok() &&
wupBitmap.Ok() && wdownBitmap.Ok() &&
wopenBitmap.Ok() && wprintBitmap.Ok() &&
woptionsBitmap.Ok()),
wxASSERT_MSG( (wpanelBitmap.IsOk() && wbackBitmap.IsOk() &&
wforwardBitmap.IsOk() && wupnodeBitmap.IsOk() &&
wupBitmap.IsOk() && wdownBitmap.IsOk() &&
wopenBitmap.IsOk() && wprintBitmap.IsOk() &&
woptionsBitmap.IsOk()),
wxT("One or more HTML help frame toolbar bitmap could not be loaded.")) ;

View File

@@ -205,7 +205,7 @@ wxCursor wxHtmlCell::GetMouseCursor(wxHtmlWindowInterface *window) const
// wxHtmlCell::GetCursor() method simply returns wxNullCursor, so we
// know that GetCursor() was overridden iff it returns valid cursor.
wxCursor cur = GetCursor();
if (cur.Ok())
if (cur.IsOk())
return cur;
#endif // WXWIN_COMPATIBILITY_2_6

View File

@@ -695,7 +695,7 @@ bool wxHtmlEasyPrinting::DoPreview(wxHtmlPrintout *printout1, wxHtmlPrintout *pr
// Pass two printout objects: for preview, and possible printing.
wxPrintDialogData printDialogData(*GetPrintData());
wxPrintPreview *preview = new wxPrintPreview(printout1, printout2, &printDialogData);
if (!preview->Ok())
if (!preview->IsOk())
{
delete preview;
return false;
@@ -731,7 +731,7 @@ bool wxHtmlEasyPrinting::DoPrint(wxHtmlPrintout *printout)
void wxHtmlEasyPrinting::PageSetup()
{
if (!GetPrintData()->Ok())
if (!GetPrintData()->IsOk())
{
wxLogError(_("There was a problem during page setup: you may need to set a default printer."));
return;

View File

@@ -417,7 +417,7 @@ wxHtmlImageCell::wxHtmlImageCell(wxHtmlWindowInterface *windowIface,
#endif // wxUSE_GIF && wxUSE_TIMER
{
wxImage image(*s, wxBITMAP_TYPE_ANY);
if ( image.Ok() )
if ( image.IsOk() )
SetImage(image);
}
}
@@ -446,7 +446,7 @@ wxHtmlImageCell::wxHtmlImageCell(wxHtmlWindowInterface *windowIface,
void wxHtmlImageCell::SetImage(const wxImage& img)
{
#if !defined(__WXMSW__) || wxUSE_WXDIB
if ( img.Ok() )
if ( img.IsOk() )
{
delete m_bitmap;

View File

@@ -340,7 +340,7 @@ TAG_HANDLER_BEGIN(BODY, "BODY")
if ( is )
{
wxImage image(*is);
if ( image.Ok() )
if ( image.IsOk() )
winIface->SetHTMLBackgroundImage(image);
}

View File

@@ -135,7 +135,7 @@ wxHtmlTableCell::wxHtmlTableCell(wxHtmlContainerCell *parent, const wxHtmlTag& t
if (tag.HasParam(wxT("BGCOLOR")))
{
tag.GetParamAsColour(wxT("BGCOLOR"), &m_tBkg);
if (m_tBkg.Ok())
if (m_tBkg.IsOk())
SetBackgroundColour(m_tBkg);
}
if (tag.HasParam(wxT("VALIGN")))
@@ -344,7 +344,7 @@ void wxHtmlTableCell::AddCell(wxHtmlContainerCell *cell, const wxHtmlTag& tag)
wxColour bk = m_rBkg;
if (tag.HasParam(wxT("BGCOLOR")))
tag.GetParamAsColour(wxT("BGCOLOR"), &bk);
if (bk.Ok())
if (bk.IsOk())
cell->SetBackgroundColour(bk);
}
if (m_Border > 0)