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

20
include/wx/toplevel.h
View File

@@ -259,9 +259,9 @@ public:
// -------------------------------
// override some base class virtuals
virtual bool Destroy();
virtual bool IsTopLevel() const { return true; }
virtual bool IsTopNavigationDomain() const { return true; }
virtual bool Destroy() wxOVERRIDE;
virtual bool IsTopLevel() const wxOVERRIDE { return true; }
virtual bool IsTopNavigationDomain() const wxOVERRIDE { return true; }
virtual bool IsVisible() const { return IsShown(); }
// event handlers
@@ -276,11 +276,11 @@ public:
void OnActivate(wxActivateEvent &WXUNUSED(event)) { }
// do the window-specific processing after processing the update event
virtual void DoUpdateWindowUI(wxUpdateUIEvent& event) ;
virtual void DoUpdateWindowUI(wxUpdateUIEvent& event) wxOVERRIDE ;
// a different API for SetSizeHints
virtual void SetMinSize(const wxSize& minSize);
virtual void SetMaxSize(const wxSize& maxSize);
virtual void SetMinSize(const wxSize& minSize) wxOVERRIDE;
virtual void SetMaxSize(const wxSize& maxSize) wxOVERRIDE;
virtual void OSXSetModified(bool modified) { m_modified = modified; }
virtual bool OSXIsModified() const { return m_modified; }
@@ -297,15 +297,15 @@ public:
protected:
// the frame client to screen translation should take account of the
// toolbar which may shift the origin of the client area
virtual void DoClientToScreen(int *x, int *y) const;
virtual void DoScreenToClient(int *x, int *y) const;
virtual void DoClientToScreen(int *x, int *y) const wxOVERRIDE;
virtual void DoScreenToClient(int *x, int *y) const wxOVERRIDE;
// add support for wxCENTRE_ON_SCREEN
virtual void DoCentre(int dir);
virtual void DoCentre(int dir) wxOVERRIDE;
// no need to do client to screen translation to get our position in screen
// coordinates: this is already the case
virtual void DoGetScreenPosition(int *x, int *y) const
virtual void DoGetScreenPosition(int *x, int *y) const wxOVERRIDE
{
DoGetPosition(x, y);
}