diff --git a/src/generic/wizard.cpp b/src/generic/wizard.cpp
index bc07fcce14..567680beeb 100644
--- a/src/generic/wizard.cpp
+++ b/src/generic/wizard.cpp
@@ -52,11 +52,15 @@ class wxWizardSizer : public wxSizer
 public:
     wxWizardSizer(wxWizard *owner);
 
-    void RecalcSizes();
-    wxSize CalcMin();
+    virtual void RecalcSizes();
+    virtual wxSize CalcMin();
 
+    // get the max size of all wizard pages
     wxSize GetMaxChildSize();
-    int Border() const;
+
+    // return the border which can be either set using wxWizard::SetBorder() or
+    // have default value
+    int GetBorder() const;
 
 private:
     wxSize SiblingSize(wxSizerItem *child);
@@ -168,7 +172,7 @@ wxWizardPage *wxWizardPageSimple::GetNext() const
 // ----------------------------------------------------------------------------
 
 wxWizardSizer::wxWizardSizer(wxWizard *owner)
-    : m_owner(owner)
+             : m_owner(owner)
 {
     m_childSizeValid = false;
 }
@@ -179,7 +183,7 @@ void wxWizardSizer::RecalcSizes()
     // it should be called whenever it changes (wxWizard::ShowPage)
     if ( m_owner->m_page )
     {
-        m_owner->m_page->SetSize(m_position.x,m_position.y, m_size.x,m_size.y);
+        m_owner->m_page->SetSize(m_position.x, m_position.y, m_size.x, m_size.y);
     }
 }
 
@@ -227,7 +231,7 @@ wxSize wxWizardSizer::GetMaxChildSize()
     return maxOfMin;
 }
 
-int wxWizardSizer::Border() const
+int wxWizardSizer::GetBorder() const
 {
     if ( m_owner->m_calledSetBorder )
         return m_owner->m_border;
@@ -498,7 +502,7 @@ void wxWizard::FinishLayout()
         m_sizerPage,
         1, // Horizontal stretching
         wxEXPAND | wxALL, // Vertically stretchable
-        m_sizerPage->Border()
+        m_sizerPage->GetBorder()
     );
 
     if (!isPda)