Remove calls to a couple of deprecated methods, fix wxMotif build with

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

diff --git a/include/wx/generic/wizard.h b/include/wx/generic/wizard.h
index b6dd5fc467949aa93de2ac11f96a11f4cd1d62b5..c74b7578f0c7b21d54633417cc50201f05197962 100644 (file)
--- a/include/wx/generic/wizard.h
+++ b/include/wx/generic/wizard.h
@@ -13,7 +13,7 @@
 // wxWizard
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "wizardg.h"
 #endif
 
@@ -47,7 +47,7 @@ public:
     virtual wxWizardPage *GetCurrentPage() const;
     virtual void SetPageSize(const wxSize& size);
     virtual wxSize GetPageSize() const;
-    virtual void Fit(const wxWizardPage *firstPage);
+    virtual void FitToPage(const wxWizardPage *firstPage);
 
     // implementation only from now on
     // -------------------------------
@@ -62,7 +62,7 @@ public:
 
     // 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?
@@ -97,5 +97,6 @@ private:
 
     DECLARE_DYNAMIC_CLASS(wxWizard)
     DECLARE_EVENT_TABLE()
+    DECLARE_NO_COPY_CLASS(wxWizard)
 };