renamed wxWizard::Fit() to FitToPage() to avoid potential conflicts with wxWindow...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15917 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/generic/wizard.h b/include/wx/generic/wizard.h
index b6dd5fc467949aa93de2ac11f96a11f4cd1d62b5..6c9b35b860de461da9c46643598b67c4871f994d 100644 (file)
--- a/include/wx/generic/wizard.h
+++ b/include/wx/generic/wizard.h
@@ -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
     // -------------------------------

diff --git a/include/wx/wizard.h b/include/wx/wizard.h
index fd47de64a88bc649ca63c12dbb997719d9ed1835..e2a578c2a3a1ec781b8c9b465f06769b61cad3f8 100644 (file)
--- a/include/wx/wizard.h
+++ b/include/wx/wizard.h
@@ -185,7 +185,7 @@ public:
     // 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 Fit(const wxWizardPage *firstPage) = 0;
+    virtual void FitToPage(const wxWizardPage *firstPage) = 0;
 };
 
 // include the real class declaration

diff --git a/src/generic/wizard.cpp b/src/generic/wizard.cpp
index d7c6332f29e94dff1e89770777db82c792559ecd..c57773d6ce26d5f4268381ebc5c1636b5282c4d8 100644 (file)
--- a/src/generic/wizard.cpp
+++ b/src/generic/wizard.cpp
@@ -280,7 +280,7 @@ void wxWizard::SetPageSize(const wxSize& size)
     m_sizePage = size;
 }
 
-void wxWizard::Fit(const wxWizardPage *page)
+void wxWizard::FitToPage(const wxWizardPage *page)
 {
     // otherwise it will have no effect now as it's too late...
     wxASSERT_MSG( !WasCreated(), _T("should be called before RunWizard()!") );