Lots of updates for color dialog and sliders

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

diff --git a/include/wx/wizard.h b/include/wx/wizard.h
index 65e7d18ec4ec13ff35a178e1386532c61c359aeb..e2a578c2a3a1ec781b8c9b465f06769b61cad3f8 100644 (file)
--- a/include/wx/wizard.h
+++ b/include/wx/wizard.h
@@ -46,11 +46,19 @@ class WXDLLEXPORT wxWizard;
 class WXDLLEXPORT wxWizardPage : public wxPanel
 {
 public:
 class WXDLLEXPORT wxWizardPage : public wxPanel
 {
 public:

+    wxWizardPage() { Init(); }
+    // common part of ctors:
+    void Init();
+

     // 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
     wxWizardPage(wxWizard *parent,
     // 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
     wxWizardPage(wxWizard *parent,

+                 const wxBitmap& bitmap = wxNullBitmap,
+                 const wxChar* resource = NULL);
+
+    bool Create(wxWizard *parent,

                 const wxBitmap& bitmap = wxNullBitmap,
                 const wxChar* resource = NULL);
 
                 const wxBitmap& bitmap = wxNullBitmap,
                 const wxChar* resource = NULL);
 


@@ -63,10 +71,10 @@ public:
     // 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.
     // 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_PageBitmap; }
+    virtual wxBitmap GetBitmap() const { return m_bitmap; }

 
 protected:
 
 protected:

-    wxBitmap m_PageBitmap;
+    wxBitmap m_bitmap;

 
 private:
     DECLARE_ABSTRACT_CLASS(wxWizardPage)
 
 private:
     DECLARE_ABSTRACT_CLASS(wxWizardPage)


@@ -84,16 +92,32 @@ private:
 class WXDLLEXPORT wxWizardPageSimple : public wxWizardPage
 {
 public:
 class WXDLLEXPORT wxWizardPageSimple : public wxWizardPage
 {
 public:

+    wxWizardPageSimple() { Init(); }
+    // common part of ctors:
+    void Init()
+    {
+        m_prev = m_next = NULL;
+    }
+

     // ctor takes the previous and next pages
     // ctor takes the previous and next pages

-    wxWizardPageSimple(wxWizard *parent = NULL, // let it be default ctor too
+    wxWizardPageSimple(wxWizard *parent,

                        wxWizardPage *prev = (wxWizardPage *)NULL,
                        wxWizardPage *next = (wxWizardPage *)NULL,
                        const wxBitmap& bitmap = wxNullBitmap,
                        const wxChar* resource = NULL)
                        wxWizardPage *prev = (wxWizardPage *)NULL,
                        wxWizardPage *next = (wxWizardPage *)NULL,
                        const wxBitmap& bitmap = wxNullBitmap,
                        const wxChar* resource = NULL)

-        : wxWizardPage(parent, bitmap, resource)
+    {
+        Create(parent, prev, next, bitmap, resource);
+    }
+
+    bool Create(wxWizard *parent = NULL, // let it be default ctor too
+                wxWizardPage *prev = (wxWizardPage *)NULL,
+                wxWizardPage *next = (wxWizardPage *)NULL,
+                const wxBitmap& bitmap = wxNullBitmap,
+                const wxChar* resource = NULL)

     {
         m_prev = prev;
         m_next = next;
     {
         m_prev = prev;
         m_next = next;

+        return wxWizardPage::Create(parent, bitmap, resource);

     }
 
     // the pointers may be also set later - but before starting the wizard
     }
 
     // the pointers may be also set later - but before starting the wizard


@@ -153,6 +177,15 @@ public:
     // get the size available for the page: the wizards are not resizeable, so
     // this size doesn't change
     virtual wxSize GetPageSize() const = 0;
     // get the size available for the page: the wizards are not resizeable, so
     // this size doesn't change
     virtual wxSize GetPageSize() const = 0;

+
+    // set the best size for the wizard, i.e. make it big enough to contain all
+    // of the pages starting from the given one
+    //
+    // this function may be called several times and possible with different
+    // pages in which case it will only increase the page size if needed (this
+    // may be useful if not all pages are accessible from the first one by
+    // default)
+    virtual void FitToPage(const wxWizardPage *firstPage) = 0;

 };
 
 // include the real class declaration
 };
 
 // include the real class declaration


@@ -169,7 +202,8 @@ class WXDLLEXPORT wxWizardEvent : public wxNotifyEvent
 public:
     wxWizardEvent(wxEventType type = wxEVT_NULL,
                   int id = -1,
 public:
     wxWizardEvent(wxEventType type = wxEVT_NULL,
                   int id = -1,

-                  bool direction = TRUE);
+                  bool direction = TRUE,
+                  wxWizardPage* page = NULL);

 
     // for EVT_WIZARD_PAGE_CHANGING, return TRUE if we're going forward or
     // FALSE otherwise and for EVT_WIZARD_PAGE_CHANGED return TRUE if we came
 
     // for EVT_WIZARD_PAGE_CHANGING, return TRUE if we're going forward or
     // FALSE otherwise and for EVT_WIZARD_PAGE_CHANGED return TRUE if we came


@@ -177,8 +211,11 @@ public:
     // (this function doesn't make sense for CANCEL events)
     bool GetDirection() const { return m_direction; }
 
     // (this function doesn't make sense for CANCEL events)
     bool GetDirection() const { return m_direction; }
 

+    wxWizardPage*   GetPage() const { return m_page; }
+

 private:
     bool m_direction;
 private:
     bool m_direction;

+    wxWizardPage*    m_page;

 
     DECLARE_DYNAMIC_CLASS(wxWizardEvent)
 };
 
     DECLARE_DYNAMIC_CLASS(wxWizardEvent)
 };


