Some Motif fixes; makefile fixes; added wxTransferStreamToFile/FileToStream for wxWin

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

diff --git a/include/wx/generic/wizard.h b/include/wx/generic/wizard.h
index 987113b877bea2cbb7c40c2b73d31bd4a9456b30..7c26f62b85a49e5e3ab71b97a055ca1a8c0adbab 100644 (file)
--- a/include/wx/generic/wizard.h
+++ b/include/wx/generic/wizard.h
@@ -13,7 +13,10 @@
 // wxWizard
 // ----------------------------------------------------------------------------
 
 // wxWizard
 // ----------------------------------------------------------------------------
 

-class wxWizard : public wxWizardBase
+class WXDLLEXPORT wxButton;
+class WXDLLEXPORT wxStaticBitmap;
+
+class WXDLLEXPORT wxWizard : public wxWizardBase

 {
 public:
     // ctor
 {
 public:
     // ctor


@@ -27,6 +30,7 @@ public:
     // 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 wxSize GetPageSize() const;

 
     // implementation only from now on
     // -------------------------------
 
     // implementation only from now on
     // -------------------------------


@@ -51,10 +55,12 @@ private:
 
     // wizard state
     wxWizardPage *m_page;       // the current page or NULL
 
     // wizard state
     wxWizardPage *m_page;       // the current page or NULL

+    wxBitmap      m_bitmap;     // the default bitmap to show

 
     // wizard controls
     wxButton    *m_btnPrev,     // the "<Back" button
                 *m_btnNext;     // the "Next>" or "Finish" button
 
     // wizard controls
     wxButton    *m_btnPrev,     // the "<Back" button
                 *m_btnNext;     // the "Next>" or "Finish" button

+    wxStaticBitmap *m_statbmp;  // the control for the bitmap

 
     DECLARE_DYNAMIC_CLASS(wxWizard)
     DECLARE_EVENT_TABLE()
 
     DECLARE_DYNAMIC_CLASS(wxWizard)
     DECLARE_EVENT_TABLE()