X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..3b49331b7441e091fc5997b830801d76a1243f28:/include/wx/generic/wizard.h diff --git a/include/wx/generic/wizard.h b/include/wx/generic/wizard.h index a353cd0418..4a738c69f1 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) @@ -9,15 +9,18 @@ // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// +#ifndef _WX_GENERIC_WIZARD_H_ +#define _WX_GENERIC_WIZARD_H_ + // ---------------------------------------------------------------------------- // 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 { @@ -41,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); @@ -51,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 // ------------------------------- @@ -66,6 +74,10 @@ public: // this is app-overridable to, for example, set help and tooltip text virtual void DoCreateControls(); +protected: + // for compatibility only, doesn't do anything any more + void FinishLayout() { } + private: // was the dialog really created? bool WasCreated() const { return m_btnPrev != NULL; } @@ -82,14 +94,6 @@ private: void AddBackNextPair(wxBoxSizer *buttonRow); void AddButtonRow(wxBoxSizer *mainColumn); -#if wxABI_VERSION >= 20602 -protected: -#endif - void FinishLayout(); - -private: - wxSize GetManualPageSize() const; - // the page size requested by user wxSize m_sizePage; @@ -105,14 +109,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; @@ -126,3 +134,4 @@ private: DECLARE_NO_COPY_CLASS(wxWizard) }; +#endif // _WX_GENERIC_WIZARD_H_