X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/20ceebaa878e9fb54e678c6498aeaeeaae9f0590..26da5e4f5a658046327e38e35880b31ea6444f4f:/include/wx/generic/wizard.h

diff --git a/include/wx/generic/wizard.h b/include/wx/generic/wizard.h
index bba347c7db..52940b2a82 100644
--- a/include/wx/generic/wizard.h
+++ b/include/wx/generic/wizard.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        generic/wizard.h
+// Name:        wx/generic/wizard.h
 // Purpose:     declaration of generic wxWizard class
 // Author:      Vadim Zeitlin
 // Modified by: Robert Vazan (sizers)
@@ -70,7 +70,8 @@ public:
     virtual void DoCreateControls();
 
 protected:
-    void FinishLayout();
+    // for compatibility only, doesn't do anything any more
+    void FinishLayout() { }
 
 private:
     // was the dialog really created?
@@ -88,8 +89,6 @@ private:
     void AddBackNextPair(wxBoxSizer *buttonRow);
     void AddButtonRow(wxBoxSizer *mainColumn);
 
-    wxSize GetManualPageSize() const;
-
     // the page size requested by user
     wxSize m_sizePage;
 
@@ -105,14 +104,18 @@ private:
                 *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;
 
     // Whether RunWizard() was called
     bool m_started;
 
+    // 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;