Replace wxOVERRIDE and wxNOEXCEPT with override and noexcept
Don't use deprecated macros in wxWidgets itself.
This commit is contained in:
parent
be5095acdd
commit
88d526660f
1282 changed files with 11878 additions and 11878 deletions
|
|
@ -20,7 +20,7 @@
|
|||
class MyApp : public wxApp
|
||||
{
|
||||
public:
|
||||
bool OnInit() wxOVERRIDE;
|
||||
bool OnInit() override;
|
||||
};
|
||||
|
||||
// Define a new frame type
|
||||
|
|
@ -78,14 +78,14 @@ private:
|
|||
public:
|
||||
StyleValidator(long* style) { m_style = style; }
|
||||
|
||||
virtual bool Validate(wxWindow *WXUNUSED(parent)) wxOVERRIDE { return true; }
|
||||
virtual wxObject* Clone() const wxOVERRIDE { return new StyleValidator(*this); }
|
||||
virtual bool Validate(wxWindow *WXUNUSED(parent)) override { return true; }
|
||||
virtual wxObject* Clone() const override { return new StyleValidator(*this); }
|
||||
|
||||
// Called to transfer data to the window
|
||||
virtual bool TransferToWindow() wxOVERRIDE;
|
||||
virtual bool TransferToWindow() override;
|
||||
|
||||
// Called to transfer data from the window
|
||||
virtual bool TransferFromWindow() wxOVERRIDE;
|
||||
virtual bool TransferFromWindow() override;
|
||||
|
||||
private:
|
||||
long* m_style;
|
||||
|
|
@ -165,14 +165,14 @@ class MyComboBoxValidator : public wxValidator
|
|||
public:
|
||||
MyComboBoxValidator(wxString* var) { m_var=var; }
|
||||
|
||||
virtual bool Validate(wxWindow* parent) wxOVERRIDE;
|
||||
virtual wxObject* Clone() const wxOVERRIDE { return new MyComboBoxValidator(*this); }
|
||||
virtual bool Validate(wxWindow* parent) override;
|
||||
virtual wxObject* Clone() const override { return new MyComboBoxValidator(*this); }
|
||||
|
||||
// Called to transfer data to the window
|
||||
virtual bool TransferToWindow() wxOVERRIDE;
|
||||
virtual bool TransferToWindow() override;
|
||||
|
||||
// Called to transfer data from the window
|
||||
virtual bool TransferFromWindow() wxOVERRIDE;
|
||||
virtual bool TransferFromWindow() override;
|
||||
|
||||
protected:
|
||||
wxString* m_var;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue