don't use -single_module together with -bundle under Darwin (ld gives an error for...

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

diff --git a/include/wx/generic/wizard.h b/include/wx/generic/wizard.h
index e3cee235831d5c008b728363294c9a3471d0d685..fdd07ddea9ca3a275f5904885a2f55f8bb5db300 100644 (file)
--- a/include/wx/generic/wizard.h
+++ b/include/wx/generic/wizard.h
@@ -1,22 +1,21 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        generic/wizard.h
+// Name:        wx/generic/wizard.h
 // Purpose:     declaration of generic wxWizard class
 // Author:      Vadim Zeitlin
 // Modified by: Robert Vazan (sizers)
 // Created:     28.09.99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWidgets licence
+// 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;
@@ -29,7 +28,7 @@ public:
     // ctor
     wxWizard() { Init(); }
     wxWizard(wxWindow *parent,
-             int id = -1,
+             int id = wxID_ANY,
              const wxString& title = wxEmptyString,
              const wxBitmap& bitmap = wxNullBitmap,
              const wxPoint& pos = wxDefaultPosition,
@@ -39,7 +38,7 @@ public:
         Create(parent, id, title, bitmap, pos, style);
     }
     bool Create(wxWindow *parent,
-             int id = -1,
+             int id = wxID_ANY,
              const wxString& title = wxEmptyString,
              const wxBitmap& bitmap = wxNullBitmap,
              const wxPoint& pos = wxDefaultPosition,
@@ -62,14 +61,17 @@ public:
     bool IsRunning() const { return m_page != NULL; }
 
     // show the prev/next page, but call TransferDataFromWindow on the current
-    // page first and return FALSE without changing the page if
-    // TransferDataFromWindow() returns FALSE - otherwise, returns TRUE
-    bool ShowPage(wxWizardPage *page, bool goingForward = TRUE);
+    // page first and return false without changing the page if
+    // TransferDataFromWindow() returns false - otherwise, returns true
+    bool ShowPage(wxWizardPage *page, bool goingForward = true);
 
     // do fill the dialog with controls
     // 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; }
@@ -86,10 +88,8 @@ private:
     void AddBackNextPair(wxBoxSizer *buttonRow);
     void AddButtonRow(wxBoxSizer *mainColumn);
 
-    void FinishLayout();
-    
     wxSize GetManualPageSize() const;
-    
+
     // the page size requested by user
     wxSize m_sizePage;
 
@@ -109,20 +109,24 @@ private:
     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;
+
     // Page area sizer will be inserted here with padding
     wxBoxSizer *m_sizerBmpAndPage;
-    
+
     // Actual position and size of pages
     wxWizardSizer *m_sizerPage;
-    
+
     friend class wxWizardSizer;
-    
+
     DECLARE_DYNAMIC_CLASS(wxWizard)
     DECLARE_EVENT_TABLE()
     DECLARE_NO_COPY_CLASS(wxWizard)
 };
 
+#endif // _WX_GENERIC_WIZARD_H_