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

14
samples/scroll/scroll.cpp
View File

@@ -294,7 +294,7 @@ public:
// override the base class function so that when this window is scrolled,
// the labels are scrolled in sync
virtual void ScrollWindow(int dx, int dy, const wxRect *rect)
virtual void ScrollWindow(int dx, int dy, const wxRect *rect) wxOVERRIDE
{
wxPanel::ScrollWindow( dx, dy, rect );
m_colLabels->ScrollWindow( dx, 0, rect );
@@ -402,7 +402,7 @@ public:
protected:
// scrolled windows which use scroll target different from the window
// itself must override this virtual method
virtual wxSize GetSizeAvailableForScrollTarget(const wxSize& size)
virtual wxSize GetSizeAvailableForScrollTarget(const wxSize& size) wxOVERRIDE
{
// decrease the total size by the size of the non-scrollable parts
// above/to the left of the canvas
@@ -473,7 +473,7 @@ public:
DoSyncIfNecessary();
}
virtual void ScrollWindow(int dx, int dy, const wxRect *rect = NULL)
virtual void ScrollWindow(int dx, int dy, const wxRect *rect = NULL) wxOVERRIDE
{
wxScrolled<wxWindow>::ScrollWindow(dx, dy, rect);
@@ -523,7 +523,7 @@ public:
SetScrollbars(0, m_hLine, 0, m_nLines + 1, 0, 0, true /* no refresh */);
}
virtual void OnDraw(wxDC& dc);
virtual void OnDraw(wxDC& dc) wxOVERRIDE;
};
// this class does "smart" redrawing - only redraws the lines which must be
@@ -542,7 +542,7 @@ public:
SetVirtualSize( wxDefaultCoord, ( m_nLines + 1 ) * m_hLine );
}
virtual void OnDraw(wxDC& dc);
virtual void OnDraw(wxDC& dc) wxOVERRIDE;
};
// ----------------------------------------------------------------------------
@@ -567,7 +567,7 @@ public:
private:
// event handlers
void OnDraw(wxDC& dc);
void OnDraw(wxDC& dc) wxOVERRIDE;
void OnMouseLeftDown(wxMouseEvent& event);
void OnMouseLeftUp(wxMouseEvent& event);
void OnMouseMove(wxMouseEvent& event);
@@ -639,7 +639,7 @@ private:
class MyApp : public wxApp
{
public:
virtual bool OnInit();
virtual bool OnInit() wxOVERRIDE;
};