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

6
samples/treectrl/treetest.cpp
View file

@ -1010,17 +1010,17 @@ void MyTreeCtrl::CreateImages(int size)
{
}
wxSize GetDefaultSize() const wxOVERRIDE
wxSize GetDefaultSize() const override
{
return m_sizeDef;
}
wxSize GetPreferredBitmapSizeAtScale(double scale) const wxOVERRIDE
wxSize GetPreferredBitmapSizeAtScale(double scale) const override
{
return m_sizeDef*scale;
}
wxBitmap GetBitmap(const wxSize& size) wxOVERRIDE
wxBitmap GetBitmap(const wxSize& size) override
{
wxBitmap bmp(m_icon);
if ( size != bmp.GetSize() )

4
samples/treectrl/treetest.h
View file

@ -33,7 +33,7 @@ class MyApp : public wxApp
public:
MyApp() { m_showImages = true; m_showStates = true; m_showButtons = false; }
bool OnInit() wxOVERRIDE;
bool OnInit() override;
void SetShowImages(bool show) { m_showImages = show; }
bool ShowImages() const { return m_showImages; }
@ -142,7 +142,7 @@ public:
}
protected:
virtual int OnCompareItems(const wxTreeItemId& i1, const wxTreeItemId& i2) wxOVERRIDE;
virtual int OnCompareItems(const wxTreeItemId& i1, const wxTreeItemId& i2) override;
// is this the test item which we use in several event handlers?
bool IsTestItem(const wxTreeItemId& item)