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

6
include/wx/persist/bookctrl.h
View File

@@ -34,12 +34,12 @@ public:
{
}
virtual void Save() const
virtual void Save() const wxOVERRIDE
{
SaveValue(wxPERSIST_BOOK_SELECTION, Get()->GetSelection());
}
virtual bool Restore()
virtual bool Restore() wxOVERRIDE
{
long sel;
if ( RestoreValue(wxPERSIST_BOOK_SELECTION, &sel) )
@@ -55,7 +55,7 @@ public:
return false;
}
virtual wxString GetKind() const { return wxPERSIST_BOOK_KIND; }
virtual wxString GetKind() const wxOVERRIDE { return wxPERSIST_BOOK_KIND; }
};
inline wxPersistentObject *wxCreatePersistentObject(wxBookCtrlBase *book)

6
include/wx/persist/splitter.h
View File

@@ -35,7 +35,7 @@ public:
{
}
virtual void Save() const
virtual void Save() const wxOVERRIDE
{
wxSplitterWindow* const splitter = Get();
@@ -43,7 +43,7 @@ public:
SaveValue(wxPERSIST_SPLITTER_POSITION, pos);
}
virtual bool Restore()
virtual bool Restore() wxOVERRIDE
{
int pos;
if ( !RestoreValue(wxPERSIST_SPLITTER_POSITION, &pos) )
@@ -57,7 +57,7 @@ public:
return true;
}
virtual wxString GetKind() const { return wxPERSIST_SPLITTER_KIND; }
virtual wxString GetKind() const wxOVERRIDE { return wxPERSIST_SPLITTER_KIND; }
};
inline wxPersistentObject *wxCreatePersistentObject(wxSplitterWindow* splitter)

6
include/wx/persist/toplevel.h
View File

@@ -46,7 +46,7 @@ public:
{
}
virtual void Save() const
virtual void Save() const wxOVERRIDE
{
const wxTopLevelWindow * const tlw = Get();
@@ -69,7 +69,7 @@ public:
SaveValue(wxPERSIST_TLW_ICONIZED, tlw->IsIconized());
}
virtual bool Restore()
virtual bool Restore() wxOVERRIDE
{
wxTopLevelWindow * const tlw = Get();
@@ -117,7 +117,7 @@ public:
return hasSize;
}
virtual wxString GetKind() const { return wxPERSIST_TLW_KIND; }
virtual wxString GetKind() const wxOVERRIDE { return wxPERSIST_TLW_KIND; }
};
inline wxPersistentObject *wxCreatePersistentObject(wxTopLevelWindow *tlw)

6
include/wx/persist/treebook.h
View File

@@ -38,7 +38,7 @@ public:
{
}
virtual void Save() const
virtual void Save() const wxOVERRIDE
{
const wxTreebook * const book = GetTreeBook();
@@ -60,7 +60,7 @@ public:
wxPersistentBookCtrl::Save();
}
virtual bool Restore()
virtual bool Restore() wxOVERRIDE
{
wxTreebook * const book = GetTreeBook();
@@ -83,7 +83,7 @@ public:
return wxPersistentBookCtrl::Restore();
}
virtual wxString GetKind() const { return wxPERSIST_TREEBOOK_KIND; }
virtual wxString GetKind() const wxOVERRIDE { return wxPERSIST_TREEBOOK_KIND; }
wxTreebook *GetTreeBook() const { return static_cast<wxTreebook *>(Get()); }
};

2
include/wx/persist/window.h
View File

@@ -33,7 +33,7 @@ public:
wxPersistentWindowBase::HandleDestroy, this);
}
virtual wxString GetName() const
virtual wxString GetName() const wxOVERRIDE
{
const wxString name = GetWindow()->GetName();
wxASSERT_MSG( !name.empty(), "persistent windows should be named!" );