declared private wxString::operator=(int) to prevent code like "str = 17;" from compiling

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

diff --git a/include/wx/generic/wizard.h b/include/wx/generic/wizard.h
index 32186f6bab51a18ad99890f7454a656ec36092f0..ee25a60400c9e7742a5c34527796d25f1ac587cc 100644 (file)
--- a/include/wx/generic/wizard.h
+++ b/include/wx/generic/wizard.h
@@ -20,11 +20,22 @@ 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,
              const wxPoint& pos = wxDefaultPosition);
              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);
 
     // implement base class pure virtuals
     virtual bool RunWizard(wxWizardPage *firstPage);


@@ -43,13 +54,14 @@ public:
     // TransferDataFromWindow() returns FALSE - otherwise, returns TRUE
     bool ShowPage(wxWizardPage *page, bool goingForward = TRUE);
 
     // 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
+    void DoCreateControls();
+

 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; }
 

-    // 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);