X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b3eb133b51450e55a918b465a28bf2e11500fa24..ce4b7808ca940be201422a066de141ca12f13863:/include/wx/generic/wizard.h?ds=sidebyside diff --git a/include/wx/generic/wizard.h b/include/wx/generic/wizard.h index ee6185750a..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) @@ -9,14 +9,13 @@ // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// +#ifndef _WX_GENERIC_WIZARD_H_ +#define _WX_GENERIC_WIZARD_H_ + // ---------------------------------------------------------------------------- // wxWizard // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "wizardg.h" -#endif - class WXDLLEXPORT wxButton; class WXDLLEXPORT wxStaticBitmap; class WXDLLIMPEXP_ADV wxWizardEvent; @@ -70,6 +69,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; } @@ -86,12 +89,6 @@ private: void AddBackNextPair(wxBoxSizer *buttonRow); void AddButtonRow(wxBoxSizer *mainColumn); -protected: - void FinishLayout(); - -private: - wxSize GetManualPageSize() const; - // the page size requested by user wxSize m_sizePage; @@ -107,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; @@ -128,3 +129,4 @@ private: DECLARE_NO_COPY_CLASS(wxWizard) }; +#endif // _WX_GENERIC_WIZARD_H_