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:
@@ -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.")) ;
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user