solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Replace wxOVERRIDE and wxNOEXCEPT with override and noexcept

Browse source 
Don't use deprecated macros in wxWidgets itself.
This commit is contained in:
PB 2022-10-12 17:07:48 +02:00 • committed by Vadim Zeitlin
parent be5095acdd
commit 88d526660f
1282 changed files with 11878 additions and 11878 deletions
Download patch file Download diff file Expand all files Collapse all files

4
samples/render/renddll.cpp
View file

@ -28,7 +28,7 @@ public:
const wxRect& rect,
int WXUNUSED(flags) = 0,
wxHeaderSortIconType WXUNUSED(sortArrow) = wxHDR_SORT_ICON_NONE,
wxHeaderButtonParams* WXUNUSED(params) = NULL) wxOVERRIDE
wxHeaderButtonParams* WXUNUSED(params) = NULL) override
{
dc.SetBrush(*wxCYAN_BRUSH);
dc.SetTextForeground(*wxRED);
@ -38,7 +38,7 @@ public:
return dc.GetTextExtent("MyDllRenderer").x;
}
virtual wxRendererVersion GetVersion() const wxOVERRIDE
virtual wxRendererVersion GetVersion() const override
{
return wxRendererVersion(wxRendererVersion::Current_Version,
wxRendererVersion::Current_Age);

8
samples/render/render.cpp
View file

@ -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