X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2e4df4bfaf214faac6d4c7519f4aab5b8c7fd287..6443de026310552cacd68a6d0318e73d14929680:/src/generic/wizard.cpp

diff --git a/src/generic/wizard.cpp b/src/generic/wizard.cpp
index 65360bcda5..acc1f274e7 100644
--- a/src/generic/wizard.cpp
+++ b/src/generic/wizard.cpp
@@ -28,6 +28,8 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_WIZARDDLG
+
 #ifndef WX_PRECOMP
     #include "wx/dynarray.h"
     #include "wx/intl.h"
@@ -225,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 )
     {
@@ -243,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;
@@ -266,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;
@@ -393,3 +400,4 @@ wxWizardEvent::wxWizardEvent(wxEventType type, int id, bool direction)
     m_direction = direction;
 }
 
+#endif // wxUSE_WIZARDDLG