X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ed2fbeb835854c97d176f8bdfd6f06a84273f5d7..9859d369b49e35a1cad0f760173e165f974fb6cb:/src/generic/wizard.cpp diff --git a/src/generic/wizard.cpp b/src/generic/wizard.cpp index cb3b8d0f38..7973669650 100644 --- a/src/generic/wizard.cpp +++ b/src/generic/wizard.cpp @@ -631,7 +631,7 @@ bool wxWizard::ShowPage(wxWizardPage *page, bool goingForward) if ( !bmpPrev.Ok() ) bmpPrev = m_bitmap; - if ( bmp != bmpPrev ) + if ( !bmp.IsSameAs(bmpPrev) ) m_statbmp->SetBitmap(bmp); } #endif // wxUSE_STATBMP @@ -643,7 +643,10 @@ bool wxWizard::ShowPage(wxWizardPage *page, bool goingForward) bool hasNext = HasNextPage(m_page); if ( btnLabelWasNext != hasNext ) { - m_btnNext->SetLabel(hasNext ? _("&Next >") : _("&Finish")); + if ( hasNext ) + m_btnNext->SetLabel(_("&Next >")); + else + m_btnNext->SetLabel(_("&Finish")); } // nothing to do: the label was already correct