X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e6feb95a79834836e88143b15d9f424ebe79621..aba4387c4c71fb812c6a07a7abb495606c5ef4af:/src/generic/wizard.cpp?ds=inline diff --git a/src/generic/wizard.cpp b/src/generic/wizard.cpp index e515042bec..acc1f274e7 100644 --- a/src/generic/wizard.cpp +++ b/src/generic/wizard.cpp @@ -227,7 +227,7 @@ bool wxWizard::ShowPage(wxWizardPage *page, bool goingForward) bool btnLabelWasNext = TRUE; // and this tells us whether we already had the default bitmap before - bool bmpWasDefault = TRUE; + int bmpWasDefault; if ( m_page ) { @@ -245,6 +245,11 @@ bool wxWizard::ShowPage(wxWizardPage *page, bool goingForward) btnLabelWasNext = m_page->GetNext() != (wxWizardPage *)NULL; bmpWasDefault = !m_page->GetBitmap().Ok(); } + else // no previous page + { + // always set the bitmap + bmpWasDefault = -1; + } // set the new one m_page = page; @@ -268,7 +273,7 @@ bool wxWizard::ShowPage(wxWizardPage *page, bool goingForward) m_page->Show(); // change the bitmap if necessary (and if we have it at all) - bool bmpIsDefault = !m_page->GetBitmap().Ok(); + int bmpIsDefault = !m_page->GetBitmap().Ok(); if ( m_statbmp && (bmpIsDefault != bmpWasDefault) ) { wxBitmap bmp;