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:
@@ -324,7 +324,7 @@ void wxWizard::AddBitmapRow(wxBoxSizer *mainColumn)
|
||||
);
|
||||
|
||||
#if wxUSE_STATBMP
|
||||
if ( m_bitmap.Ok() )
|
||||
if ( m_bitmap.IsOk() )
|
||||
{
|
||||
wxSize bitmapSize(wxDefaultSize);
|
||||
if (GetBitmapPlacement())
|
||||
@@ -604,10 +604,10 @@ bool wxWizard::ShowPage(wxWizardPage *page, bool goingForward)
|
||||
if ( m_statbmp )
|
||||
{
|
||||
bmp = m_page->GetBitmap();
|
||||
if ( !bmp.Ok() )
|
||||
if ( !bmp.IsOk() )
|
||||
bmp = m_bitmap;
|
||||
|
||||
if ( !bmpPrev.Ok() )
|
||||
if ( !bmpPrev.IsOk() )
|
||||
bmpPrev = m_bitmap;
|
||||
|
||||
if (!GetBitmapPlacement())
|
||||
@@ -928,7 +928,7 @@ bool wxWizard::ResizeBitmap(wxBitmap& bmp)
|
||||
if (!GetBitmapPlacement())
|
||||
return false;
|
||||
|
||||
if (bmp.Ok())
|
||||
if (bmp.IsOk())
|
||||
{
|
||||
wxSize pageSize = m_sizerPage->GetSize();
|
||||
if (pageSize == wxSize(0,0))
|
||||
@@ -936,7 +936,7 @@ bool wxWizard::ResizeBitmap(wxBitmap& bmp)
|
||||
int bitmapWidth = wxMax(bmp.GetWidth(), GetMinimumBitmapWidth());
|
||||
int bitmapHeight = pageSize.y;
|
||||
|
||||
if (!m_statbmp->GetBitmap().Ok() || m_statbmp->GetBitmap().GetHeight() != bitmapHeight)
|
||||
if (!m_statbmp->GetBitmap().IsOk() || m_statbmp->GetBitmap().GetHeight() != bitmapHeight)
|
||||
{
|
||||
wxBitmap bitmap(bitmapWidth, bitmapHeight);
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user