wxSscanf() and friends are now Unicode+ANSI friendly wrappers instead of defines...

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

diff --git a/include/wx/generic/wizard.h b/include/wx/generic/wizard.h
index fdd07ddea9ca3a275f5904885a2f55f8bb5db300..0b0f5bed6faf69a206b5a867e2b681a08eeb9e12 100644 (file)
--- a/include/wx/generic/wizard.h
+++ b/include/wx/generic/wizard.h
@@ -44,6 +44,7 @@ public:
              const wxPoint& pos = wxDefaultPosition,
              long style = wxDEFAULT_DIALOG_STYLE);
     void Init();
+    virtual ~wxWizard();
 
     // implement base class pure virtuals
     virtual bool RunWizard(wxWizardPage *firstPage);
@@ -70,7 +71,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 +90,6 @@ private:
     void AddBackNextPair(wxBoxSizer *buttonRow);
     void AddButtonRow(wxBoxSizer *mainColumn);
 
-    wxSize GetManualPageSize() const;
-
     // the page size requested by user
     wxSize m_sizePage;
 
@@ -105,8 +105,6 @@ 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;
 
@@ -116,6 +114,9 @@ private:
     // 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;