mirror of
https://github.com/wxWidgets/wxWidgets.git
synced 2026-09-23 23:13:12 +08:00
Replace wxOVERRIDE and wxNOEXCEPT with override and noexcept
Don't use deprecated macros in wxWidgets itself.
This commit is contained in:
@@ -64,7 +64,7 @@ public:
|
||||
int WXUNUSED(flags) = 0,
|
||||
wxHeaderSortIconType WXUNUSED(sortArrow)
|
||||
= wxHDR_SORT_ICON_NONE,
|
||||
wxHeaderButtonParams* params = NULL) wxOVERRIDE
|
||||
wxHeaderButtonParams* params = NULL) override
|
||||
{
|
||||
wxDCBrushChanger setBrush(dc, *wxBLUE_BRUSH);
|
||||
wxDCTextColourChanger setFgCol(dc, *wxWHITE);
|
||||
@@ -85,7 +85,7 @@ public:
|
||||
// cases, but we show this here just for completeness)
|
||||
class MyTraits : public wxGUIAppTraits
|
||||
{
|
||||
virtual wxRendererNative *CreateRenderer() wxOVERRIDE
|
||||
virtual wxRendererNative *CreateRenderer() override
|
||||
{
|
||||
// it will be deleted on program shutdown by wxWidgets itself
|
||||
return new MyRenderer;
|
||||
@@ -96,10 +96,10 @@ class MyTraits : public wxGUIAppTraits
|
||||
class MyApp : public wxApp
|
||||
{
|
||||
public:
|
||||
virtual bool OnInit() wxOVERRIDE;
|
||||
virtual bool OnInit() override;
|
||||
|
||||
// if we want MyTraits to be used we must override CreateTraits()
|
||||
virtual wxAppTraits *CreateTraits() wxOVERRIDE { return new MyTraits; }
|
||||
virtual wxAppTraits *CreateTraits() override { return new MyTraits; }
|
||||
};
|
||||
|
||||
// Define a new frame type: this is going to be our main frame
|
||||
|
||||
Reference in New Issue
Block a user