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

use wxOVERRIDE

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76220 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2014-03-30 00:02:23 +00:00
parent ddd7ce624a
commit 8b4ae731d3
460 changed files with 4103 additions and 4107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
include/wx/vscroll.h
View File

@@ -124,7 +124,7 @@ public:
// change the DC origin according to the scroll position. To properly
// forward calls to wxWindow::Layout use WX_FORWARD_TO_SCROLL_HELPER()
// derived class
virtual void DoPrepareDC(wxDC& dc);
virtual void DoPrepareDC(wxDC& dc) wxOVERRIDE;
// the methods to be called from the window event handlers
void HandleOnScroll(wxScrollWinEvent& event);
@@ -326,23 +326,23 @@ public:
size_t GetVisibleRowsEnd() const { return GetVisibleEnd(); }
bool IsRowVisible(size_t row) const { return IsVisible(row); }
virtual int GetOrientationTargetSize() const
virtual int GetOrientationTargetSize() const wxOVERRIDE
{ return GetTargetWindow()->GetClientSize().y; }
virtual int GetNonOrientationTargetSize() const
virtual int GetNonOrientationTargetSize() const wxOVERRIDE
{ return GetTargetWindow()->GetClientSize().x; }
virtual wxOrientation GetOrientation() const { return wxVERTICAL; }
virtual wxOrientation GetOrientation() const wxOVERRIDE { return wxVERTICAL; }
protected:
// this function must be overridden in the derived class and it should
// return the size of the given row in pixels
virtual wxCoord OnGetRowHeight(size_t n) const = 0;
wxCoord OnGetUnitSize(size_t n) const { return OnGetRowHeight(n); }
wxCoord OnGetUnitSize(size_t n) const wxOVERRIDE { return OnGetRowHeight(n); }
virtual void OnGetRowsHeightHint(size_t WXUNUSED(rowMin),
size_t WXUNUSED(rowMax)) const { }
// forward calls to OnGetRowsHeightHint()
virtual void OnGetUnitsSizeHint(size_t unitMin, size_t unitMax) const
virtual void OnGetUnitsSizeHint(size_t unitMin, size_t unitMax) const wxOVERRIDE
{ OnGetRowsHeightHint(unitMin, unitMax); }
// again, if not overridden, it will fall back on default method
@@ -350,7 +350,7 @@ protected:
{ return DoEstimateTotalSize(); }
// forward calls to EstimateTotalHeight()
virtual wxCoord EstimateTotalSize() const { return EstimateTotalHeight(); }
virtual wxCoord EstimateTotalSize() const wxOVERRIDE { return EstimateTotalHeight(); }
wxCoord GetRowsHeight(size_t rowMin, size_t rowMax) const
{ return GetUnitsSize(rowMin, rowMax); }
@@ -406,31 +406,31 @@ public:
{ return IsVisible(column); }
virtual int GetOrientationTargetSize() const
virtual int GetOrientationTargetSize() const wxOVERRIDE
{ return GetTargetWindow()->GetClientSize().x; }
virtual int GetNonOrientationTargetSize() const
virtual int GetNonOrientationTargetSize() const wxOVERRIDE
{ return GetTargetWindow()->GetClientSize().y; }
virtual wxOrientation GetOrientation() const { return wxHORIZONTAL; }
virtual wxOrientation GetOrientation() const wxOVERRIDE { return wxHORIZONTAL; }
protected:
// this function must be overridden in the derived class and it should
// return the size of the given column in pixels
virtual wxCoord OnGetColumnWidth(size_t n) const = 0;
wxCoord OnGetUnitSize(size_t n) const { return OnGetColumnWidth(n); }
wxCoord OnGetUnitSize(size_t n) const wxOVERRIDE { return OnGetColumnWidth(n); }
virtual void OnGetColumnsWidthHint(size_t WXUNUSED(columnMin),
size_t WXUNUSED(columnMax)) const
{ }
// forward calls to OnGetColumnsWidthHint()
virtual void OnGetUnitsSizeHint(size_t unitMin, size_t unitMax) const
virtual void OnGetUnitsSizeHint(size_t unitMin, size_t unitMax) const wxOVERRIDE
{ OnGetColumnsWidthHint(unitMin, unitMax); }
// again, if not overridden, it will fall back on default method
virtual wxCoord EstimateTotalWidth() const { return DoEstimateTotalSize(); }
// forward calls to EstimateTotalWidth()
virtual wxCoord EstimateTotalSize() const { return EstimateTotalWidth(); }
virtual wxCoord EstimateTotalSize() const wxOVERRIDE { return EstimateTotalWidth(); }
wxCoord GetColumnsWidth(size_t columnMin, size_t columnMax) const
{ return GetUnitsSize(columnMin, columnMax); }
@@ -513,7 +513,7 @@ public:
// forward calls to wxWindow::Layout use WX_FORWARD_TO_SCROLL_HELPER()
// derived class. We use this version to call both base classes'
// DoPrepareDC()
virtual void DoPrepareDC(wxDC& dc);
virtual void DoPrepareDC(wxDC& dc) wxOVERRIDE;
// replacement implementation of wxWindow::Layout virtual method. To
// properly forward calls to wxWindow::Layout use