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

Merge branch 'more-wxoverride' of https://github.com/MaartenBent/wxWidgets

Browse Source 
See https://github.com/wxWidgets/wxWidgets/pull/944
This commit is contained in:
Vadim Zeitlin
2018-09-22 14:43:14 +02:00
parent a3eeb4d0be f666510cbb
commit 94c8179ef8
55 changed files with 229 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/hash.h
View File

@@ -275,7 +275,7 @@ private:
eltype *Delete(long lhash, long key) \
{ return (eltype*)DoDelete(key, lhash); } \
private: \
virtual void DoDeleteContents( wxHashTableBase_Node* node ) \
virtual void DoDeleteContents( wxHashTableBase_Node* node ) wxOVERRIDE\
{ delete (eltype*)node->GetData(); } \
\
wxDECLARE_NO_COPY_CLASS(hashclass); \

12
include/wx/testing.h
View File

@@ -163,7 +163,7 @@ public:
}
protected:
virtual int Invoke(wxDialog *dlg) const
virtual int Invoke(wxDialog *dlg) const wxOVERRIDE
{
DialogType *t = dynamic_cast<DialogType*>(dlg);
if ( t )
@@ -173,7 +173,7 @@ protected:
}
/// Returns description of the expected dialog (by default, its class).
virtual wxString GetDefaultDescription() const
virtual wxString GetDefaultDescription() const wxOVERRIDE
{
return wxGetDialogClassDescription<T>(wxCLASSINFO(T));
}
@@ -220,7 +220,7 @@ public:
}
protected:
virtual int OnInvoked(T *WXUNUSED(dlg)) const
virtual int OnInvoked(T *WXUNUSED(dlg)) const wxOVERRIDE
{
return m_id;
}
@@ -239,7 +239,7 @@ public:
}
protected:
virtual wxString GetDefaultDescription() const
virtual wxString GetDefaultDescription() const wxOVERRIDE
{
// It can be useful to show which buttons the expected message box was
// supposed to have, in case there could have been several of them.
@@ -289,7 +289,7 @@ public:
}
protected:
virtual int OnInvoked(wxFileDialog *dlg) const
virtual int OnInvoked(wxFileDialog *dlg) const wxOVERRIDE
{
dlg->SetPath(m_path);
return m_id;
@@ -351,7 +351,7 @@ public:
}
protected:
virtual int Enter(wxDialog *dlg)
virtual int Enter(wxDialog *dlg) wxOVERRIDE
{
while ( !m_expectations.empty() )
{