typo fixed: __WXUNIV__ => __WXUNIVERSAL__

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

diff --git a/include/wx/generic/wizard.h b/include/wx/generic/wizard.h
index 987113b877bea2cbb7c40c2b73d31bd4a9456b30..11da00ceb4f6ce745730a6e6356e07a555903e25 100644 (file)
--- a/include/wx/generic/wizard.h
+++ b/include/wx/generic/wizard.h
@@ -13,20 +13,35 @@
 // wxWizard
 // ----------------------------------------------------------------------------
 
 // wxWizard
 // ----------------------------------------------------------------------------
 

-class wxWizard : public wxWizardBase
+class WXDLLEXPORT wxButton;
+class WXDLLEXPORT wxStaticBitmap;
+
+class WXDLLEXPORT wxWizard : public wxWizardBase

 {
 public:
     // ctor
 {
 public:
     // ctor

-    wxWizard(wxWindow *parent = NULL,
+    wxWizard() { Init(); }
+    wxWizard(wxWindow *parent,
+             int id = -1,
+             const wxString& title = wxEmptyString,
+             const wxBitmap& bitmap = wxNullBitmap,
+             const wxPoint& pos = wxDefaultPosition)
+    {
+        Init();
+        Create(parent, id, title, bitmap, pos);
+    }
+    bool Create(wxWindow *parent,

              int id = -1,
              const wxString& title = wxEmptyString,
              const wxBitmap& bitmap = wxNullBitmap,
              int id = -1,
              const wxString& title = wxEmptyString,
              const wxBitmap& bitmap = wxNullBitmap,

-             const wxPoint& pos = wxDefaultPosition,
-             const wxSize& size = wxDefaultSize);
+             const wxPoint& pos = wxDefaultPosition);
+    void Init();

 
     // implement base class pure virtuals
     virtual bool RunWizard(wxWizardPage *firstPage);
     virtual wxWizardPage *GetCurrentPage() const;
 
     // implement base class pure virtuals
     virtual bool RunWizard(wxWizardPage *firstPage);
     virtual wxWizardPage *GetCurrentPage() const;

+    virtual void SetPageSize(const wxSize& size);
+    virtual wxSize GetPageSize() const;

 
     // implementation only from now on
     // -------------------------------
 
     // implementation only from now on
     // -------------------------------


@@ -35,14 +50,28 @@ public:
     bool IsRunning() const { return m_page != NULL; }
 
     // show the prev/next page, but call TransferDataFromWindow on the current
     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 it returns
-    // FALSE
+    // page first and return FALSE without changing the page if
+    // TransferDataFromWindow() returns FALSE - otherwise, returns TRUE

     bool ShowPage(wxWizardPage *page, bool goingForward = 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
+    void DoCreateControls();
+

 private:
 private:

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

     // event handlers
     void OnCancel(wxCommandEvent& event);
     void OnBackOrNext(wxCommandEvent& event);
     // event handlers
     void OnCancel(wxCommandEvent& event);
     void OnBackOrNext(wxCommandEvent& event);

+    void OnHelp(wxCommandEvent& event);
+
+    // the page size requested by user
+    wxSize m_sizePage;
+
+    // the dialog position from the ctor
+    wxPoint m_posWizard;

 
     // wizard dimensions
     int          m_x, m_y;      // the origin for the pages
 
     // wizard dimensions
     int          m_x, m_y;      // the origin for the pages


@@ -51,10 +80,12 @@ private:
 
     // wizard state
     wxWizardPage *m_page;       // the current page or NULL
 
     // wizard state
     wxWizardPage *m_page;       // the current page or NULL

+    wxBitmap      m_bitmap;     // the default bitmap to show

 
     // wizard controls
     wxButton    *m_btnPrev,     // the "<Back" button
                 *m_btnNext;     // the "Next>" or "Finish" button
 
     // wizard controls
     wxButton    *m_btnPrev,     // the "<Back" button
                 *m_btnNext;     // the "Next>" or "Finish" button

+    wxStaticBitmap *m_statbmp;  // the control for the bitmap

 
     DECLARE_DYNAMIC_CLASS(wxWizard)
     DECLARE_EVENT_TABLE()
 
     DECLARE_DYNAMIC_CLASS(wxWizard)
     DECLARE_EVENT_TABLE()