Some but not all compile fixes for typetest (VC++ 1.5); added datetime.cpp

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

diff --git a/include/wx/wizard.h b/include/wx/wizard.h
index 1d30123a5e24630f5bb67b97205a769c70796784..58eb283c51525912ec648a1cff060b81bf0f1265 100644 (file)
--- a/include/wx/wizard.h
+++ b/include/wx/wizard.h
@@ -38,15 +38,26 @@ class WXDLLEXPORT wxWizard;
 class WXDLLEXPORT wxWizardPage : public wxPanel
 {
 public:
 class WXDLLEXPORT wxWizardPage : public wxPanel
 {
 public:

-    // ctor: no other parameters are needed because the wizard will resize and
+    // ctor accepts an optional bitmap which will be used for this page instead
+    // of the default one for this wizard (should be of the same size). Notice
+    // that no other parameters are needed because the wizard will resize and

     // reposition the page anyhow
     // reposition the page anyhow

-    wxWizardPage(wxWizard *parent);
+    wxWizardPage(wxWizard *parent, const wxBitmap& bitmap = wxNullBitmap);

 
     // these functions are used by the wizard to show another page when the
     // user chooses "Back" or "Next" button
     virtual wxWizardPage *GetPrev() const = 0;
     virtual wxWizardPage *GetNext() const = 0;
 
 
     // these functions are used by the wizard to show another page when the
     // user chooses "Back" or "Next" button
     virtual wxWizardPage *GetPrev() const = 0;
     virtual wxWizardPage *GetNext() const = 0;
 

+    // default GetBitmap() will just return m_bitmap which is ok in 99% of
+    // cases - override this method if you want to create the bitmap to be used
+    // dynamically or to do something even more fancy. It's ok to return
+    // wxNullBitmap from here - the default one will be used then.
+    virtual wxBitmap GetBitmap() const { return m_bitmap; }
+
+protected:
+    wxBitmap m_bitmap;
+

 private:
     DECLARE_ABSTRACT_CLASS(wxWizardPage)
 };
 private:
     DECLARE_ABSTRACT_CLASS(wxWizardPage)
 };