wxOS2 build fixes after wxColourBase introduction.

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

diff --git a/include/wx/generic/wizard.h b/include/wx/generic/wizard.h
index a353cd0418033f95cd2635e13c6ed6ac37934169..fdd07ddea9ca3a275f5904885a2f55f8bb5db300 100644 (file)
--- 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)
 // Purpose:     declaration of generic wxWizard class
 // Author:      Vadim Zeitlin
 // Modified by: Robert Vazan (sizers)


@@ -9,6 +9,9 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 

+#ifndef _WX_GENERIC_WIZARD_H_
+#define _WX_GENERIC_WIZARD_H_
+

 // ----------------------------------------------------------------------------
 // wxWizard
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxWizard
 // ----------------------------------------------------------------------------


@@ -66,6 +69,9 @@ public:
     // this is app-overridable to, for example, set help and tooltip text
     virtual void DoCreateControls();
 
     // this is app-overridable to, for example, set help and tooltip text
     virtual void DoCreateControls();
 

+protected:
+    void FinishLayout();
+

 private:
     // was the dialog really created?
     bool WasCreated() const { return m_btnPrev != NULL; }
 private:
     // was the dialog really created?
     bool WasCreated() const { return m_btnPrev != NULL; }


@@ -82,12 +88,6 @@ private:
     void AddBackNextPair(wxBoxSizer *buttonRow);
     void AddButtonRow(wxBoxSizer *mainColumn);
 
     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 GetManualPageSize() const;
 
     // the page size requested by user


@@ -113,6 +113,9 @@ private:
     // Whether RunWizard() was called
     bool m_started;
 
     // Whether RunWizard() was called
     bool m_started;
 

+    // Whether was modal (modeless has to be destroyed on finish or cancel)
+    bool m_wasModal;
+

     // Page area sizer will be inserted here with padding
     wxBoxSizer *m_sizerBmpAndPage;
 
     // Page area sizer will be inserted here with padding
     wxBoxSizer *m_sizerBmpAndPage;
 


@@ -126,3 +129,4 @@ private:
     DECLARE_NO_COPY_CLASS(wxWizard)
 };
 
     DECLARE_NO_COPY_CLASS(wxWizard)
 };
 

+#endif // _WX_GENERIC_WIZARD_H_