wizards not using sizers for the page layout now work again

[wxWidgets.git] / include / wx / generic / wizard.h

diff --git a/include/wx/generic/wizard.h b/include/wx/generic/wizard.h
index fdd07ddea9ca3a275f5904885a2f55f8bb5db300..52940b2a82d058b51beba4c7271cdc23ba090e55 100644 (file)
--- a/include/wx/generic/wizard.h
+++ b/include/wx/generic/wizard.h
@@ -70,7 +70,8 @@ public:
     virtual void DoCreateControls();
 
 protected:
     virtual void DoCreateControls();
 
 protected:

-    void FinishLayout();
+    // for compatibility only, doesn't do anything any more
+    void FinishLayout() { }

 
 private:
     // was the dialog really created?
 
 private:
     // was the dialog really created?


@@ -88,8 +89,6 @@ private:
     void AddBackNextPair(wxBoxSizer *buttonRow);
     void AddButtonRow(wxBoxSizer *mainColumn);
 
     void AddBackNextPair(wxBoxSizer *buttonRow);
     void AddButtonRow(wxBoxSizer *mainColumn);
 

-    wxSize GetManualPageSize() const;
-

     // the page size requested by user
     wxSize m_sizePage;
 
     // the page size requested by user
     wxSize m_sizePage;
 


@@ -105,8 +104,6 @@ private:
                 *m_btnNext;     // the "Next>" or "Finish" button
     wxStaticBitmap *m_statbmp;  // the control for the bitmap
 
                 *m_btnNext;     // the "Next>" or "Finish" button
     wxStaticBitmap *m_statbmp;  // the control for the bitmap
 

-    // Whether user called SetBorder()
-    bool m_calledSetBorder;

     // Border around page area sizer requested using SetBorder()
     int m_border;
 
     // Border around page area sizer requested using SetBorder()
     int m_border;
 


@@ -116,6 +113,9 @@ private:
     // Whether was modal (modeless has to be destroyed on finish or cancel)
     bool m_wasModal;
 
     // Whether was modal (modeless has to be destroyed on finish or cancel)
     bool m_wasModal;
 

+    // True if pages are laid out using the sizer
+    bool m_usingSizer;
+

     // Page area sizer will be inserted here with padding
     wxBoxSizer *m_sizerBmpAndPage;
 
     // Page area sizer will be inserted here with padding
     wxBoxSizer *m_sizerBmpAndPage;