From 3ee583347463a8a85fbdecacdfff6ede1b059bd3 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 21 Jun 2002 21:49:28 +0000 Subject: [PATCH] renamed wxWizard::Fit() to FitToPage() to avoid potential conflicts with wxWindow::Fit() (and the compiler warnings about it) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15917 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/generic/wizard.h | 2 +- include/wx/wizard.h | 2 +- src/generic/wizard.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/wx/generic/wizard.h b/include/wx/generic/wizard.h index b6dd5fc467..6c9b35b860 100644 --- 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 fd47de64a8..e2a578c2a3 100644 --- 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 d7c6332f29..c57773d6ce 100644 --- 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()!") ); -- 2.45.2