X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/54cf600d4e5379e465e27ef4b9318227727996fe..a63d48fa138e9eaa3079172ace9a804ba5b0415e:/src/generic/wizard.cpp

diff --git a/src/generic/wizard.cpp b/src/generic/wizard.cpp
index 97da14ec8b..bceae5eb16 100644
--- a/src/generic/wizard.cpp
+++ b/src/generic/wizard.cpp
@@ -309,6 +309,7 @@ void wxWizard::AddBitmapRow(wxBoxSizer *mainColumn)
         wxEXPAND // No border, (mostly useless) horizontal stretching
     );
 
+#if wxUSE_STATBMP
     if ( m_bitmap.Ok() )
     {
         m_statbmp = new wxStaticBitmap(this, -1, m_bitmap);
@@ -324,6 +325,7 @@ void wxWizard::AddBitmapRow(wxBoxSizer *mainColumn)
             wxEXPAND // No border, (mostly useless) vertical stretching
         );
     }
+#endif
 
     // Added to m_sizerBmpAndPage in FinishLayout
     m_sizerPage = new wxWizardSizer(this);
@@ -532,11 +534,12 @@ bool wxWizard::ShowPage(wxWizardPage *page, bool goingForward)
     {
         // terminate successfully
         EndModal(wxID_OK);
-        if ( !IsModal() )
-         {
-           wxWizardEvent event(wxEVT_WIZARD_FINISHED, GetId(),FALSE, 0);
-           (void)GetEventHandler()->ProcessEvent(event);
-         }
+
+        // and notify the user code (this is especially useful for modeless
+        // wizards)
+        wxWizardEvent event(wxEVT_WIZARD_FINISHED, GetId(), FALSE, 0);
+        (void)GetEventHandler()->ProcessEvent(event);
+
         return TRUE;
     }
 
@@ -554,6 +557,7 @@ bool wxWizard::ShowPage(wxWizardPage *page, bool goingForward)
         bmpIsDefault = FALSE;
     }
 
+#if wxUSE_STATBMP
     // change the bitmap if:
     // 1) a default bitmap was selected in constructor
     // 2) this page was constructed with a bitmap
@@ -567,6 +571,7 @@ bool wxWizard::ShowPage(wxWizardPage *page, bool goingForward)
             bmp = m_page->GetBitmap();
         m_statbmp->SetBitmap(bmp);
     }
+#endif
 
     // and update the buttons state
     m_btnPrev->Enable(HasPrevPage(m_page));
@@ -580,6 +585,7 @@ bool wxWizard::ShowPage(wxWizardPage *page, bool goingForward)
         else
             m_btnNext->SetLabel(_("&Next >"));
     }
+    m_btnNext->SetDefault();
     // nothing to do: the label was already correct
 
     // send the change event to the new page now
@@ -722,6 +728,7 @@ void wxWizard::OnWizEvent(wxWizardEvent& event)
     if ( !(GetExtraStyle() & wxWS_EX_BLOCK_EVENTS) )
     {
         // the event will be propagated anyhow
+        event.Skip();
         return;
     }
 
@@ -737,7 +744,7 @@ void wxWizard::OnWizEvent(wxWizardEvent& event)
 // our public interface
 // ----------------------------------------------------------------------------
 
-#ifdef WXWIN_COMPATIBILITY_2_2
+#if WXWIN_COMPATIBILITY_2_2
 
 /* static */
 wxWizard *wxWizardBase::Create(wxWindow *parent,