@@ -191,6 +228,7 @@ BEGIN_DECLARE_EVENT_TYPES()
     DECLARE_EVENT_TYPE(wxEVT_WIZARD_PAGE_CHANGED, 900)
     DECLARE_EVENT_TYPE(wxEVT_WIZARD_PAGE_CHANGING, 901)
     DECLARE_EVENT_TYPE(wxEVT_WIZARD_CANCEL, 902)
     DECLARE_EVENT_TYPE(wxEVT_WIZARD_PAGE_CHANGED, 900)
     DECLARE_EVENT_TYPE(wxEVT_WIZARD_PAGE_CHANGING, 901)
     DECLARE_EVENT_TYPE(wxEVT_WIZARD_CANCEL, 902)

+    DECLARE_EVENT_TYPE(wxEVT_WIZARD_HELP, 903)

 END_DECLARE_EVENT_TYPES()
 
 typedef void (wxEvtHandler::*wxWizardEventFunction)(wxWizardEvent&);
 END_DECLARE_EVENT_TYPES()
 
 typedef void (wxEvtHandler::*wxWizardEventFunction)(wxWizardEvent&);


@@ -206,6 +244,9 @@ typedef void (wxEvtHandler::*wxWizardEventFunction)(wxWizardEvent&);
 // unless the event handler vetoes the event
 #define EVT_WIZARD_CANCEL(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WIZARD_CANCEL, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxWizardEventFunction) & fn, (wxObject *)NULL),
 
 // unless the event handler vetoes the event
 #define EVT_WIZARD_CANCEL(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WIZARD_CANCEL, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxWizardEventFunction) & fn, (wxObject *)NULL),
 

+// the user pressed "Help" button 
+#define EVT_WIZARD_HELP(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WIZARD_HELP, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxWizardEventFunction) & fn, (wxObject *)NULL),
+

 #endif // wxUSE_WIZARDDLG
 
 #endif // _WX_WIZARD_H_
 #endif // wxUSE_WIZARDDLG
 
 #endif // _WX_WIZARD_H_