X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/94c09a19ec0406118b51b60657232ea3b14d6c4f..5f1f21d2a54124859b1fbeaa31ebf373bb5f0114:/include/wx/generic/wizard.h

diff --git a/include/wx/generic/wizard.h b/include/wx/generic/wizard.h
index fdd07ddea9..4a738c69f1 100644
--- a/include/wx/generic/wizard.h
+++ b/include/wx/generic/wizard.h
@@ -16,11 +16,11 @@
 // wxWizard
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxButton;
-class WXDLLEXPORT wxStaticBitmap;
-class WXDLLIMPEXP_ADV wxWizardEvent;
-class WXDLLEXPORT wxBoxSizer;
-class WXDLLIMPEXP_ADV wxWizardSizer;
+class WXDLLIMPEXP_FWD_CORE wxButton;
+class WXDLLIMPEXP_FWD_CORE wxStaticBitmap;
+class WXDLLIMPEXP_FWD_ADV wxWizardEvent;
+class WXDLLIMPEXP_FWD_CORE wxBoxSizer;
+class WXDLLIMPEXP_FWD_ADV wxWizardSizer;
 
 class WXDLLIMPEXP_ADV wxWizard : public wxWizardBase
 {
@@ -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);
@@ -54,6 +55,10 @@ public:
     virtual wxSizer *GetPageAreaSizer() const;
     virtual void SetBorder(int border);
 
+    /// set/get bitmap
+    const wxBitmap& GetBitmap() const { return m_bitmap; }
+    void SetBitmap(const wxBitmap& bitmap);
+
     // implementation only from now on
     // -------------------------------
 
@@ -70,7 +75,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 +94,6 @@ private:
     void AddBackNextPair(wxBoxSizer *buttonRow);
     void AddButtonRow(wxBoxSizer *mainColumn);
 
-    wxSize GetManualPageSize() const;
-
     // the page size requested by user
     wxSize m_sizePage;
 
@@ -105,8 +109,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 +118,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;