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

32
include/wx/univ/window.h
View File

@@ -93,16 +93,16 @@ public:
int pos,
int page,
int range,
bool refresh = true );
virtual void SetScrollPos(int orient, int pos, bool refresh = true);
virtual int GetScrollPos(int orient) const;
virtual int GetScrollThumb(int orient) const;
virtual int GetScrollRange(int orient) const;
bool refresh = true ) wxOVERRIDE;
virtual void SetScrollPos(int orient, int pos, bool refresh = true) wxOVERRIDE;
virtual int GetScrollPos(int orient) const wxOVERRIDE;
virtual int GetScrollThumb(int orient) const wxOVERRIDE;
virtual int GetScrollRange(int orient) const wxOVERRIDE;
virtual void ScrollWindow(int dx, int dy,
const wxRect* rect = NULL);
const wxRect* rect = NULL) wxOVERRIDE;
// take into account the borders here
virtual wxPoint GetClientAreaOrigin() const;
virtual wxPoint GetClientAreaOrigin() const wxOVERRIDE;
// popup menu support
// ------------------
@@ -179,15 +179,15 @@ public:
// the rect coordinates are, for us, in client coords, but if no rect is
// specified, the entire window is refreshed
virtual void Refresh(bool eraseBackground = true,
const wxRect *rect = (const wxRect *) NULL);
const wxRect *rect = (const wxRect *) NULL) wxOVERRIDE;
// we refresh the window when it is dis/enabled
virtual bool Enable(bool enable = true);
virtual bool Enable(bool enable = true) wxOVERRIDE;
// should we use the standard control colours or not?
virtual bool ShouldInheritColours() const { return false; }
virtual bool ShouldInheritColours() const wxOVERRIDE { return false; }
virtual bool IsClientAreaChild(const wxWindow *child) const
virtual bool IsClientAreaChild(const wxWindow *child) const wxOVERRIDE
{
#if wxUSE_SCROLLBAR
if ( child == (wxWindow*)m_scrollbarHorz ||
@@ -202,13 +202,13 @@ protected:
void Init();
#if wxUSE_MENUS
virtual bool DoPopupMenu(wxMenu *menu, int x, int y);
virtual bool DoPopupMenu(wxMenu *menu, int x, int y) wxOVERRIDE;
#endif // wxUSE_MENUS
// we deal with the scrollbars in these functions
virtual void DoSetClientSize(int width, int height);
virtual void DoGetClientSize(int *width, int *height) const;
virtual wxHitTest DoHitTest(wxCoord x, wxCoord y) const;
virtual void DoSetClientSize(int width, int height) wxOVERRIDE;
virtual void DoGetClientSize(int *width, int *height) const wxOVERRIDE;
virtual wxHitTest DoHitTest(wxCoord x, wxCoord y) const wxOVERRIDE;
// event handlers
void OnSize(wxSizeEvent& event);
@@ -235,7 +235,7 @@ protected:
virtual void DoDraw(wxControlRenderer *renderer);
// override the base class method to return the size of the window borders
virtual wxSize DoGetBorderSize() const;
virtual wxSize DoGetBorderSize() const wxOVERRIDE;
// adjust the size of the window to take into account its borders
wxSize AdjustSize(const wxSize& size) const;