Tweaks to the generic scpinctrl to handle layouts on wxMac better and

[wxWidgets.git] / src / generic / wizard.cpp

diff --git a/src/generic/wizard.cpp b/src/generic/wizard.cpp
index bb0e6c60482ea23c386b885b2a9ccefe74fe6c05..bceae5eb1649ee54a1cd65aa0777a2df3ef1a146 100644 (file)
--- 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);
@@ -555,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
@@ -568,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));
@@ -581,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