fixed bug with the caret positioning after SetValue() introduced by the last commit

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

diff --git a/include/wx/generic/wizard.h b/include/wx/generic/wizard.h
index 7c26f62b85a49e5e3ab71b97a055ca1a8c0adbab..11da00ceb4f6ce745730a6e6356e07a555903e25 100644 (file)
--- a/include/wx/generic/wizard.h
+++ b/include/wx/generic/wizard.h
@@ -20,16 +20,27 @@ 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,
              int id = -1,
              const wxString& title = wxEmptyString,
              const wxBitmap& bitmap = wxNullBitmap,

-             const wxPoint& pos = wxDefaultPosition,
-             const wxSize& size = wxDefaultSize);
+             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,
+             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
     virtual wxSize GetPageSize() const;
 
     // implementation only from now on


@@ -39,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