Updated Scintilla to 1.52 (on the trunk this time too)

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

diff --git a/include/wx/generic/wizard.h b/include/wx/generic/wizard.h
index ee25a60400c9e7742a5c34527796d25f1ac587cc..43c01a90e6e8d336d3b3ae97d358a178048e682c 100644 (file)
--- a/include/wx/generic/wizard.h
+++ b/include/wx/generic/wizard.h
@@ -6,15 +6,20 @@
 // Created:     28.09.99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Created:     28.09.99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 // ----------------------------------------------------------------------------
 // wxWizard
 // ----------------------------------------------------------------------------
 
 ///////////////////////////////////////////////////////////////////////////////
 
 // ----------------------------------------------------------------------------
 // wxWizard
 // ----------------------------------------------------------------------------
 

+#if defined(__GNUG__) && !defined(__APPLE__)
+    #pragma interface "wizardg.h"
+#endif
+

 class WXDLLEXPORT wxButton;
 class WXDLLEXPORT wxStaticBitmap;
 class WXDLLEXPORT wxButton;
 class WXDLLEXPORT wxStaticBitmap;

+class WXDLLEXPORT wxWizardEvent;

 
 class WXDLLEXPORT wxWizard : public wxWizardBase
 {
 
 class WXDLLEXPORT wxWizard : public wxWizardBase
 {


@@ -42,6 +47,7 @@ public:
     virtual wxWizardPage *GetCurrentPage() const;
     virtual void SetPageSize(const wxSize& size);
     virtual wxSize GetPageSize() const;
     virtual wxWizardPage *GetCurrentPage() const;
     virtual void SetPageSize(const wxSize& size);
     virtual wxSize GetPageSize() const;

+    virtual void FitToPage(const wxWizardPage *firstPage);

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


@@ -56,7 +62,7 @@ public:
 
     // do fill the dialog with controls
     // this is app-overridable to, for example, set help and tooltip text
 
     // do fill the dialog with controls
     // this is app-overridable to, for example, set help and tooltip text

-    void DoCreateControls();
+    virtual void DoCreateControls();

 
 private:
     // was the dialog really created?
 
 private:
     // was the dialog really created?


@@ -65,6 +71,9 @@ private:
     // event handlers
     void OnCancel(wxCommandEvent& event);
     void OnBackOrNext(wxCommandEvent& event);
     // event handlers
     void OnCancel(wxCommandEvent& event);
     void OnBackOrNext(wxCommandEvent& event);

+    void OnHelp(wxCommandEvent& event);
+
+    void OnWizEvent(wxWizardEvent& event);

 
     // the page size requested by user
     wxSize m_sizePage;
 
     // the page size requested by user
     wxSize m_sizePage;


@@ -88,5 +97,6 @@ private:
 
     DECLARE_DYNAMIC_CLASS(wxWizard)
     DECLARE_EVENT_TABLE()
 
     DECLARE_DYNAMIC_CLASS(wxWizard)
     DECLARE_EVENT_TABLE()

+    DECLARE_NO_COPY_CLASS(wxWizard)

 };
 
 };