fixed the last of the off-by-one errors (some are refixed, again...)

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

diff --git a/include/wx/generic/wizard.h b/include/wx/generic/wizard.h
index 7c26f62b85a49e5e3ab71b97a055ca1a8c0adbab..32186f6bab51a18ad99890f7454a656ec36092f0 100644 (file)
--- a/include/wx/generic/wizard.h
+++ b/include/wx/generic/wizard.h
@@ -24,12 +24,12 @@ public:
              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);

 
     // 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
     virtual wxSize GetPageSize() const;
 
     // implementation only from now on


@@ -39,15 +39,27 @@ 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);
 
 private:
     bool ShowPage(wxWizardPage *page, bool goingForward = TRUE);
 
 private:

+    // was the dialog really created?
+    bool WasCreated() const { return m_btnPrev != NULL; }
+
+    // do fill the dialog with controls
+    void DoCreateControls();
+

     // event handlers
     void OnCancel(wxCommandEvent& event);
     void OnBackOrNext(wxCommandEvent& event);
 
     // event handlers
     void OnCancel(wxCommandEvent& event);
     void OnBackOrNext(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
     int          m_width,       // the size of the page itself
     // wizard dimensions
     int          m_x, m_y;      // the origin for the pages
     int          m_width,       // the size of the page itself