Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

renamed wxWizard::Fit() to FitToPage() to avoid potential conflicts with wxWindow::Fit() (and the compiler warnings about it)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15917 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-06-21 21:49:28 +00:00
parent 7357f98198
commit 3ee5833474
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/generic/wizard.h
View File

@@ -47,7 +47,7 @@ public:
virtual wxWizardPage *GetCurrentPage() const; virtual wxWizardPage *GetCurrentPage() const;
virtual void SetPageSize(const wxSize& size); virtual void SetPageSize(const wxSize& size);
virtual wxSize GetPageSize() const; virtual wxSize GetPageSize() const;
virtual void Fit(const wxWizardPage *firstPage); virtual void FitToPage(const wxWizardPage *firstPage);
// implementation only from now on // implementation only from now on
// ------------------------------- // -------------------------------

2
include/wx/wizard.h
View File

@@ -185,7 +185,7 @@ public:
// pages in which case it will only increase the page size if needed (this // 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 // may be useful if not all pages are accessible from the first one by
// default) // default)
virtual void Fit(const wxWizardPage *firstPage) = 0; virtual void FitToPage(const wxWizardPage *firstPage) = 0;
}; };
// include the real class declaration // include the real class declaration

2
src/generic/wizard.cpp
View File

@@ -280,7 +280,7 @@ void wxWizard::SetPageSize(const wxSize& size)
m_sizePage = 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... // otherwise it will have no effect now as it's too late...
wxASSERT_MSG( !WasCreated(), _T("should be called before RunWizard()!") ); wxASSERT_MSG( !WasCreated(), _T("should be called before RunWizard()!") );