From cf4a8b2698fb853ac4b638d08d95cc8e5794d1aa Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 25 Jul 2007 17:42:43 +0000 Subject: [PATCH] fix warnings due to using deprecated-but-used-internally methods from the header file (which, of course, meant that they were also used during client code compilation) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47716 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/vscroll.h | 6 ++---- src/generic/vscroll.cpp | 19 ++++++++++++++++--- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/include/wx/vscroll.h b/include/wx/vscroll.h index 4edcfddc24..fdaf961e5f 100644 --- a/include/wx/vscroll.h +++ b/include/wx/vscroll.h @@ -623,8 +623,7 @@ protected: // OnGetLineHeight instead (backwards compatible name) // note that we don't need to forward OnGetUnitSize() as it is already // forwarded to OnGetRowHeight() in wxVarVScrollHelper - virtual wxCoord OnGetRowHeight(size_t n) const - { return OnGetLineHeight(n); } + virtual wxCoord OnGetRowHeight(size_t n) const; // this function doesn't have to be overridden but it may be useful to do // it if calculating the lines heights is a relatively expensive operation @@ -644,8 +643,7 @@ protected: // forwards the calls from base class pure virtual function to pure virtual // OnGetLinesHint instead (backwards compatible name) - void OnGetRowsHeightHint(size_t rowMin, size_t rowMax) const - { OnGetLinesHint(rowMin, rowMax); } + void OnGetRowsHeightHint(size_t rowMin, size_t rowMax) const; }; #else // !WXWIN_COMPATIBILITY_2_8 diff --git a/src/generic/vscroll.cpp b/src/generic/vscroll.cpp index 248ea31c66..530417aca3 100644 --- a/src/generic/vscroll.cpp +++ b/src/generic/vscroll.cpp @@ -963,7 +963,20 @@ wxCoord wxVarVScrollLegacyAdaptor::OnGetLineHeight(size_t WXUNUSED(n)) const return -1; } -void wxVarVScrollLegacyAdaptor::OnGetLinesHint( size_t WXUNUSED(lineMin), size_t WXUNUSED(lineMax)) const -{ } +void wxVarVScrollLegacyAdaptor::OnGetLinesHint(size_t WXUNUSED(lineMin), + size_t WXUNUSED(lineMax)) const +{ +} -#endif +wxCoord wxVarVScrollLegacyAdaptor::OnGetRowHeight(size_t n) const +{ + return OnGetLineHeight(n); +} + +void wxVarVScrollLegacyAdaptor::OnGetRowsHeightHint(size_t rowMin, + size_t rowMax) const +{ + OnGetLinesHint(rowMin, rowMax); +} + +#endif // WXWIN_COMPATIBILITY_2_8 -- 2.45.2