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

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)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47716 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-07-25 17:42:43 +00:00
parent df4aed1cf0
commit cf4a8b2698
2 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/vscroll.h
View File

@@ -623,8 +623,7 @@ protected:
// OnGetLineHeight instead (backwards compatible name) // OnGetLineHeight instead (backwards compatible name)
// note that we don't need to forward OnGetUnitSize() as it is already // note that we don't need to forward OnGetUnitSize() as it is already
// forwarded to OnGetRowHeight() in wxVarVScrollHelper // forwarded to OnGetRowHeight() in wxVarVScrollHelper
virtual wxCoord OnGetRowHeight(size_t n) const virtual wxCoord OnGetRowHeight(size_t n) const;
{ return OnGetLineHeight(n); }
// this function doesn't have to be overridden but it may be useful to do // 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 // 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 // forwards the calls from base class pure virtual function to pure virtual
// OnGetLinesHint instead (backwards compatible name) // OnGetLinesHint instead (backwards compatible name)
void OnGetRowsHeightHint(size_t rowMin, size_t rowMax) const void OnGetRowsHeightHint(size_t rowMin, size_t rowMax) const;
{ OnGetLinesHint(rowMin, rowMax); }
}; };
#else // !WXWIN_COMPATIBILITY_2_8 #else // !WXWIN_COMPATIBILITY_2_8

19
src/generic/vscroll.cpp
View File

@@ -963,7 +963,20 @@ wxCoord wxVarVScrollLegacyAdaptor::OnGetLineHeight(size_t WXUNUSED(n)) const
return -1; 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