From dede4b9326ade86fbee86daa8c98f16756a53c19 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 17 Nov 2023 01:33:32 +0100 Subject: [PATCH] Use "= default" for all trivial default ctors and dtors Replace user-specified empty constructors and destructors with the compiler-generated versions, which has a number of advantages for code generation, in addition to being more clear. Closes #22965. Closes #24058. --- include/wx/aboutdlg.h | 2 +- include/wx/access.h | 2 +- include/wx/addremovectrl.h | 4 +-- include/wx/affinematrix2dbase.h | 4 +-- include/wx/animate.h | 2 +- include/wx/any.h | 26 ++++++++--------- include/wx/anybutton.h | 2 +- include/wx/appprogress.h | 4 +-- include/wx/apptrait.h | 2 +- include/wx/archive.h | 10 +++---- include/wx/arrstr.h | 2 +- include/wx/atomic.h | 2 +- include/wx/aui/auibar.h | 4 +-- include/wx/aui/dockart.h | 4 +-- include/wx/aui/framemanager.h | 2 +- include/wx/aui/tabart.h | 4 +-- include/wx/bitmap.h | 2 +- include/wx/bmpcbox.h | 2 +- include/wx/brush.h | 2 +- include/wx/button.h | 2 +- include/wx/caret.h | 2 +- include/wx/catch_cppunit.h | 2 +- include/wx/checkbox.h | 2 +- include/wx/checklst.h | 2 +- include/wx/choice.h | 2 +- include/wx/choicebk.h | 2 +- include/wx/clntdata.h | 6 ++-- include/wx/clrpicker.h | 8 +++--- include/wx/cmdline.h | 2 +- include/wx/cmdproc.h | 2 +- include/wx/collheaderctrl.h | 4 +-- include/wx/collpane.h | 4 +-- include/wx/colour.h | 4 +-- include/wx/containr.h | 2 +- include/wx/control.h | 2 +- include/wx/cshelp.h | 2 +- include/wx/ctrlsub.h | 8 +++--- include/wx/custombgwin.h | 4 +-- include/wx/dataview.h | 2 +- include/wx/datectrl.h | 2 +- include/wx/dateevt.h | 2 +- include/wx/datetime.h | 2 +- include/wx/dc.h | 6 ++-- include/wx/dcbuffer.h | 2 +- include/wx/dcsvg.h | 2 +- include/wx/debugrpt.h | 8 +++--- include/wx/dfb/bitmap.h | 2 +- include/wx/dfb/brush.h | 2 +- include/wx/dfb/cursor.h | 2 +- include/wx/dfb/font.h | 2 +- include/wx/dfb/pen.h | 2 +- include/wx/dfb/popupwin.h | 2 +- include/wx/dfb/region.h | 2 +- include/wx/dfb/wrapdfb.h | 4 +-- include/wx/dialog.h | 6 ++-- include/wx/dialup.h | 2 +- include/wx/dir.h | 2 +- include/wx/dirdlg.h | 4 +-- include/wx/dnd.h | 2 +- include/wx/docmdi.h | 2 +- include/wx/docview.h | 2 +- include/wx/dvrenderers.h | 2 +- include/wx/event.h | 6 ++-- include/wx/evtloopsrc.h | 2 +- include/wx/ffile.h | 2 +- include/wx/file.h | 2 +- include/wx/filectrl.h | 4 +-- include/wx/filedlg.h | 2 +- include/wx/filefn.h | 2 +- include/wx/filepicker.h | 10 +++---- include/wx/fontdlg.h | 2 +- include/wx/fontenum.h | 4 +-- include/wx/fontpicker.h | 6 ++-- include/wx/fs_filter.h | 2 +- include/wx/gdicmn.h | 2 +- include/wx/gdiobj.h | 2 +- include/wx/generic/choicdgg.h | 2 +- include/wx/generic/clrpickerg.h | 4 +-- include/wx/generic/combo.h | 2 +- include/wx/generic/ctrlsub.h | 2 +- include/wx/generic/custombgwin.h | 4 +-- include/wx/generic/dataview.h | 2 +- include/wx/generic/dirctrlg.h | 4 +-- include/wx/generic/filectrlg.h | 2 +- include/wx/generic/filedlgg.h | 2 +- include/wx/generic/filepickerg.h | 4 +-- include/wx/generic/fontpickerg.h | 4 +-- include/wx/generic/grid.h | 6 ++-- include/wx/generic/grideditors.h | 2 +- include/wx/generic/laywin.h | 2 +- include/wx/generic/listctrl.h | 2 +- include/wx/generic/mask.h | 2 +- include/wx/generic/mdig.h | 2 +- include/wx/generic/private/grid.h | 8 +++--- include/wx/generic/private/markuptext.h | 2 +- include/wx/generic/statbmpg.h | 2 +- include/wx/generic/textdlgg.h | 2 +- include/wx/generic/treectlg.h | 2 +- include/wx/geometry.h | 2 +- include/wx/graphics.h | 28 +++++++++---------- include/wx/gtk/bitmap.h | 2 +- include/wx/gtk/bmpbuttn.h | 2 +- include/wx/gtk/brush.h | 2 +- include/wx/gtk/button.h | 2 +- include/wx/gtk/calctrl.h | 4 +-- include/wx/gtk/colordlg.h | 4 +-- include/wx/gtk/dirdlg.h | 4 +-- include/wx/gtk/filedlg.h | 2 +- include/wx/gtk/font.h | 2 +- include/wx/gtk/gnome/gvfs.h | 4 +-- include/wx/gtk/mdi.h | 2 +- include/wx/gtk/minifram.h | 2 +- include/wx/gtk/pen.h | 2 +- include/wx/gtk/popupwin.h | 2 +- include/wx/gtk/private/image.h | 2 +- include/wx/gtk/private/log.h | 2 +- include/wx/gtk/private/string.h | 2 +- include/wx/gtk/radiobut.h | 2 +- include/wx/gtk/region.h | 2 +- include/wx/gtk/spinctrl.h | 2 +- include/wx/gtk/tglbtn.h | 4 +-- include/wx/hash.h | 2 +- include/wx/hashmap.h | 16 +++++------ include/wx/hashset.h | 2 +- include/wx/headercol.h | 2 +- include/wx/helpbase.h | 2 +- include/wx/html/helpdata.h | 2 +- include/wx/html/htmlcell.h | 2 +- include/wx/html/htmlfilt.h | 2 +- include/wx/html/htmlproc.h | 2 +- include/wx/html/htmlwin.h | 10 +++---- include/wx/htmllbox.h | 2 +- include/wx/hyperlink.h | 4 +-- include/wx/image.h | 2 +- include/wx/infobar.h | 2 +- include/wx/ipcbase.h | 8 +++--- include/wx/itemattr.h | 2 +- include/wx/layout.h | 4 +-- include/wx/list.h | 4 +-- include/wx/listbase.h | 2 +- include/wx/listbook.h | 2 +- include/wx/listbox.h | 2 +- include/wx/listctrl.h | 2 +- include/wx/log.h | 8 +++--- include/wx/memtext.h | 2 +- include/wx/menu.h | 2 +- include/wx/mimetype.h | 12 ++++---- include/wx/modalhook.h | 2 +- include/wx/module.h | 4 +-- include/wx/msgdlg.h | 2 +- include/wx/msgout.h | 8 +++--- include/wx/msw/accel.h | 2 +- include/wx/msw/bitmap.h | 4 +-- include/wx/msw/bmpbuttn.h | 2 +- include/wx/msw/control.h | 2 +- include/wx/msw/ctrlsub.h | 2 +- include/wx/msw/datectrl.h | 2 +- include/wx/msw/enhmeta.h | 2 +- include/wx/msw/evtloop.h | 2 +- include/wx/msw/evtloopconsole.h | 2 +- include/wx/msw/font.h | 2 +- include/wx/msw/gauge.h | 2 +- include/wx/msw/helpwin.h | 2 +- include/wx/msw/hyperlink.h | 2 +- include/wx/msw/icon.h | 4 +-- include/wx/msw/mimetype.h | 4 +-- include/wx/msw/minifram.h | 2 +- include/wx/msw/ole/dataobj2.h | 2 +- include/wx/msw/ownerdrawnbutton.h | 2 +- include/wx/msw/ownerdrw.h | 4 +-- include/wx/msw/palette.h | 2 +- include/wx/msw/pen.h | 4 +-- include/wx/msw/private/comstream.h | 2 +- include/wx/msw/private/webview_ie.h | 6 ++-- include/wx/msw/regconf.h | 2 +- include/wx/msw/spinbutt.h | 2 +- include/wx/msw/stackwalk.h | 2 +- include/wx/msw/statline.h | 2 +- include/wx/msw/stattext.h | 2 +- include/wx/msw/tglbtn.h | 2 +- include/wx/msw/timectrl.h | 2 +- include/wx/msw/webview_ie.h | 2 +- include/wx/msw/wrl/event.h | 2 +- include/wx/nativewin.h | 2 +- include/wx/notebook.h | 4 +-- include/wx/object.h | 2 +- include/wx/osx/anybutton.h | 2 +- include/wx/osx/bitmap.h | 4 +-- include/wx/osx/button.h | 2 +- include/wx/osx/carbon/region.h | 2 +- include/wx/osx/checkbox.h | 2 +- include/wx/osx/cocoa/private/textimpl.h | 2 +- include/wx/osx/combobox.h | 2 +- include/wx/osx/core/cfdataref.h | 3 +- include/wx/osx/core/colour.h | 4 +-- include/wx/osx/core/private.h | 28 +++++++++---------- include/wx/osx/core/private/datetimectrl.h | 2 +- include/wx/osx/dataobj.h | 2 +- include/wx/osx/datectrl.h | 2 +- include/wx/osx/font.h | 2 +- include/wx/osx/frame.h | 2 +- include/wx/osx/gauge.h | 2 +- include/wx/osx/mdi.h | 2 +- include/wx/osx/minifram.h | 4 +-- include/wx/osx/notebook.h | 2 +- include/wx/osx/popupwin.h | 2 +- include/wx/osx/radiobut.h | 2 +- include/wx/osx/statbmp.h | 2 +- include/wx/osx/statbox.h | 2 +- include/wx/osx/stattext.h | 2 +- include/wx/osx/tglbtn.h | 4 +-- include/wx/osx/timectrl.h | 2 +- include/wx/ownerdrw.h | 2 +- include/wx/palette.h | 2 +- include/wx/panel.h | 2 +- include/wx/pen.h | 2 +- include/wx/persist.h | 2 +- include/wx/pickerbase.h | 2 +- include/wx/popupwin.h | 4 +-- include/wx/preferences.h | 4 +-- include/wx/printdlg.h | 4 +-- include/wx/private/animate.h | 4 +-- include/wx/private/display.h | 4 +-- include/wx/private/eventloopsourcesmanager.h | 2 +- include/wx/private/fdiodispatcher.h | 4 +-- include/wx/private/fdiohandler.h | 2 +- include/wx/private/fdiomanager.h | 2 +- include/wx/private/fontmgr.h | 2 +- include/wx/private/graphics.h | 6 ++-- include/wx/private/markupparser.h | 4 +-- include/wx/private/markupparserattr.h | 2 +- include/wx/private/menuradio.h | 2 +- include/wx/private/notifmsg.h | 2 +- include/wx/private/preferences.h | 4 +-- include/wx/private/refcountermt.h | 2 +- include/wx/private/richtooltip.h | 4 +-- include/wx/private/socket.h | 2 +- include/wx/private/textmeasure.h | 2 +- include/wx/private/timer.h | 2 +- include/wx/private/tlwgeom.h | 4 +-- include/wx/private/uiaction.h | 4 +-- include/wx/private/uilocale.h | 2 +- include/wx/private/webrequest.h | 8 +++--- include/wx/prntbase.h | 4 +-- include/wx/propgrid/propgriddefs.h | 2 +- include/wx/protocol/log.h | 2 +- include/wx/qt/colordlg.h | 2 +- include/wx/qt/cursor.h | 2 +- include/wx/qt/dirdlg.h | 2 +- include/wx/qt/filedlg.h | 2 +- include/wx/qt/fontdlg.h | 2 +- include/wx/qt/minifram.h | 2 +- include/wx/quantize.h | 4 +-- include/wx/radiobut.h | 2 +- include/wx/rearrangectrl.h | 2 +- include/wx/richtext/richtextbuffer.h | 20 ++++++------- include/wx/richtext/richtextdialogpage.h | 2 +- include/wx/richtext/richtextformatdlg.h | 4 +-- include/wx/richtext/richtextstyles.h | 12 ++++---- include/wx/richtext/richtextuicustomization.h | 6 ++-- include/wx/scopeguard.h | 2 +- include/wx/scrolbar.h | 2 +- include/wx/scrolwin.h | 2 +- include/wx/settings.h | 2 +- include/wx/sharedptr.h | 2 +- include/wx/slider.h | 2 +- include/wx/spinctrl.h | 2 +- include/wx/srchctrl.h | 4 +-- include/wx/stack.h | 2 +- include/wx/stackwalk.h | 6 ++-- include/wx/statbmp.h | 2 +- include/wx/statline.h | 2 +- include/wx/stattext.h | 2 +- include/wx/stc/stc.h | 2 +- include/wx/stdpaths.h | 2 +- include/wx/stdstream.h | 8 +++--- include/wx/strconv.h | 4 +-- include/wx/stream.h | 4 +-- include/wx/string.h | 12 ++++---- include/wx/strvararg.h | 2 +- include/wx/sysopt.h | 2 +- include/wx/systhemectrl.h | 4 +-- include/wx/tarstrm.h | 2 +- include/wx/taskbar.h | 2 +- include/wx/taskbarbutton.h | 4 +-- include/wx/testing.h | 2 +- include/wx/textcompleter.h | 4 +-- include/wx/textctrl.h | 10 +++---- include/wx/textfile.h | 2 +- include/wx/textwrapper.h | 2 +- include/wx/tglbtn.h | 2 +- include/wx/timectrl.h | 2 +- include/wx/tipdlg.h | 2 +- include/wx/toplevel.h | 4 +-- include/wx/tracker.h | 2 +- include/wx/translation.h | 4 +-- include/wx/treebase.h | 2 +- include/wx/treelist.h | 4 +-- include/wx/uilocale.h | 2 +- include/wx/univ/anybutton.h | 4 +-- include/wx/univ/bmpbuttn.h | 2 +- include/wx/univ/choice.h | 2 +- include/wx/univ/colschem.h | 2 +- include/wx/univ/custombgwin.h | 2 +- include/wx/univ/frame.h | 2 +- include/wx/univ/inpcons.h | 2 +- include/wx/univ/scrarrow.h | 2 +- include/wx/univ/scrthumb.h | 2 +- include/wx/univ/statbox.h | 2 +- include/wx/univ/statline.h | 2 +- include/wx/univ/stattext.h | 2 +- include/wx/unix/private/wakeuppipe.h | 2 +- include/wx/unix/sound.h | 2 +- include/wx/unix/stdpaths.h | 2 +- include/wx/url.h | 2 +- include/wx/ustring.h | 2 +- include/wx/valgen.h | 2 +- include/wx/valtext.h | 2 +- include/wx/variant.h | 6 ++-- include/wx/variantbase.h | 4 +-- include/wx/webview.h | 12 ++++---- include/wx/window.h | 2 +- include/wx/windowptr.h | 2 +- include/wx/wizard.h | 2 +- include/wx/x11/bitmap.h | 2 +- include/wx/x11/brush.h | 2 +- include/wx/x11/dataobj.h | 2 +- include/wx/x11/dc.h | 2 +- include/wx/x11/dnd.h | 4 +-- include/wx/x11/font.h | 2 +- include/wx/x11/minifram.h | 4 +-- include/wx/x11/pen.h | 2 +- include/wx/x11/popupwin.h | 2 +- include/wx/x11/region.h | 2 +- include/wx/x11/reparent.h | 2 +- include/wx/xml/xml.h | 2 +- include/wx/xpmdecod.h | 4 +-- include/wx/xrc/xmlres.h | 4 +-- include/wx/xrc/xmlreshandler.h | 2 +- include/wx/xtictor.h | 2 +- include/wx/xtiprop.h | 18 ++++++------ include/wx/xtistrm.h | 4 +-- include/wx/xtixml.h | 2 +- include/wx/zipstrm.h | 2 +- interface/wx/any.h | 2 +- interface/wx/containr.h | 2 +- interface/wx/defs.h | 2 +- interface/wx/hashmap.h | 4 +-- interface/wx/hashset.h | 4 +-- interface/wx/module.h | 2 +- interface/wx/object.h | 2 +- interface/wx/propgrid/editors.h | 6 ++-- interface/wx/propgrid/property.h | 4 +-- interface/wx/propgrid/props.h | 4 +-- interface/wx/richtext/richtextbuffer.h | 20 ++++++------- tests/strings/stdstrings.cpp | 4 +++ 356 files changed, 589 insertions(+), 586 deletions(-) diff --git a/include/wx/aboutdlg.h b/include/wx/aboutdlg.h index dbbe2d33f4..0503811fe2 100644 --- a/include/wx/aboutdlg.h +++ b/include/wx/aboutdlg.h @@ -25,7 +25,7 @@ class WXDLLIMPEXP_ADV wxAboutDialogInfo { public: // all fields are initially uninitialized - wxAboutDialogInfo() { } + wxAboutDialogInfo() = default; // accessors for various simply fields // ----------------------------------- diff --git a/include/wx/access.h b/include/wx/access.h index 3b795c182a..975d53a31b 100644 --- a/include/wx/access.h +++ b/include/wx/access.h @@ -233,7 +233,7 @@ class WXDLLIMPEXP_CORE wxAccessibleBase : public wxObject public: wxAccessibleBase(wxWindow* win): m_window(win) {} - virtual ~wxAccessibleBase() {} + virtual ~wxAccessibleBase() = default; // Overridables diff --git a/include/wx/addremovectrl.h b/include/wx/addremovectrl.h index 74167c24be..c9b236a66c 100644 --- a/include/wx/addremovectrl.h +++ b/include/wx/addremovectrl.h @@ -24,8 +24,8 @@ class WXDLLIMPEXP_CORE wxAddRemoveAdaptor { public: // Default ctor and trivial but virtual dtor. - wxAddRemoveAdaptor() { } - virtual ~wxAddRemoveAdaptor() { } + wxAddRemoveAdaptor() = default; + virtual ~wxAddRemoveAdaptor() = default; // Override to return the associated control. virtual wxWindow* GetItemsCtrl() const = 0; diff --git a/include/wx/affinematrix2dbase.h b/include/wx/affinematrix2dbase.h index 35dd27ef43..a1c8b42014 100644 --- a/include/wx/affinematrix2dbase.h +++ b/include/wx/affinematrix2dbase.h @@ -38,8 +38,8 @@ struct wxMatrix2D class WXDLLIMPEXP_CORE wxAffineMatrix2DBase { public: - wxAffineMatrix2DBase() {} - virtual ~wxAffineMatrix2DBase() {} + wxAffineMatrix2DBase() = default; + virtual ~wxAffineMatrix2DBase() = default; // sets the matrix to the respective values virtual void Set(const wxMatrix2D& mat2D, const wxPoint2DDouble& tr) = 0; diff --git a/include/wx/animate.h b/include/wx/animate.h index 9a51e85d23..c9c9ffe849 100644 --- a/include/wx/animate.h +++ b/include/wx/animate.h @@ -154,7 +154,7 @@ private: class WXDLLIMPEXP_CORE wxAnimationCtrlBase : public wxControl { public: - wxAnimationCtrlBase() { } + wxAnimationCtrlBase() = default; // public API virtual bool LoadFile(const wxString& filename, diff --git a/include/wx/any.h b/include/wx/any.h index 6b519521d2..192c4a82af 100644 --- a/include/wx/any.h +++ b/include/wx/any.h @@ -247,7 +247,7 @@ public: : m_value(value) { } - virtual ~DataHolder() { } + virtual ~DataHolder() = default; T2 m_value; private: @@ -298,7 +298,7 @@ class wxAnyValueTypeImplBase : public wxAnyValueType public: wxAnyValueTypeImplBase() : wxAnyValueType() { } - virtual ~wxAnyValueTypeImplBase() { } + virtual ~wxAnyValueTypeImplBase() = default; virtual void DeleteValue(wxAnyValueBuffer& buf) const override { @@ -348,7 +348,7 @@ class wxAnyValueTypeImpl : public wxAnyValueTypeImplBase WX_DECLARE_ANY_VALUE_TYPE(wxAnyValueTypeImpl) public: wxAnyValueTypeImpl() : wxAnyValueTypeImplBase() { } - virtual ~wxAnyValueTypeImpl() { } + virtual ~wxAnyValueTypeImpl() = default; virtual bool ConvertValue(const wxAnyValueBuffer& src, wxAnyValueType* dstType, @@ -376,7 +376,7 @@ class wxAnyValueTypeImpl : public wxAnyValueTypeImpl##CLSTYPE \ typedef wxAnyBase##CLSTYPE##Type UseDataType; \ public: \ wxAnyValueTypeImpl() : wxAnyValueTypeImpl##CLSTYPE() { } \ - virtual ~wxAnyValueTypeImpl() { } \ + virtual ~wxAnyValueTypeImpl() = default; \ static void SetValue(const T& value, wxAnyValueBuffer& buf) \ { \ void* voidPtr = reinterpret_cast(&buf.m_buffer[0]); \ @@ -426,7 +426,7 @@ class WXDLLIMPEXP_BASE wxAnyValueTypeImplInt : public: wxAnyValueTypeImplInt() : wxAnyValueTypeImplBase() { } - virtual ~wxAnyValueTypeImplInt() { } + virtual ~wxAnyValueTypeImplInt() = default; virtual bool ConvertValue(const wxAnyValueBuffer& src, wxAnyValueType* dstType, @@ -441,7 +441,7 @@ class WXDLLIMPEXP_BASE wxAnyValueTypeImplUint : public: wxAnyValueTypeImplUint() : wxAnyValueTypeImplBase() { } - virtual ~wxAnyValueTypeImplUint() { } + virtual ~wxAnyValueTypeImplUint() = default; virtual bool ConvertValue(const wxAnyValueBuffer& src, wxAnyValueType* dstType, @@ -478,7 +478,7 @@ class WXDLLIMPEXP_BASE wxAnyValueTypeImpl##TYPENAME : \ public: \ wxAnyValueTypeImpl##TYPENAME() : \ wxAnyValueTypeImplBase() { } \ - virtual ~wxAnyValueTypeImpl##TYPENAME() { } \ + virtual ~wxAnyValueTypeImpl##TYPENAME() = default; \ virtual bool ConvertValue(const wxAnyValueBuffer& src, \ wxAnyValueType* dstType, \ wxAnyValueBuffer& dst) const override \ @@ -492,7 +492,7 @@ class wxAnyValueTypeImpl : public wxAnyValueTypeImpl##TYPENAME \ { \ public: \ wxAnyValueTypeImpl() : wxAnyValueTypeImpl##TYPENAME() { } \ - virtual ~wxAnyValueTypeImpl() { } \ + virtual ~wxAnyValueTypeImpl() = default; \ }; #define WX_ANY_DEFINE_CONVERTIBLE_TYPE(T, TYPENAME, CONVFUNC, BT) \ @@ -530,7 +530,7 @@ class WXDLLIMPEXP_BASE wxAnyValueTypeImpl : public: wxAnyValueTypeImpl() : wxAnyValueTypeImplBase() { } - virtual ~wxAnyValueTypeImpl() { } + virtual ~wxAnyValueTypeImpl() = default; virtual bool ConvertValue(const wxAnyValueBuffer& src, wxAnyValueType* dstType, @@ -547,7 +547,7 @@ class WXDLLIMPEXP_BASE wxAnyValueTypeImplDouble : public: wxAnyValueTypeImplDouble() : wxAnyValueTypeImplBase() { } - virtual ~wxAnyValueTypeImplDouble() { } + virtual ~wxAnyValueTypeImplDouble() = default; virtual bool ConvertValue(const wxAnyValueBuffer& src, wxAnyValueType* dstType, @@ -575,7 +575,7 @@ class DECL wxAnyValueTypeImpl : \ public: \ wxAnyValueTypeImpl() : \ wxAnyValueTypeImplBase() { } \ - virtual ~wxAnyValueTypeImpl() { } \ + virtual ~wxAnyValueTypeImpl() = default; \ \ virtual bool ConvertValue(const wxAnyValueBuffer& src, \ wxAnyValueType* dstType, \ @@ -626,7 +626,7 @@ class WXDLLIMPEXP_BASE wxAnyValueTypeImplVariantData : public: wxAnyValueTypeImplVariantData() : wxAnyValueTypeImplBase() { } - virtual ~wxAnyValueTypeImplVariantData() { } + virtual ~wxAnyValueTypeImplVariantData() = default; virtual void DeleteValue(wxAnyValueBuffer& buf) const override { @@ -673,7 +673,7 @@ class wxAnyValueTypeImpl : { public: wxAnyValueTypeImpl() : wxAnyValueTypeImplVariantData() { } - virtual ~wxAnyValueTypeImpl() { } + virtual ~wxAnyValueTypeImpl() = default; }; #endif // wxUSE_VARIANT diff --git a/include/wx/anybutton.h b/include/wx/anybutton.h index 8fa4cd19f2..a83a90a4ae 100644 --- a/include/wx/anybutton.h +++ b/include/wx/anybutton.h @@ -51,7 +51,7 @@ class WXDLLIMPEXP_CORE wxAnyButtonBase : public wxControl { public: - wxAnyButtonBase() { } + wxAnyButtonBase() = default; // show the image in the button in addition to the label: this method is // supported on all (major) platforms diff --git a/include/wx/appprogress.h b/include/wx/appprogress.h index 4932d3952d..7e5db7cabd 100644 --- a/include/wx/appprogress.h +++ b/include/wx/appprogress.h @@ -15,8 +15,8 @@ class WXDLLIMPEXP_CORE wxAppProgressIndicatorBase { public: - wxAppProgressIndicatorBase() {} - virtual ~wxAppProgressIndicatorBase() {} + wxAppProgressIndicatorBase() = default; + virtual ~wxAppProgressIndicatorBase() = default; virtual bool IsAvailable() const = 0; diff --git a/include/wx/apptrait.h b/include/wx/apptrait.h index 1450cb1a84..5df1b4c8d5 100644 --- a/include/wx/apptrait.h +++ b/include/wx/apptrait.h @@ -39,7 +39,7 @@ class WXDLLIMPEXP_BASE wxAppTraitsBase { public: // needed since this class declares virtual members - virtual ~wxAppTraitsBase() { } + virtual ~wxAppTraitsBase() = default; // hooks for working with the global objects, may be overridden by the user // ------------------------------------------------------------------------ diff --git a/include/wx/archive.h b/include/wx/archive.h index 799de98d02..aa454efc52 100644 --- a/include/wx/archive.h +++ b/include/wx/archive.h @@ -23,7 +23,7 @@ class WXDLLIMPEXP_BASE wxArchiveNotifier { public: - virtual ~wxArchiveNotifier() { } + virtual ~wxArchiveNotifier() = default; virtual void OnEntryUpdated(class wxArchiveEntry& entry) = 0; }; @@ -37,7 +37,7 @@ public: class WXDLLIMPEXP_BASE wxArchiveEntry : public wxObject { public: - virtual ~wxArchiveEntry() { } + virtual ~wxArchiveEntry() = default; virtual wxDateTime GetDateTime() const = 0; virtual wxFileOffset GetSize() const = 0; @@ -92,7 +92,7 @@ class WXDLLIMPEXP_BASE wxArchiveInputStream : public wxFilterInputStream public: typedef wxArchiveEntry entry_type; - virtual ~wxArchiveInputStream() { } + virtual ~wxArchiveInputStream() = default; virtual bool OpenEntry(wxArchiveEntry& entry) = 0; virtual bool CloseEntry() = 0; @@ -129,7 +129,7 @@ private: class WXDLLIMPEXP_BASE wxArchiveOutputStream : public wxFilterOutputStream { public: - virtual ~wxArchiveOutputStream() { } + virtual ~wxArchiveOutputStream() = default; virtual bool PutNextEntry(wxArchiveEntry *entry) = 0; @@ -314,7 +314,7 @@ public: typedef wxArchiveIter iter_type; typedef wxArchivePairIter pairiter_type; - virtual ~wxArchiveClassFactory() { } + virtual ~wxArchiveClassFactory() = default; wxArchiveEntry *NewEntry() const { return DoNewEntry(); } diff --git a/include/wx/arrstr.h b/include/wx/arrstr.h index 9de6c130ae..b3dea15437 100644 --- a/include/wx/arrstr.h +++ b/include/wx/arrstr.h @@ -72,7 +72,7 @@ public: typedef int (wxCMPFUNC_CONV *CompareFunction)(const wxString& first, const wxString& second); - wxArrayString() { } + wxArrayString() = default; wxArrayString(size_t sz, const char** a); wxArrayString(size_t sz, const wchar_t** a); wxArrayString(size_t sz, const wxString* a); diff --git a/include/wx/atomic.h b/include/wx/atomic.h index 5112623515..bb55fe9346 100644 --- a/include/wx/atomic.h +++ b/include/wx/atomic.h @@ -108,7 +108,7 @@ inline wxUint32 wxAtomicDec (wxUint32 &value) { return --value; } class wxAtomicInt32 { public: - wxAtomicInt32() { } // non initialized for consistency with basic int type + wxAtomicInt32() = default; // non initialized for consistency with basic int type wxAtomicInt32(wxInt32 v) : m_value(v) { } wxAtomicInt32(const wxAtomicInt32& a) : m_value(a.m_value) {} diff --git a/include/wx/aui/auibar.h b/include/wx/aui/auibar.h index d00138707b..937f6e5107 100644 --- a/include/wx/aui/auibar.h +++ b/include/wx/aui/auibar.h @@ -264,8 +264,8 @@ class WXDLLIMPEXP_AUI wxAuiToolBarArt { public: - wxAuiToolBarArt() { } - virtual ~wxAuiToolBarArt() { } + wxAuiToolBarArt() = default; + virtual ~wxAuiToolBarArt() = default; virtual wxAuiToolBarArt* Clone() = 0; virtual void SetFlags(unsigned int flags) = 0; diff --git a/include/wx/aui/dockart.h b/include/wx/aui/dockart.h index 42af577ea3..727d33cd55 100644 --- a/include/wx/aui/dockart.h +++ b/include/wx/aui/dockart.h @@ -31,8 +31,8 @@ class WXDLLIMPEXP_AUI wxAuiDockArt { public: - wxAuiDockArt() { } - virtual ~wxAuiDockArt() { } + wxAuiDockArt() = default; + virtual ~wxAuiDockArt() = default; virtual wxAuiDockArt* Clone() = 0; virtual int GetMetric(int id) = 0; diff --git a/include/wx/aui/framemanager.h b/include/wx/aui/framemanager.h index bd23544503..da9dff9609 100644 --- a/include/wx/aui/framemanager.h +++ b/include/wx/aui/framemanager.h @@ -160,7 +160,7 @@ public: DefaultPane(); } - ~wxAuiPaneInfo() {} + ~wxAuiPaneInfo() = default; // Write the safe parts of a newly loaded PaneInfo structure "source" into "this" // used on loading perspectives etc. diff --git a/include/wx/aui/tabart.h b/include/wx/aui/tabart.h index 068b97200a..1594ad442e 100644 --- a/include/wx/aui/tabart.h +++ b/include/wx/aui/tabart.h @@ -40,8 +40,8 @@ class WXDLLIMPEXP_AUI wxAuiTabArt { public: - wxAuiTabArt() { } - virtual ~wxAuiTabArt() { } + wxAuiTabArt() = default; + virtual ~wxAuiTabArt() = default; virtual wxAuiTabArt* Clone() = 0; virtual void SetFlags(unsigned int flags) = 0; diff --git a/include/wx/bitmap.h b/include/wx/bitmap.h index a3cad21753..3a9f63aa1f 100644 --- a/include/wx/bitmap.h +++ b/include/wx/bitmap.h @@ -117,7 +117,7 @@ class WXDLLIMPEXP_CORE wxBitmapHandler : public wxObject { public: wxBitmapHandler() { m_type = wxBITMAP_TYPE_INVALID; } - virtual ~wxBitmapHandler() { } + virtual ~wxBitmapHandler() = default; // NOTE: the following functions should be pure virtuals, but they aren't // because otherwise almost all ports would have to implement diff --git a/include/wx/bmpcbox.h b/include/wx/bmpcbox.h index 6bf441aa0e..3901810edf 100644 --- a/include/wx/bmpcbox.h +++ b/include/wx/bmpcbox.h @@ -39,7 +39,7 @@ public: // ctors and such wxBitmapComboBoxBase() { Init(); } - virtual ~wxBitmapComboBoxBase() { } + virtual ~wxBitmapComboBoxBase() = default; // Sets the image for the given item. virtual void SetItemBitmap(unsigned int n, const wxBitmapBundle& bitmap) = 0; diff --git a/include/wx/brush.h b/include/wx/brush.h index ca8058a607..13cff58950 100644 --- a/include/wx/brush.h +++ b/include/wx/brush.h @@ -40,7 +40,7 @@ enum wxBrushStyle class WXDLLIMPEXP_CORE wxBrushBase: public wxGDIObject { public: - virtual ~wxBrushBase() { } + virtual ~wxBrushBase() = default; virtual void SetColour(const wxColour& col) = 0; virtual void SetColour(unsigned char r, unsigned char g, unsigned char b) = 0; diff --git a/include/wx/button.h b/include/wx/button.h index e2a87e638e..90f5f58708 100644 --- a/include/wx/button.h +++ b/include/wx/button.h @@ -25,7 +25,7 @@ extern WXDLLIMPEXP_DATA_CORE(const char) wxButtonNameStr[]; class WXDLLIMPEXP_CORE wxButtonBase : public wxAnyButton { public: - wxButtonBase() { } + wxButtonBase() = default; // show the authentication needed symbol on the button: this is currently // only implemented in wxMSW where it shows the UAC shield symbol diff --git a/include/wx/caret.h b/include/wx/caret.h index a69d1e034e..a006ec2b13 100644 --- a/include/wx/caret.h +++ b/include/wx/caret.h @@ -56,7 +56,7 @@ public: } // a virtual dtor has been provided since this class has virtual members - virtual ~wxCaretBase() { } + virtual ~wxCaretBase() = default; // Create() functions - same as ctor but returns the success code // -------------------------------------------------------------- diff --git a/include/wx/catch_cppunit.h b/include/wx/catch_cppunit.h index b58a7b5e7a..8d0f15049a 100644 --- a/include/wx/catch_cppunit.h +++ b/include/wx/catch_cppunit.h @@ -126,7 +126,7 @@ public: // not used here. explicit Test(const std::string& name = std::string()) : m_name(name) { } - virtual ~Test() { } + virtual ~Test() = default; virtual void runTest() = 0; diff --git a/include/wx/checkbox.h b/include/wx/checkbox.h index 24494950bf..dd892454ce 100644 --- a/include/wx/checkbox.h +++ b/include/wx/checkbox.h @@ -48,7 +48,7 @@ extern WXDLLIMPEXP_DATA_CORE(const char) wxCheckBoxNameStr[]; class WXDLLIMPEXP_CORE wxCheckBoxBase : public wxControl { public: - wxCheckBoxBase() { } + wxCheckBoxBase() = default; // set/get the checked status of the listbox virtual void SetValue(bool value) = 0; diff --git a/include/wx/checklst.h b/include/wx/checklst.h index 37a4da7556..2151dac41c 100644 --- a/include/wx/checklst.h +++ b/include/wx/checklst.h @@ -23,7 +23,7 @@ class WXDLLIMPEXP_CORE wxCheckListBoxBase : public wxListBox { public: - wxCheckListBoxBase() { } + wxCheckListBoxBase() = default; // check list box specific methods virtual bool IsChecked(unsigned int item) const = 0; diff --git a/include/wx/choice.h b/include/wx/choice.h index 99a53bcbe6..3e3807c68c 100644 --- a/include/wx/choice.h +++ b/include/wx/choice.h @@ -33,7 +33,7 @@ extern WXDLLIMPEXP_DATA_CORE(const char) wxChoiceNameStr[]; class WXDLLIMPEXP_CORE wxChoiceBase : public wxControlWithItems { public: - wxChoiceBase() { } + wxChoiceBase() = default; virtual ~wxChoiceBase(); // all generic methods are in wxControlWithItems diff --git a/include/wx/choicebk.h b/include/wx/choicebk.h index 7425433433..5604702c03 100644 --- a/include/wx/choicebk.h +++ b/include/wx/choicebk.h @@ -38,7 +38,7 @@ wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_CHOICEBOOK_PAGE_CHANGING, wxBo class WXDLLIMPEXP_CORE wxChoicebook : public wxCompositeBookCtrlBase { public: - wxChoicebook() { } + wxChoicebook() = default; wxChoicebook(wxWindow *parent, wxWindowID id, diff --git a/include/wx/clntdata.h b/include/wx/clntdata.h index 10f5ac9d04..27950fb68c 100644 --- a/include/wx/clntdata.h +++ b/include/wx/clntdata.h @@ -24,7 +24,7 @@ using wxShadowObjectFields = std::unordered_map; class WXDLLIMPEXP_BASE wxShadowObject { public: - wxShadowObject() { } + wxShadowObject() = default; void AddMethod( const wxString &name, wxShadowObjectMethod method ) { @@ -91,8 +91,8 @@ enum wxClientDataType class WXDLLIMPEXP_BASE wxClientData { public: - wxClientData() { } - virtual ~wxClientData() { } + wxClientData() = default; + virtual ~wxClientData() = default; }; class WXDLLIMPEXP_BASE wxStringClientData : public wxClientData diff --git a/include/wx/clrpicker.h b/include/wx/clrpicker.h index 3b609d04e9..ff96a55253 100644 --- a/include/wx/clrpicker.h +++ b/include/wx/clrpicker.h @@ -40,7 +40,7 @@ class WXDLLIMPEXP_CORE wxColourPickerWidgetBase { public: wxColourPickerWidgetBase() : m_colour(*wxBLACK) { } - virtual ~wxColourPickerWidgetBase() {} + virtual ~wxColourPickerWidgetBase() = default; wxColour GetColour() const { return m_colour; } @@ -99,8 +99,8 @@ protected: class WXDLLIMPEXP_CORE wxColourPickerCtrl : public wxPickerBase { public: - wxColourPickerCtrl() {} - virtual ~wxColourPickerCtrl() {} + wxColourPickerCtrl() = default; + virtual ~wxColourPickerCtrl() = default; wxColourPickerCtrl(wxWindow *parent, wxWindowID id, @@ -164,7 +164,7 @@ wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COLOURPICKER_DIALOG_CANCELLED, class WXDLLIMPEXP_CORE wxColourPickerEvent : public wxCommandEvent { public: - wxColourPickerEvent() {} + wxColourPickerEvent() = default; wxColourPickerEvent(wxObject *generator, int id, const wxColour &col, wxEventType commandType = wxEVT_COLOURPICKER_CHANGED) : wxCommandEvent(commandType, id), m_colour(col) diff --git a/include/wx/cmdline.h b/include/wx/cmdline.h index 6c11631d6e..7946bcf843 100644 --- a/include/wx/cmdline.h +++ b/include/wx/cmdline.h @@ -101,7 +101,7 @@ struct wxCmdLineEntryDesc class WXDLLIMPEXP_BASE wxCmdLineArg { public: - virtual ~wxCmdLineArg() {} + virtual ~wxCmdLineArg() = default; virtual double GetDoubleVal() const = 0; virtual long GetLongVal() const = 0; diff --git a/include/wx/cmdproc.h b/include/wx/cmdproc.h index 992d3b9336..07d5315b79 100644 --- a/include/wx/cmdproc.h +++ b/include/wx/cmdproc.h @@ -24,7 +24,7 @@ class WXDLLIMPEXP_CORE wxCommand : public wxObject { public: wxCommand(bool canUndoIt = false, const wxString& name = wxEmptyString); - virtual ~wxCommand(){} + virtual ~wxCommand() = default; // Override this to perform a command virtual bool Do() = 0; diff --git a/include/wx/collheaderctrl.h b/include/wx/collheaderctrl.h index 546b7aa662..e79fbfd550 100644 --- a/include/wx/collheaderctrl.h +++ b/include/wx/collheaderctrl.h @@ -26,7 +26,7 @@ extern WXDLLIMPEXP_DATA_CORE(const char) wxCollapsibleHeaderCtrlNameStr[]; class WXDLLIMPEXP_CORE wxCollapsibleHeaderCtrlBase : public wxControl { public: - wxCollapsibleHeaderCtrlBase() { } + wxCollapsibleHeaderCtrlBase() = default; wxCollapsibleHeaderCtrlBase(wxWindow *parent, wxWindowID id, @@ -82,7 +82,7 @@ class WXDLLIMPEXP_CORE wxCollapsibleHeaderCtrl : public wxGenericCollapsibleHeaderCtrl { public: - wxCollapsibleHeaderCtrl() { } + wxCollapsibleHeaderCtrl() = default; wxCollapsibleHeaderCtrl(wxWindow *parent, wxWindowID id, diff --git a/include/wx/collpane.h b/include/wx/collpane.h index 274d856701..eefc0d2bf6 100644 --- a/include/wx/collpane.h +++ b/include/wx/collpane.h @@ -30,7 +30,7 @@ extern WXDLLIMPEXP_DATA_CORE(const char) wxCollapsiblePaneNameStr[]; class WXDLLIMPEXP_CORE wxCollapsiblePaneBase : public wxControl { public: - wxCollapsiblePaneBase() {} + wxCollapsiblePaneBase() = default; virtual void Collapse(bool collapse = true) = 0; void Expand() { Collapse(false); } @@ -73,7 +73,7 @@ wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COLLAPSIBLEPANE_CHANGED, wxCol class WXDLLIMPEXP_CORE wxCollapsiblePaneEvent : public wxCommandEvent { public: - wxCollapsiblePaneEvent() {} + wxCollapsiblePaneEvent() = default; wxCollapsiblePaneEvent(wxObject *generator, int id, bool collapsed) : wxCommandEvent(wxEVT_COLLAPSIBLEPANE_CHANGED, id), m_bCollapsed(collapsed) diff --git a/include/wx/colour.h b/include/wx/colour.h index 1fe6e56773..344ecc9741 100644 --- a/include/wx/colour.h +++ b/include/wx/colour.h @@ -88,8 +88,8 @@ public: // type of a single colour component typedef unsigned char ChannelType; - wxColourBase() {} - virtual ~wxColourBase() {} + wxColourBase() = default; + virtual ~wxColourBase() = default; // Set() functions diff --git a/include/wx/containr.h b/include/wx/containr.h index 01fefffd94..6e06bccac4 100644 --- a/include/wx/containr.h +++ b/include/wx/containr.h @@ -46,7 +46,7 @@ public: m_inSetFocus = false; m_winLastFocused = nullptr; } - virtual ~wxControlContainerBase() {} + virtual ~wxControlContainerBase() = default; void SetContainerWindow(wxWindow *winParent) { diff --git a/include/wx/control.h b/include/wx/control.h index 593bd6b096..1466098ea7 100644 --- a/include/wx/control.h +++ b/include/wx/control.h @@ -31,7 +31,7 @@ extern WXDLLIMPEXP_DATA_CORE(const char) wxControlNameStr[]; class WXDLLIMPEXP_CORE wxControlBase : public wxWindow { public: - wxControlBase() { } + wxControlBase() = default; virtual ~wxControlBase(); diff --git a/include/wx/cshelp.h b/include/wx/cshelp.h index 3078068a52..689d3871c6 100644 --- a/include/wx/cshelp.h +++ b/include/wx/cshelp.h @@ -67,7 +67,7 @@ private: class WXDLLIMPEXP_CORE wxContextHelpButton : public wxBitmapButton { public: - wxContextHelpButton() {} + wxContextHelpButton() = default; wxContextHelpButton(wxWindow* parent, wxWindowID id = wxID_CONTEXT_HELP, diff --git a/include/wx/ctrlsub.h b/include/wx/ctrlsub.h index 6aab02333b..171d0d1984 100644 --- a/include/wx/ctrlsub.h +++ b/include/wx/ctrlsub.h @@ -33,7 +33,7 @@ class WXDLLIMPEXP_CORE wxItemContainerImmutable { public: - wxItemContainerImmutable() { } + wxItemContainerImmutable() = default; virtual ~wxItemContainerImmutable(); // accessing strings @@ -415,7 +415,7 @@ public: typedef W BaseWindowClass; typedef C BaseContainerInterface; - wxWindowWithItems() { } + wxWindowWithItems() = default; void SetClientData(void *data) { BaseWindowClass::SetClientData(data); } @@ -440,7 +440,7 @@ class WXDLLIMPEXP_CORE wxControlWithItemsBase : public wxWindowWithItems { public: - wxControlWithItemsBase() { } + wxControlWithItemsBase() = default; // usually the controls like list/combo boxes have their own background // colour @@ -472,7 +472,7 @@ private: class WXDLLIMPEXP_CORE wxControlWithItems : public wxControlWithItemsBase { public: - wxControlWithItems() { } + wxControlWithItems() = default; private: wxDECLARE_ABSTRACT_CLASS(wxControlWithItems); diff --git a/include/wx/custombgwin.h b/include/wx/custombgwin.h index 329589c7f2..05a19c613e 100644 --- a/include/wx/custombgwin.h +++ b/include/wx/custombgwin.h @@ -23,10 +23,10 @@ class wxCustomBackgroundWindowBase { public: // Trivial default ctor. - wxCustomBackgroundWindowBase() { } + wxCustomBackgroundWindowBase() = default; // Also a trivial but virtual -- to suppress g++ warnings -- dtor. - virtual ~wxCustomBackgroundWindowBase() { } + virtual ~wxCustomBackgroundWindowBase() = default; // Use the given bitmap to tile the background of this window. This bitmap // will show through any transparent children. diff --git a/include/wx/dataview.h b/include/wx/dataview.h index 5bfaf327f0..a6dea8b966 100644 --- a/include/wx/dataview.h +++ b/include/wx/dataview.h @@ -1402,7 +1402,7 @@ class WXDLLIMPEXP_CORE wxDataViewTreeCtrl: public wxDataViewCtrl, public wxWithImages { public: - wxDataViewTreeCtrl() { } + wxDataViewTreeCtrl() = default; wxDataViewTreeCtrl(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, diff --git a/include/wx/datectrl.h b/include/wx/datectrl.h index 37980e2b09..505ff78572 100644 --- a/include/wx/datectrl.h +++ b/include/wx/datectrl.h @@ -99,7 +99,7 @@ typedef wxDatePickerCtrlCommonBase wxDatePickerCtrlBase; class WXDLLIMPEXP_ADV wxDatePickerCtrl : public wxDatePickerCtrlGeneric { public: - wxDatePickerCtrl() { } + wxDatePickerCtrl() = default; wxDatePickerCtrl(wxWindow *parent, wxWindowID id, const wxDateTime& date = wxDefaultDateTime, diff --git a/include/wx/dateevt.h b/include/wx/dateevt.h index f959fcd01d..f3565420e6 100644 --- a/include/wx/dateevt.h +++ b/include/wx/dateevt.h @@ -21,7 +21,7 @@ class WXDLLIMPEXP_ADV wxDateEvent : public wxCommandEvent { public: - wxDateEvent() { } + wxDateEvent() = default; wxDateEvent(wxWindow *win, const wxDateTime& dt, wxEventType type) : wxCommandEvent(type, win->GetId()), m_date(dt) diff --git a/include/wx/datetime.h b/include/wx/datetime.h index 85fb6ce547..1dba298b12 100644 --- a/include/wx/datetime.h +++ b/include/wx/datetime.h @@ -1226,7 +1226,7 @@ public: static wxTimeSpan Week() { return Weeks(1); } // default ctor constructs the 0 time span - wxTimeSpan() { } + wxTimeSpan() = default; // from separate values for each component, date set to 0 (hours are // not restricted to 0..24 range, neither are minutes, seconds or diff --git a/include/wx/dc.h b/include/wx/dc.h index 29c29ae708..26402a5859 100644 --- a/include/wx/dc.h +++ b/include/wx/dc.h @@ -114,8 +114,8 @@ class WXDLLIMPEXP_FWD_CORE wxDCImpl; class WXDLLIMPEXP_CORE wxDCFactory { public: - wxDCFactory() {} - virtual ~wxDCFactory() {} + wxDCFactory() = default; + virtual ~wxDCFactory() = default; virtual wxDCImpl* CreateWindowDC( wxWindowDC *owner, wxWindow *window ) = 0; virtual wxDCImpl* CreateClientDC( wxClientDC *owner, wxWindow *window ) = 0; @@ -142,7 +142,7 @@ private: class WXDLLIMPEXP_CORE wxNativeDCFactory: public wxDCFactory { public: - wxNativeDCFactory() {} + wxNativeDCFactory() = default; virtual wxDCImpl* CreateWindowDC( wxWindowDC *owner, wxWindow *window ) override; virtual wxDCImpl* CreateClientDC( wxClientDC *owner, wxWindow *window ) override; diff --git a/include/wx/dcbuffer.h b/include/wx/dcbuffer.h index b6cb5260f8..b47045bca1 100644 --- a/include/wx/dcbuffer.h +++ b/include/wx/dcbuffer.h @@ -225,7 +225,7 @@ public: ); } - virtual ~wxAutoBufferedPaintDC() { } + virtual ~wxAutoBufferedPaintDC() = default; private: wxDECLARE_NO_COPY_CLASS(wxAutoBufferedPaintDC); diff --git a/include/wx/dcsvg.h b/include/wx/dcsvg.h index 0bf184b5e7..6fc9a22ba4 100644 --- a/include/wx/dcsvg.h +++ b/include/wx/dcsvg.h @@ -46,7 +46,7 @@ public: wxCoord x, wxCoord y, wxOutputStream& stream) const = 0; - virtual ~wxSVGBitmapHandler() {} + virtual ~wxSVGBitmapHandler() = default; }; // Predefined standard bitmap handler: creates a file, stores the bitmap in diff --git a/include/wx/debugrpt.h b/include/wx/debugrpt.h index e7819cbcb2..0e6f74320e 100644 --- a/include/wx/debugrpt.h +++ b/include/wx/debugrpt.h @@ -137,7 +137,7 @@ private: class WXDLLIMPEXP_QA wxDebugReportCompress : public wxDebugReport { public: - wxDebugReportCompress() { } + wxDebugReportCompress() = default; // you can optionally specify the directory and/or name of the file where // the debug report should be generated, a default location under the @@ -222,7 +222,7 @@ class WXDLLIMPEXP_QA wxDebugReportPreview { public: // ctor is trivial - wxDebugReportPreview() { } + wxDebugReportPreview() = default; // present the report to the user and allow him to modify it by removing // some or all of the files and, potentially, adding some notes @@ -232,7 +232,7 @@ public: virtual bool Show(wxDebugReport& dbgrpt) const = 0; // dtor is trivial as well but should be virtual for a base class - virtual ~wxDebugReportPreview() { } + virtual ~wxDebugReportPreview() = default; }; #if wxUSE_GUI @@ -244,7 +244,7 @@ public: class WXDLLIMPEXP_QA wxDebugReportPreviewStd : public wxDebugReportPreview { public: - wxDebugReportPreviewStd() { } + wxDebugReportPreviewStd() = default; virtual bool Show(wxDebugReport& dbgrpt) const override; }; diff --git a/include/wx/dfb/bitmap.h b/include/wx/dfb/bitmap.h index 523ac36209..518f02852b 100644 --- a/include/wx/dfb/bitmap.h +++ b/include/wx/dfb/bitmap.h @@ -23,7 +23,7 @@ wxDFB_DECLARE_INTERFACE(IDirectFBSurface); class WXDLLIMPEXP_CORE wxBitmap : public wxBitmapBase { public: - wxBitmap() {} + wxBitmap() = default; wxBitmap(const wxIDirectFBSurfacePtr& surface) { Create(surface); } wxBitmap(int width, int height, int depth = -1) { Create(width, height, depth); } wxBitmap(const wxSize& sz, int depth = -1) { Create(sz, depth); } diff --git a/include/wx/dfb/brush.h b/include/wx/dfb/brush.h index 278f64e0b8..1ce1c82044 100644 --- a/include/wx/dfb/brush.h +++ b/include/wx/dfb/brush.h @@ -30,7 +30,7 @@ class WXDLLIMPEXP_FWD_CORE wxBrush; class WXDLLIMPEXP_CORE wxBrush : public wxBrushBase { public: - wxBrush() {} + wxBrush() = default; wxBrush(const wxColour &colour, wxBrushStyle style = wxBRUSHSTYLE_SOLID); wxBrush(const wxBitmap &stippleBitmap); diff --git a/include/wx/dfb/cursor.h b/include/wx/dfb/cursor.h index 8ebae8ec12..f656ca5acb 100644 --- a/include/wx/dfb/cursor.h +++ b/include/wx/dfb/cursor.h @@ -20,7 +20,7 @@ class WXDLLIMPEXP_FWD_CORE wxImage; class WXDLLIMPEXP_CORE wxCursor : public wxCursorBase { public: - wxCursor() {} + wxCursor() = default; wxCursor(wxStockCursor id) { InitFromStock(id); } #if wxUSE_IMAGE wxCursor(const wxImage& image); diff --git a/include/wx/dfb/font.h b/include/wx/dfb/font.h index 14d91b5243..815d4167ed 100644 --- a/include/wx/dfb/font.h +++ b/include/wx/dfb/font.h @@ -21,7 +21,7 @@ wxDFB_DECLARE_INTERFACE(IDirectFBFont); class WXDLLIMPEXP_CORE wxFont : public wxFontBase { public: - wxFont() {} + wxFont() = default; wxFont(const wxFontInfo& info) { diff --git a/include/wx/dfb/pen.h b/include/wx/dfb/pen.h index 24b03a9404..6ac8b19f96 100644 --- a/include/wx/dfb/pen.h +++ b/include/wx/dfb/pen.h @@ -30,7 +30,7 @@ class WXDLLIMPEXP_FWD_CORE wxPen; class WXDLLIMPEXP_CORE wxPen: public wxPenBase { public: - wxPen() {} + wxPen() = default; wxPen(const wxColour &colour, int width = 1, wxPenStyle style = wxPENSTYLE_SOLID); wxPen(const wxBitmap& stipple, int width); diff --git a/include/wx/dfb/popupwin.h b/include/wx/dfb/popupwin.h index 73c9dad909..e4ebbf4cf4 100644 --- a/include/wx/dfb/popupwin.h +++ b/include/wx/dfb/popupwin.h @@ -17,7 +17,7 @@ class WXDLLIMPEXP_CORE wxPopupWindow : public wxPopupWindowBase { public: - wxPopupWindow() {} + wxPopupWindow() = default; wxPopupWindow(wxWindow *parent, int flags = wxBORDER_NONE) { Create(parent, flags); } diff --git a/include/wx/dfb/region.h b/include/wx/dfb/region.h index e8b01c5074..1a4a389752 100644 --- a/include/wx/dfb/region.h +++ b/include/wx/dfb/region.h @@ -66,7 +66,7 @@ protected: class WXDLLIMPEXP_CORE wxRegionIterator : public wxObject { public: - wxRegionIterator() {} + wxRegionIterator() = default; wxRegionIterator(const wxRegion& region) { Reset(region); } void Reset() { m_rect = wxRect(); } diff --git a/include/wx/dfb/wrapdfb.h b/include/wx/dfb/wrapdfb.h index 1243f556bc..5d4092eb37 100644 --- a/include/wx/dfb/wrapdfb.h +++ b/include/wx/dfb/wrapdfb.h @@ -58,7 +58,7 @@ bool wxDfbCheckReturn(DFBResult code); #define WXDFB_DEFINE_EVENT_WRAPPER(T) \ struct wx##T \ { \ - wx##T() {} \ + wx##T() = default; \ wx##T(const T& event) : m_event(event) {} \ \ operator T&() { return m_event; } \ @@ -103,7 +103,7 @@ protected: wxDfbWrapperBase() : m_refCnt(1), m_lastResult(DFB_OK) {} /// Dtor may only be called from Release() - virtual ~wxDfbWrapperBase() {} + virtual ~wxDfbWrapperBase() = default; /** Checks the @a result of a DirectFB call and returns true if it was diff --git a/include/wx/dialog.h b/include/wx/dialog.h index 0395fce3be..cf640db6e9 100644 --- a/include/wx/dialog.h +++ b/include/wx/dialog.h @@ -64,7 +64,7 @@ class WXDLLIMPEXP_CORE wxDialogBase : public wxNavigationEnabled thisClass; @@ -517,7 +517,7 @@ private: void (*m_handler)(EventArg&); // Provide a dummy default ctor for type info purposes - wxEventFunctorFunction() { } + wxEventFunctorFunction() = default; typedef wxEventFunctorFunction thisClass; WX_DECLARE_TYPEINFO_INLINE(thisClass) @@ -569,7 +569,7 @@ private: const void *m_handlerAddr; // Provide a dummy default ctor for type info purposes - wxEventFunctorFunctor() { } + wxEventFunctorFunctor() = default; typedef wxEventFunctorFunctor thisClass; WX_DECLARE_TYPEINFO_INLINE(thisClass) diff --git a/include/wx/evtloopsrc.h b/include/wx/evtloopsrc.h index 1a12a1437b..a49b4be2ec 100644 --- a/include/wx/evtloopsrc.h +++ b/include/wx/evtloopsrc.h @@ -39,7 +39,7 @@ public: virtual void OnExceptionWaiting() = 0; // virtual dtor for the base class - virtual ~wxEventLoopSourceHandler() { } + virtual ~wxEventLoopSourceHandler() = default; }; // flags describing which kind of IO events we're interested in diff --git a/include/wx/ffile.h b/include/wx/ffile.h index f1cbca1dbc..af3b34a77e 100644 --- a/include/wx/ffile.h +++ b/include/wx/ffile.h @@ -115,7 +115,7 @@ class WXDLLIMPEXP_BASE wxTempFFile public: // ctors // default - wxTempFFile() { } + wxTempFFile() = default; // associates the temp file with the file to be replaced and opens it explicit wxTempFFile(const wxString& strName); diff --git a/include/wx/file.h b/include/wx/file.h index 1d44510700..acebae2cb3 100644 --- a/include/wx/file.h +++ b/include/wx/file.h @@ -144,7 +144,7 @@ class WXDLLIMPEXP_BASE wxTempFile public: // ctors // default - wxTempFile() { } + wxTempFile() = default; // associates the temp file with the file to be replaced and opens it explicit wxTempFile(const wxString& strName); diff --git a/include/wx/filectrl.h b/include/wx/filectrl.h index 628c833c00..5f14e1858c 100644 --- a/include/wx/filectrl.h +++ b/include/wx/filectrl.h @@ -32,7 +32,7 @@ extern WXDLLIMPEXP_DATA_CORE(const char) wxFileCtrlNameStr[]; // in filectrlcmn. class WXDLLIMPEXP_CORE wxFileCtrlBase { public: - virtual ~wxFileCtrlBase() {} + virtual ~wxFileCtrlBase() = default; virtual void SetWildcard( const wxString& wildCard ) = 0; virtual void SetFilterIndex( int filterindex ) = 0; @@ -89,7 +89,7 @@ void wxGenerateFileActivatedEvent( wxFileCtrlBase *fileCtrl, wxWindow *wnd, cons class WXDLLIMPEXP_CORE wxFileCtrlEvent : public wxCommandEvent { public: - wxFileCtrlEvent() {} + wxFileCtrlEvent() = default; wxFileCtrlEvent( wxEventType type, wxObject *evtObject, int id ) : wxCommandEvent( type, id ) { diff --git a/include/wx/filedlg.h b/include/wx/filedlg.h index f5c18b954f..2fbf12338d 100644 --- a/include/wx/filedlg.h +++ b/include/wx/filedlg.h @@ -89,7 +89,7 @@ public: Create(parent, message, defaultDir, defaultFile, wildCard, style, pos, sz, name); } - virtual ~wxFileDialogBase() {} + virtual ~wxFileDialogBase() = default; bool Create(wxWindow *parent, diff --git a/include/wx/filefn.h b/include/wx/filefn.h index 7894ecf4c6..6279cf6215 100644 --- a/include/wx/filefn.h +++ b/include/wx/filefn.h @@ -583,7 +583,7 @@ private: class WXDLLIMPEXP_BASE wxPathList : public wxArrayString { public: - wxPathList() {} + wxPathList() = default; wxPathList(const wxArrayString &arr) { Add(arr); } diff --git a/include/wx/filepicker.h b/include/wx/filepicker.h index a96245f613..f4b68ab609 100644 --- a/include/wx/filepicker.h +++ b/include/wx/filepicker.h @@ -37,7 +37,7 @@ extern WXDLLIMPEXP_DATA_CORE(const char) wxDirSelectorPromptStr[]; class WXDLLIMPEXP_CORE wxFileDirPickerEvent : public wxCommandEvent { public: - wxFileDirPickerEvent() {} + wxFileDirPickerEvent() = default; wxFileDirPickerEvent(wxEventType type, wxObject *generator, int id, const wxString &path) : wxCommandEvent(type, id), m_path(path) @@ -82,8 +82,8 @@ typedef void (wxEvtHandler::*wxFileDirPickerEventFunction)(wxFileDirPickerEvent& class WXDLLIMPEXP_CORE wxFileDirPickerWidgetBase { public: - wxFileDirPickerWidgetBase() { } - virtual ~wxFileDirPickerWidgetBase() { } + wxFileDirPickerWidgetBase() = default; + virtual ~wxFileDirPickerWidgetBase() = default; // Path here is the name of the selected file or directory. wxString GetPath() const { return m_path; } @@ -232,7 +232,7 @@ protected: class WXDLLIMPEXP_CORE wxFilePickerCtrl : public wxFileDirPickerCtrlBase { public: - wxFilePickerCtrl() {} + wxFilePickerCtrl() = default; wxFilePickerCtrl(wxWindow *parent, wxWindowID id, @@ -337,7 +337,7 @@ private: class WXDLLIMPEXP_CORE wxDirPickerCtrl : public wxFileDirPickerCtrlBase { public: - wxDirPickerCtrl() {} + wxDirPickerCtrl() = default; wxDirPickerCtrl(wxWindow *parent, wxWindowID id, const wxString& path = wxEmptyString, diff --git a/include/wx/fontdlg.h b/include/wx/fontdlg.h index cb6a1ce528..101c18357f 100644 --- a/include/wx/fontdlg.h +++ b/include/wx/fontdlg.h @@ -25,7 +25,7 @@ class WXDLLIMPEXP_CORE wxFontDialogBase : public wxDialog { public: // create the font dialog - wxFontDialogBase() { } + wxFontDialogBase() = default; wxFontDialogBase(wxWindow *parent) { m_parent = parent; } wxFontDialogBase(wxWindow *parent, const wxFontData& data) { m_parent = parent; InitFontData(&data); } diff --git a/include/wx/fontenum.h b/include/wx/fontenum.h index fcdb31f9c1..a55e467cb8 100644 --- a/include/wx/fontenum.h +++ b/include/wx/fontenum.h @@ -27,10 +27,10 @@ class WXDLLIMPEXP_CORE wxFontEnumerator { public: - wxFontEnumerator() {} + wxFontEnumerator() = default; // virtual dtor for the base class - virtual ~wxFontEnumerator() {} + virtual ~wxFontEnumerator() = default; // start enumerating font facenames (either all of them or those which // support the given encoding) - will result in OnFacename() being diff --git a/include/wx/fontpicker.h b/include/wx/fontpicker.h index 9ebc577af9..fe6d137b5e 100644 --- a/include/wx/fontpicker.h +++ b/include/wx/fontpicker.h @@ -33,7 +33,7 @@ class WXDLLIMPEXP_CORE wxFontPickerWidgetBase { public: wxFontPickerWidgetBase() : m_selectedFont(*wxNORMAL_FONT) { } - virtual ~wxFontPickerWidgetBase() {} + virtual ~wxFontPickerWidgetBase() = default; wxFont GetSelectedFont() const { return m_selectedFont; } @@ -106,7 +106,7 @@ public: { } - virtual ~wxFontPickerCtrl() {} + virtual ~wxFontPickerCtrl() = default; wxFontPickerCtrl(wxWindow *parent, @@ -200,7 +200,7 @@ wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_FONTPICKER_CHANGED, wxFontPick class WXDLLIMPEXP_CORE wxFontPickerEvent : public wxCommandEvent { public: - wxFontPickerEvent() {} + wxFontPickerEvent() = default; wxFontPickerEvent(wxObject *generator, int id, const wxFont &f) : wxCommandEvent(wxEVT_FONTPICKER_CHANGED, id), m_font(f) diff --git a/include/wx/fs_filter.h b/include/wx/fs_filter.h index 9efb8cdf14..cf2a725de4 100644 --- a/include/wx/fs_filter.h +++ b/include/wx/fs_filter.h @@ -23,7 +23,7 @@ class WXDLLIMPEXP_BASE wxFilterFSHandler : public wxFileSystemHandler { public: wxFilterFSHandler() : wxFileSystemHandler() { } - virtual ~wxFilterFSHandler() { } + virtual ~wxFilterFSHandler() = default; virtual bool CanOpen(const wxString& location) override; virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location) override; diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h index 0b118ecb83..30a54326c2 100644 --- a/include/wx/gdicmn.h +++ b/include/wx/gdicmn.h @@ -948,7 +948,7 @@ wxDEPRECATED_MSG("Use wxList directly or just a standard container") wxResourceCache : public wxList { public: - wxResourceCache() { } + wxResourceCache() = default; #if !wxUSE_STD_CONTAINERS wxResourceCache(unsigned int keyType) : wxList(keyType) { } #endif diff --git a/include/wx/gdiobj.h b/include/wx/gdiobj.h index 369c056919..b8a2b56369 100644 --- a/include/wx/gdiobj.h +++ b/include/wx/gdiobj.h @@ -23,7 +23,7 @@ class WXDLLIMPEXP_CORE wxGDIRefData : public wxObjectRefData public: // Default ctor which needs to be defined just because we use // wxDECLARE_NO_COPY_CLASS() below. - wxGDIRefData() { } + wxGDIRefData() = default; // override this in the derived classes to check if this data object is // really fully initialized diff --git a/include/wx/generic/choicdgg.h b/include/wx/generic/choicdgg.h index 26cad728cd..7c7cf629f6 100644 --- a/include/wx/generic/choicdgg.h +++ b/include/wx/generic/choicdgg.h @@ -163,7 +163,7 @@ private: class WXDLLIMPEXP_CORE wxMultiChoiceDialog : public wxAnyChoiceDialog { public: - wxMultiChoiceDialog() { } + wxMultiChoiceDialog() = default; wxMultiChoiceDialog(wxWindow *parent, const wxString& message, diff --git a/include/wx/generic/clrpickerg.h b/include/wx/generic/clrpickerg.h index 5b86d9111b..9dd1407cab 100644 --- a/include/wx/generic/clrpickerg.h +++ b/include/wx/generic/clrpickerg.h @@ -24,7 +24,7 @@ class WXDLLIMPEXP_CORE wxGenericColourButton : public wxBitmapButton, public wxColourPickerWidgetBase { public: - wxGenericColourButton() {} + wxGenericColourButton() = default; wxGenericColourButton(wxWindow *parent, wxWindowID id, const wxColour& col = *wxBLACK, @@ -37,7 +37,7 @@ public: Create(parent, id, col, pos, size, style, validator, name); } - virtual ~wxGenericColourButton() {} + virtual ~wxGenericColourButton() = default; public: // API extensions specific for wxGenericColourButton diff --git a/include/wx/generic/combo.h b/include/wx/generic/combo.h index bc0318a4fb..0f82658178 100644 --- a/include/wx/generic/combo.h +++ b/include/wx/generic/combo.h @@ -132,7 +132,7 @@ public: (void)Create(parent, id, value, pos, size, style, validator, name); } - virtual ~wxComboCtrl() {} + virtual ~wxComboCtrl() = default; protected: diff --git a/include/wx/generic/ctrlsub.h b/include/wx/generic/ctrlsub.h index 03951e44e9..05767d86ad 100644 --- a/include/wx/generic/ctrlsub.h +++ b/include/wx/generic/ctrlsub.h @@ -19,7 +19,7 @@ class wxControlWithItemsGeneric : public wxControlWithItemsBase { public: - wxControlWithItemsGeneric() { } + wxControlWithItemsGeneric() = default; virtual void DoInitItemClientData() { diff --git a/include/wx/generic/custombgwin.h b/include/wx/generic/custombgwin.h index aa7e6892ff..26f6a3fbf4 100644 --- a/include/wx/generic/custombgwin.h +++ b/include/wx/generic/custombgwin.h @@ -20,7 +20,7 @@ class wxCustomBackgroundWindowGenericBase : public wxCustomBackgroundWindowBase { public: - wxCustomBackgroundWindowGenericBase() { } + wxCustomBackgroundWindowGenericBase() = default; protected: void DoEraseBackground(wxEraseEvent& event, wxWindow* win) @@ -58,7 +58,7 @@ class wxCustomBackgroundWindow : public W, public: typedef W BaseWindowClass; - wxCustomBackgroundWindow() { } + wxCustomBackgroundWindow() = default; protected: virtual void DoSetBackgroundBitmap(const wxBitmap& bmp) override diff --git a/include/wx/generic/dataview.h b/include/wx/generic/dataview.h index 694b3a1a4e..b74d9ace2f 100644 --- a/include/wx/generic/dataview.h +++ b/include/wx/generic/dataview.h @@ -436,7 +436,7 @@ class WXDLLIMPEXP_CORE wxDataViewCtrlAccessible: public wxWindowAccessible { public: wxDataViewCtrlAccessible(wxDataViewCtrl* win); - virtual ~wxDataViewCtrlAccessible() {} + virtual ~wxDataViewCtrlAccessible() = default; virtual wxAccStatus HitTest(const wxPoint& pt, int* childId, wxAccessible** childObject) override; diff --git a/include/wx/generic/dirctrlg.h b/include/wx/generic/dirctrlg.h index 0d7a9f2211..10b41a0bb2 100644 --- a/include/wx/generic/dirctrlg.h +++ b/include/wx/generic/dirctrlg.h @@ -59,7 +59,7 @@ class WXDLLIMPEXP_CORE wxDirItemData : public wxTreeItemData { public: wxDirItemData(const wxString& path, const wxString& name, bool isDir); - virtual ~wxDirItemData(){} + virtual ~wxDirItemData() = default; void SetNewDirName(const wxString& path); bool HasSubDirs() const; @@ -245,7 +245,7 @@ public: void Init(); - virtual ~wxDirFilterListCtrl() {} + virtual ~wxDirFilterListCtrl() = default; //// Operations void FillFilterList(const wxString& filter, int defaultFilter); diff --git a/include/wx/generic/filectrlg.h b/include/wx/generic/filectrlg.h index 3d612493c6..209e5a4b20 100644 --- a/include/wx/generic/filectrlg.h +++ b/include/wx/generic/filectrlg.h @@ -205,7 +205,7 @@ public: style, pos, size, name ); } - virtual ~wxGenericFileCtrl() {} + virtual ~wxGenericFileCtrl() = default; bool Create( wxWindow *parent, wxWindowID id, diff --git a/include/wx/generic/filedlgg.h b/include/wx/generic/filedlgg.h index 82708d8c81..e1ba164bd9 100644 --- a/include/wx/generic/filedlgg.h +++ b/include/wx/generic/filedlgg.h @@ -139,7 +139,7 @@ private: class WXDLLIMPEXP_CORE wxFileDialog: public wxGenericFileDialog { public: - wxFileDialog() {} + wxFileDialog() = default; wxFileDialog(wxWindow *parent, const wxString& message = wxASCII_STR(wxFileSelectorPromptStr), diff --git a/include/wx/generic/filepickerg.h b/include/wx/generic/filepickerg.h index f65e79c696..40554c1c53 100644 --- a/include/wx/generic/filepickerg.h +++ b/include/wx/generic/filepickerg.h @@ -100,7 +100,7 @@ private: class WXDLLIMPEXP_CORE wxGenericFileButton : public wxGenericFileDirButton { public: - wxGenericFileButton() {} + wxGenericFileButton() = default; wxGenericFileButton(wxWindow *parent, wxWindowID id, const wxString& label = wxASCII_STR(wxFilePickerWidgetLabel), @@ -168,7 +168,7 @@ private: class WXDLLIMPEXP_CORE wxGenericDirButton : public wxGenericFileDirButton { public: - wxGenericDirButton() {} + wxGenericDirButton() = default; wxGenericDirButton(wxWindow *parent, wxWindowID id, const wxString& label = wxASCII_STR(wxDirPickerWidgetLabel), diff --git a/include/wx/generic/fontpickerg.h b/include/wx/generic/fontpickerg.h index 37e875c23c..9d9862b659 100644 --- a/include/wx/generic/fontpickerg.h +++ b/include/wx/generic/fontpickerg.h @@ -21,7 +21,7 @@ class WXDLLIMPEXP_CORE wxGenericFontButton : public wxButton, public wxFontPickerWidgetBase { public: - wxGenericFontButton() {} + wxGenericFontButton() = default; wxGenericFontButton(wxWindow *parent, wxWindowID id, const wxFont &initial = wxNullFont, @@ -40,7 +40,7 @@ public: virtual void SetSelectedColour(const wxColour &colour) override { m_data.SetColour(colour); UpdateFont(); } - virtual ~wxGenericFontButton() {} + virtual ~wxGenericFontButton() = default; public: // API extensions specific for wxGenericFontButton diff --git a/include/wx/generic/grid.h b/include/wx/generic/grid.h index 6d151a8710..72c625e590 100644 --- a/include/wx/generic/grid.h +++ b/include/wx/generic/grid.h @@ -140,7 +140,7 @@ class WXDLLIMPEXP_CORE wxGridCellWorker : public wxSharedClientDataContainer, public wxRefCounter { public: - wxGridCellWorker() { } + wxGridCellWorker() = default; wxGridCellWorker(const wxGridCellWorker& other); @@ -593,7 +593,7 @@ public: class WXDLLIMPEXP_CORE wxGridHeaderLabelsRenderer { public: - virtual ~wxGridHeaderLabelsRenderer() {} + virtual ~wxGridHeaderLabelsRenderer() = default; // Draw the border around cell window. virtual void DrawBorder(const wxGrid& grid, @@ -1464,7 +1464,7 @@ using wxUnsignedToIntHashMap = std::unordered_map; struct WXDLLIMPEXP_CORE wxGridSizesInfo { // default ctor, initialize m_sizeDefault and m_customSizes later - wxGridSizesInfo() { } + wxGridSizesInfo() = default; // ctor used by wxGrid::Get{Col,Row}Sizes() wxGridSizesInfo(int defSize, const wxArrayInt& allSizes); diff --git a/include/wx/generic/grideditors.h b/include/wx/generic/grideditors.h index b82e8669e0..a19fbf5af4 100644 --- a/include/wx/generic/grideditors.h +++ b/include/wx/generic/grideditors.h @@ -415,7 +415,7 @@ public: { } - virtual ~wxGridCellEnumEditor() {} + virtual ~wxGridCellEnumEditor() = default; virtual wxGridCellEditor* Clone() const override { return new wxGridCellEnumEditor(*this); } diff --git a/include/wx/generic/laywin.h b/include/wx/generic/laywin.h index 5d2e5313bc..397fcad790 100644 --- a/include/wx/generic/laywin.h +++ b/include/wx/generic/laywin.h @@ -207,7 +207,7 @@ class WXDLLIMPEXP_FWD_CORE wxFrame; class WXDLLIMPEXP_CORE wxLayoutAlgorithm: public wxObject { public: - wxLayoutAlgorithm() {} + wxLayoutAlgorithm() = default; #if wxUSE_MDI_ARCHITECTURE // The MDI client window is sized to whatever's left over. diff --git a/include/wx/generic/listctrl.h b/include/wx/generic/listctrl.h index af5a530088..bef9053cd2 100644 --- a/include/wx/generic/listctrl.h +++ b/include/wx/generic/listctrl.h @@ -256,7 +256,7 @@ class WXDLLIMPEXP_CORE wxListCtrl: public wxGenericListCtrl wxDECLARE_DYNAMIC_CLASS(wxListCtrl); public: - wxListCtrl() {} + wxListCtrl() = default; wxListCtrl(wxWindow *parent, wxWindowID winid = wxID_ANY, const wxPoint& pos = wxDefaultPosition, diff --git a/include/wx/generic/mask.h b/include/wx/generic/mask.h index 99307b3a27..ca6d9cf099 100644 --- a/include/wx/generic/mask.h +++ b/include/wx/generic/mask.h @@ -17,7 +17,7 @@ class WXDLLIMPEXP_CORE wxMask : public wxMaskBase { public: - wxMask() { } + wxMask() = default; wxMask(const wxBitmap& bitmap, const wxColour& colour) { InitFromColour(bitmap, colour); diff --git a/include/wx/generic/mdig.h b/include/wx/generic/mdig.h index f6c520a288..22b40b2380 100644 --- a/include/wx/generic/mdig.h +++ b/include/wx/generic/mdig.h @@ -217,7 +217,7 @@ private: class WXDLLIMPEXP_CORE wxGenericMDIClientWindow : public wxMDIClientWindowBase { public: - wxGenericMDIClientWindow() { } + wxGenericMDIClientWindow() = default; // unfortunately we need to provide our own version of CreateClient() // because of the difference in the type of the first parameter and diff --git a/include/wx/generic/private/grid.h b/include/wx/generic/private/grid.h index 8abe00987d..7b34c25afa 100644 --- a/include/wx/generic/private/grid.h +++ b/include/wx/generic/private/grid.h @@ -460,7 +460,7 @@ class WXDLLIMPEXP_ADV wxGridRowOrColAttrData { public: // empty ctor to suppress warnings - wxGridRowOrColAttrData() {} + wxGridRowOrColAttrData() = default; ~wxGridRowOrColAttrData(); void SetAttr(wxGridCellAttr *attr, int rowOrCol); @@ -663,7 +663,7 @@ public: // This class is never used polymorphically but give it a virtual dtor // anyhow to suppress g++ complaints about it - virtual ~wxGridOperations() { } + virtual ~wxGridOperations() = default; }; class wxGridRowOperations : public wxGridOperations @@ -1022,7 +1022,7 @@ public: // This class is never used polymorphically but give it a virtual dtor // anyhow to suppress g++ complaints about it - virtual ~wxGridDirectionOperations() { } + virtual ~wxGridDirectionOperations() = default; protected: // Get the position of the row or column from the given coordinates pair. @@ -1190,7 +1190,7 @@ WX_DEFINE_ARRAY_WITH_DECL_PTR(wxGridDataTypeInfo*, wxGridDataTypeInfoArray, class WXDLLIMPEXP_ADV wxGridTypeRegistry { public: - wxGridTypeRegistry() {} + wxGridTypeRegistry() = default; ~wxGridTypeRegistry(); void RegisterDataType(const wxString& typeName, diff --git a/include/wx/generic/private/markuptext.h b/include/wx/generic/private/markuptext.h index 54edb88766..4eb3596bbd 100644 --- a/include/wx/generic/private/markuptext.h +++ b/include/wx/generic/private/markuptext.h @@ -24,7 +24,7 @@ class wxMarkupParserOutput; class WXDLLIMPEXP_CORE wxMarkupTextBase { public: - virtual ~wxMarkupTextBase() {} + virtual ~wxMarkupTextBase() = default; // Update the markup string. void SetMarkup(const wxString& markup) { m_markup = markup; } diff --git a/include/wx/generic/statbmpg.h b/include/wx/generic/statbmpg.h index 73d47e8a9c..2cb95b7d10 100644 --- a/include/wx/generic/statbmpg.h +++ b/include/wx/generic/statbmpg.h @@ -15,7 +15,7 @@ class WXDLLIMPEXP_CORE wxGenericStaticBitmap : public wxStaticBitmapBase { public: - wxGenericStaticBitmap() {} + wxGenericStaticBitmap() = default; wxGenericStaticBitmap(wxWindow *parent, wxWindowID id, const wxBitmapBundle& bitmap, diff --git a/include/wx/generic/textdlgg.h b/include/wx/generic/textdlgg.h index de31acc6f8..042bb7c099 100644 --- a/include/wx/generic/textdlgg.h +++ b/include/wx/generic/textdlgg.h @@ -95,7 +95,7 @@ private: class WXDLLIMPEXP_CORE wxPasswordEntryDialog : public wxTextEntryDialog { public: - wxPasswordEntryDialog() { } + wxPasswordEntryDialog() = default; wxPasswordEntryDialog(wxWindow *parent, const wxString& message, const wxString& caption = wxASCII_STR(wxGetPasswordFromUserPromptStr), diff --git a/include/wx/generic/treectlg.h b/include/wx/generic/treectlg.h index b5bdf2b7cc..7e98c1c1da 100644 --- a/include/wx/generic/treectlg.h +++ b/include/wx/generic/treectlg.h @@ -403,7 +403,7 @@ class WXDLLIMPEXP_CORE wxTreeCtrl: public wxGenericTreeCtrl wxDECLARE_DYNAMIC_CLASS(wxTreeCtrl); public: - wxTreeCtrl() {} + wxTreeCtrl() = default; wxTreeCtrl(wxWindow *parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, diff --git a/include/wx/geometry.h b/include/wx/geometry.h index f12772cfbb..34a414ff01 100644 --- a/include/wx/geometry.h +++ b/include/wx/geometry.h @@ -741,7 +741,7 @@ inline bool wxRect2DInt::operator != (const wxRect2DInt& rect) const class WXDLLIMPEXP_CORE wxTransform2D { public : - virtual ~wxTransform2D() { } + virtual ~wxTransform2D() = default; virtual void Transform( wxPoint2DInt* pt )const = 0; virtual void Transform( wxRect2DInt* r ) const; virtual wxPoint2DInt Transform( const wxPoint2DInt &pt ) const; diff --git a/include/wx/graphics.h b/include/wx/graphics.h index 9d4415c185..5aacb2a3c5 100644 --- a/include/wx/graphics.h +++ b/include/wx/graphics.h @@ -147,8 +147,8 @@ protected: class WXDLLIMPEXP_CORE wxGraphicsPen : public wxGraphicsObject { public: - wxGraphicsPen() {} - virtual ~wxGraphicsPen() {} + wxGraphicsPen() = default; + virtual ~wxGraphicsPen() = default; private: wxDECLARE_DYNAMIC_CLASS(wxGraphicsPen); }; @@ -158,8 +158,8 @@ extern WXDLLIMPEXP_DATA_CORE(wxGraphicsPen) wxNullGraphicsPen; class WXDLLIMPEXP_CORE wxGraphicsBrush : public wxGraphicsObject { public: - wxGraphicsBrush() {} - virtual ~wxGraphicsBrush() {} + wxGraphicsBrush() = default; + virtual ~wxGraphicsBrush() = default; private: wxDECLARE_DYNAMIC_CLASS(wxGraphicsBrush); }; @@ -169,8 +169,8 @@ extern WXDLLIMPEXP_DATA_CORE(wxGraphicsBrush) wxNullGraphicsBrush; class WXDLLIMPEXP_CORE wxGraphicsFont : public wxGraphicsObject { public: - wxGraphicsFont() {} - virtual ~wxGraphicsFont() {} + wxGraphicsFont() = default; + virtual ~wxGraphicsFont() = default; private: wxDECLARE_DYNAMIC_CLASS(wxGraphicsFont); }; @@ -180,8 +180,8 @@ extern WXDLLIMPEXP_DATA_CORE(wxGraphicsFont) wxNullGraphicsFont; class WXDLLIMPEXP_CORE wxGraphicsBitmap : public wxGraphicsObject { public: - wxGraphicsBitmap() {} - virtual ~wxGraphicsBitmap() {} + wxGraphicsBitmap() = default; + virtual ~wxGraphicsBitmap() = default; // Convert bitmap to wxImage: this is more efficient than converting to // wxBitmap first and then to wxImage and also works without X server @@ -206,9 +206,9 @@ extern WXDLLIMPEXP_DATA_CORE(wxGraphicsBitmap) wxNullGraphicsBitmap; class WXDLLIMPEXP_CORE wxGraphicsMatrix : public wxGraphicsObject { public: - wxGraphicsMatrix() {} + wxGraphicsMatrix() = default; - virtual ~wxGraphicsMatrix() {} + virtual ~wxGraphicsMatrix() = default; // concatenates the matrix virtual void Concat( const wxGraphicsMatrix *t ); @@ -477,8 +477,8 @@ private: class WXDLLIMPEXP_CORE wxGraphicsPath : public wxGraphicsObject { public: - wxGraphicsPath() {} - virtual ~wxGraphicsPath() {} + wxGraphicsPath() = default; + virtual ~wxGraphicsPath() = default; // // These are the path primitives from which everything else can be constructed @@ -992,9 +992,9 @@ private: class WXDLLIMPEXP_CORE wxGraphicsRenderer : public wxObject { public: - wxGraphicsRenderer() {} + wxGraphicsRenderer() = default; - virtual ~wxGraphicsRenderer() {} + virtual ~wxGraphicsRenderer() = default; static wxGraphicsRenderer* GetDefaultRenderer(); diff --git a/include/wx/gtk/bitmap.h b/include/wx/gtk/bitmap.h index fc32617b0a..bb76a4d57f 100644 --- a/include/wx/gtk/bitmap.h +++ b/include/wx/gtk/bitmap.h @@ -63,7 +63,7 @@ private: class WXDLLIMPEXP_CORE wxBitmap: public wxBitmapBase { public: - wxBitmap() { } + wxBitmap() = default; wxBitmap( int width, int height, int depth = wxBITMAP_SCREEN_DEPTH ) { Create(width, height, depth); } wxBitmap( const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH ) diff --git a/include/wx/gtk/bmpbuttn.h b/include/wx/gtk/bmpbuttn.h index 37d7d31758..34df7525dc 100644 --- a/include/wx/gtk/bmpbuttn.h +++ b/include/wx/gtk/bmpbuttn.h @@ -16,7 +16,7 @@ class WXDLLIMPEXP_CORE wxBitmapButton : public wxBitmapButtonBase { public: - wxBitmapButton() { } + wxBitmapButton() = default; wxBitmapButton(wxWindow *parent, wxWindowID id, diff --git a/include/wx/gtk/brush.h b/include/wx/gtk/brush.h index 3dcdedb533..c5ef66753f 100644 --- a/include/wx/gtk/brush.h +++ b/include/wx/gtk/brush.h @@ -19,7 +19,7 @@ class WXDLLIMPEXP_FWD_CORE wxColour; class WXDLLIMPEXP_CORE wxBrush: public wxBrushBase { public: - wxBrush() { } + wxBrush() = default; wxBrush( const wxColour &colour, wxBrushStyle style = wxBRUSHSTYLE_SOLID ); wxBrush( const wxBitmap &stippleBitmap ); diff --git a/include/wx/gtk/button.h b/include/wx/gtk/button.h index a41ad50a47..8753da5ab2 100644 --- a/include/wx/gtk/button.h +++ b/include/wx/gtk/button.h @@ -16,7 +16,7 @@ class WXDLLIMPEXP_CORE wxButton : public wxButtonBase { public: - wxButton() {} + wxButton() = default; wxButton(wxWindow *parent, wxWindowID id, const wxString& label = wxEmptyString, const wxPoint& pos = wxDefaultPosition, diff --git a/include/wx/gtk/calctrl.h b/include/wx/gtk/calctrl.h index c54d9c7fde..cf2168bca4 100644 --- a/include/wx/gtk/calctrl.h +++ b/include/wx/gtk/calctrl.h @@ -12,7 +12,7 @@ class WXDLLIMPEXP_ADV wxGtkCalendarCtrl : public wxCalendarCtrlBase { public: - wxGtkCalendarCtrl() {} + wxGtkCalendarCtrl() = default; wxGtkCalendarCtrl(wxWindow *parent, wxWindowID id, const wxDateTime& date = wxDefaultDateTime, @@ -32,7 +32,7 @@ public: long style = wxCAL_SHOW_HOLIDAYS, const wxString& name = wxASCII_STR(wxCalendarNameStr)); - virtual ~wxGtkCalendarCtrl() {} + virtual ~wxGtkCalendarCtrl() = default; virtual bool SetDate(const wxDateTime& date) override; virtual wxDateTime GetDate() const override; diff --git a/include/wx/gtk/colordlg.h b/include/wx/gtk/colordlg.h index 451eaecd80..86bac03b8d 100644 --- a/include/wx/gtk/colordlg.h +++ b/include/wx/gtk/colordlg.h @@ -15,10 +15,10 @@ class WXDLLIMPEXP_CORE wxColourDialog : public wxDialog { public: - wxColourDialog() {} + wxColourDialog() = default; wxColourDialog(wxWindow *parent, const wxColourData *data = nullptr); - virtual ~wxColourDialog() {} + virtual ~wxColourDialog() = default; bool Create(wxWindow *parent, const wxColourData *data = nullptr); diff --git a/include/wx/gtk/dirdlg.h b/include/wx/gtk/dirdlg.h index b55e89ea97..aa7b653f19 100644 --- a/include/wx/gtk/dirdlg.h +++ b/include/wx/gtk/dirdlg.h @@ -16,7 +16,7 @@ class WXDLLIMPEXP_CORE wxDirDialog : public wxDirDialogBase { public: - wxDirDialog() { } + wxDirDialog() = default; wxDirDialog(wxWindow *parent, const wxString& message = wxASCII_STR(wxDirSelectorPromptStr), @@ -32,7 +32,7 @@ public: const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxString& name = wxASCII_STR(wxDirDialogNameStr)); - virtual ~wxDirDialog() { } + virtual ~wxDirDialog() = default; public: // overrides from wxGenericDirDialog diff --git a/include/wx/gtk/filedlg.h b/include/wx/gtk/filedlg.h index b41dc0de33..718c2c70a7 100644 --- a/include/wx/gtk/filedlg.h +++ b/include/wx/gtk/filedlg.h @@ -18,7 +18,7 @@ class WXDLLIMPEXP_CORE wxFileDialog: public wxFileDialogBase { public: - wxFileDialog() { } + wxFileDialog() = default; wxFileDialog(wxWindow *parent, const wxString& message = wxASCII_STR(wxFileSelectorPromptStr), diff --git a/include/wx/gtk/font.h b/include/wx/gtk/font.h index 5ef305a46d..3774019727 100644 --- a/include/wx/gtk/font.h +++ b/include/wx/gtk/font.h @@ -16,7 +16,7 @@ class WXDLLIMPEXP_CORE wxFont : public wxFontBase { public: - wxFont() { } + wxFont() = default; wxFont(const wxFontInfo& info); diff --git a/include/wx/gtk/gnome/gvfs.h b/include/wx/gtk/gnome/gvfs.h index 559f14f569..c4d84bdc75 100644 --- a/include/wx/gtk/gnome/gvfs.h +++ b/include/wx/gtk/gnome/gvfs.h @@ -24,7 +24,7 @@ class wxGnomeVFSMimeTypesManagerImpl: public wxMimeTypesManagerImpl { public: - wxGnomeVFSMimeTypesManagerImpl() { } + wxGnomeVFSMimeTypesManagerImpl() = default; protected: virtual bool DoAssociation(const wxString& strType, @@ -41,7 +41,7 @@ protected: class wxGnomeVFSMimeTypesManagerFactory: public wxMimeTypesManagerFactory { public: - wxGnomeVFSMimeTypesManagerFactory() {} + wxGnomeVFSMimeTypesManagerFactory() = default; virtual wxMimeTypesManagerImpl *CreateMimeTypesManagerImpl(); }; diff --git a/include/wx/gtk/mdi.h b/include/wx/gtk/mdi.h index 1b9f335520..1f0a0fc0e5 100644 --- a/include/wx/gtk/mdi.h +++ b/include/wx/gtk/mdi.h @@ -141,7 +141,7 @@ private: class WXDLLIMPEXP_CORE wxMDIClientWindow : public wxMDIClientWindowBase { public: - wxMDIClientWindow() { } + wxMDIClientWindow() = default; ~wxMDIClientWindow(); virtual bool CreateClient(wxMDIParentFrame *parent, diff --git a/include/wx/gtk/minifram.h b/include/wx/gtk/minifram.h index bebd06db8e..6bcb73ac0c 100644 --- a/include/wx/gtk/minifram.h +++ b/include/wx/gtk/minifram.h @@ -21,7 +21,7 @@ class WXDLLIMPEXP_CORE wxMiniFrame: public wxFrame wxDECLARE_DYNAMIC_CLASS(wxMiniFrame); public: - wxMiniFrame() {} + wxMiniFrame() = default; wxMiniFrame(wxWindow *parent, wxWindowID id, const wxString& title, diff --git a/include/wx/gtk/pen.h b/include/wx/gtk/pen.h index 0a2f9d5936..6799979114 100644 --- a/include/wx/gtk/pen.h +++ b/include/wx/gtk/pen.h @@ -16,7 +16,7 @@ class WXDLLIMPEXP_CORE wxPen: public wxPenBase { public: - wxPen() { } + wxPen() = default; wxPen( const wxColour &colour, int width = 1, wxPenStyle style = wxPENSTYLE_SOLID ); diff --git a/include/wx/gtk/popupwin.h b/include/wx/gtk/popupwin.h index 8f4316c52c..9a53bfd7b7 100644 --- a/include/wx/gtk/popupwin.h +++ b/include/wx/gtk/popupwin.h @@ -17,7 +17,7 @@ class WXDLLIMPEXP_CORE wxPopupWindow: public wxPopupWindowBase { public: - wxPopupWindow() { } + wxPopupWindow() = default; virtual ~wxPopupWindow(); wxPopupWindow(wxWindow *parent, int flags = wxBORDER_NONE) diff --git a/include/wx/gtk/private/image.h b/include/wx/gtk/private/image.h index b175c0ee8f..db34e9cc06 100644 --- a/include/wx/gtk/private/image.h +++ b/include/wx/gtk/private/image.h @@ -13,7 +13,7 @@ class wxGtkImage: GtkImage public: struct BitmapProvider { - virtual ~BitmapProvider() { } + virtual ~BitmapProvider() = default; virtual wxBitmap Get(int scale) const = 0; virtual void Set(const wxBitmapBundle&) { } diff --git a/include/wx/gtk/private/log.h b/include/wx/gtk/private/log.h index ceff26fab4..16fdc68d9f 100644 --- a/include/wx/gtk/private/log.h +++ b/include/wx/gtk/private/log.h @@ -85,7 +85,7 @@ private: class LogFilterByLevel : public LogFilter { public: - LogFilterByLevel() { } + LogFilterByLevel() = default; void SetLevelToIgnore(int flags) { diff --git a/include/wx/gtk/private/string.h b/include/wx/gtk/private/string.h index 981bf00a81..4145dd9da2 100644 --- a/include/wx/gtk/private/string.h +++ b/include/wx/gtk/private/string.h @@ -61,7 +61,7 @@ public: class wxGtkCollatedArrayString { public: - wxGtkCollatedArrayString() { } + wxGtkCollatedArrayString() = default; int Add( const wxString &new_label ) { diff --git a/include/wx/gtk/radiobut.h b/include/wx/gtk/radiobut.h index 21d7a4b7f8..7dc9346ee4 100644 --- a/include/wx/gtk/radiobut.h +++ b/include/wx/gtk/radiobut.h @@ -16,7 +16,7 @@ class WXDLLIMPEXP_CORE wxRadioButton: public wxRadioButtonBase { public: - wxRadioButton() { } + wxRadioButton() = default; wxRadioButton( wxWindow *parent, wxWindowID id, const wxString& label, diff --git a/include/wx/gtk/region.h b/include/wx/gtk/region.h index 2259ac7973..96c79da917 100644 --- a/include/wx/gtk/region.h +++ b/include/wx/gtk/region.h @@ -20,7 +20,7 @@ typedef struct _cairo_region cairo_region_t; class WXDLLIMPEXP_CORE wxRegion : public wxRegionBase { public: - wxRegion() { } + wxRegion() = default; wxRegion( wxCoord x, wxCoord y, wxCoord w, wxCoord h ) { diff --git a/include/wx/gtk/spinctrl.h b/include/wx/gtk/spinctrl.h index abc68b0d27..e76a6c4ba5 100644 --- a/include/wx/gtk/spinctrl.h +++ b/include/wx/gtk/spinctrl.h @@ -202,7 +202,7 @@ private: class WXDLLIMPEXP_CORE wxSpinCtrlDouble : public wxSpinCtrlGTKBase { public: - wxSpinCtrlDouble() {} + wxSpinCtrlDouble() = default; wxSpinCtrlDouble(wxWindow *parent, wxWindowID id = wxID_ANY, const wxString& value = wxEmptyString, diff --git a/include/wx/gtk/tglbtn.h b/include/wx/gtk/tglbtn.h index 7afb5665e9..8e813ca7c7 100644 --- a/include/wx/gtk/tglbtn.h +++ b/include/wx/gtk/tglbtn.h @@ -21,7 +21,7 @@ class WXDLLIMPEXP_CORE wxToggleButton: public wxToggleButtonBase { public: // construction/destruction - wxToggleButton() {} + wxToggleButton() = default; wxToggleButton(wxWindow *parent, wxWindowID id, const wxString& label, @@ -81,7 +81,7 @@ class WXDLLIMPEXP_CORE wxBitmapToggleButton: public wxToggleButton { public: // construction/destruction - wxBitmapToggleButton() {} + wxBitmapToggleButton() = default; wxBitmapToggleButton(wxWindow *parent, wxWindowID id, const wxBitmapBundle& label, diff --git a/include/wx/hash.h b/include/wx/hash.h index 01ca912d07..b1dac62045 100644 --- a/include/wx/hash.h +++ b/include/wx/hash.h @@ -91,7 +91,7 @@ public: typedef wxHashTableBase_Node Node; wxHashTableBase(); - virtual ~wxHashTableBase() { } + virtual ~wxHashTableBase() = default; void Create( wxKeyType keyType = wxKEY_INTEGER, size_t size = wxHASH_SIZE_DEFAULT ); diff --git a/include/wx/hashmap.h b/include/wx/hashmap.h index 943e013a62..4b540914a1 100644 --- a/include/wx/hashmap.h +++ b/include/wx/hashmap.h @@ -416,7 +416,7 @@ CLASSEXP CLASSNAME \ typedef const_key_type& const_key_reference; \ typedef const_pair_type& const_pair_reference; \ public: \ - CLASSNAME() { } \ + CLASSNAME() = default; \ const_key_reference operator()( const_pair_reference pair ) const { return pair.first; }\ }; @@ -464,7 +464,7 @@ private: #endif // wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG public: - wxIntegerHash() noexcept { } + wxIntegerHash() noexcept = default; size_t operator()( long x ) const noexcept { return longHash( x ); } size_t operator()( unsigned long x ) const noexcept { return ulongHash( x ); } size_t operator()( int x ) const noexcept { return intHash( x ); } @@ -482,7 +482,7 @@ public: // integer types struct WXDLLIMPEXP_BASE wxIntegerHash { - wxIntegerHash() noexcept { } + wxIntegerHash() noexcept = default; unsigned long operator()( long x ) const noexcept { return (unsigned long)x; } unsigned long operator()( unsigned long x ) const noexcept { return x; } unsigned long operator()( int x ) const noexcept { return (unsigned long)x; } @@ -499,7 +499,7 @@ struct WXDLLIMPEXP_BASE wxIntegerHash struct WXDLLIMPEXP_BASE wxIntegerEqual { - wxIntegerEqual() noexcept { } + wxIntegerEqual() noexcept = default; bool operator()( long a, long b ) const noexcept { return a == b; } bool operator()( unsigned long a, unsigned long b ) const noexcept { return a == b; } bool operator()( int a, int b ) const noexcept { return a == b; } @@ -515,7 +515,7 @@ struct WXDLLIMPEXP_BASE wxIntegerEqual // pointers struct WXDLLIMPEXP_BASE wxPointerHash { - wxPointerHash() noexcept { } + wxPointerHash() noexcept = default; #ifdef wxNEEDS_WX_HASH_MAP wxUIntPtr operator()( const void* k ) const noexcept { return wxPtrToUInt(k); } @@ -526,14 +526,14 @@ struct WXDLLIMPEXP_BASE wxPointerHash struct WXDLLIMPEXP_BASE wxPointerEqual { - wxPointerEqual() noexcept { } + wxPointerEqual() noexcept = default; bool operator()( const void* a, const void* b ) const noexcept { return a == b; } }; // wxString, char*, wchar_t* struct WXDLLIMPEXP_BASE wxStringHash { - wxStringHash() noexcept {} + wxStringHash() noexcept = default; unsigned long operator()( const wxString& x ) const noexcept { return stringHash( x.wx_str() ); } unsigned long operator()( const wchar_t* x ) const noexcept @@ -547,7 +547,7 @@ struct WXDLLIMPEXP_BASE wxStringHash struct WXDLLIMPEXP_BASE wxStringEqual { - wxStringEqual() noexcept {} + wxStringEqual() noexcept = default; bool operator()( const wxString& a, const wxString& b ) const noexcept { return a == b; } bool operator()( const wxChar* a, const wxChar* b ) const noexcept diff --git a/include/wx/hashset.h b/include/wx/hashset.h index 199215cb60..6d178c756c 100644 --- a/include/wx/hashset.h +++ b/include/wx/hashset.h @@ -63,7 +63,7 @@ CLASSEXP CLASSNAME \ typedef const key_type const_key_type; \ typedef const_key_type& const_key_reference; \ public: \ - CLASSNAME() { } \ + CLASSNAME() = default; \ const_key_reference operator()( const_key_reference key ) const \ { return key; } \ }; diff --git a/include/wx/headercol.h b/include/wx/headercol.h index 5c488a5873..5690584dc0 100644 --- a/include/wx/headercol.h +++ b/include/wx/headercol.h @@ -74,7 +74,7 @@ public: // virtual dtor for the base class to avoid gcc warnings even though we // don't normally delete the objects of this class via a pointer to // wxHeaderColumn so it's not necessary, strictly speaking - virtual ~wxHeaderColumn() { } + virtual ~wxHeaderColumn() = default; // getters for various attributes // ------------------------------ diff --git a/include/wx/helpbase.h b/include/wx/helpbase.h index 25d69e3277..f2b68ea827 100644 --- a/include/wx/helpbase.h +++ b/include/wx/helpbase.h @@ -34,7 +34,7 @@ class WXDLLIMPEXP_CORE wxHelpControllerBase: public wxObject { public: inline wxHelpControllerBase(wxWindow* parentWindow = nullptr) { m_parentWindow = parentWindow; } - inline ~wxHelpControllerBase() {} + inline ~wxHelpControllerBase() = default; // Must call this to set the filename and server name. // server is only required when implementing TCP/IP-based diff --git a/include/wx/html/helpdata.h b/include/wx/html/helpdata.h index e5cdfd91e0..0608673c94 100644 --- a/include/wx/html/helpdata.h +++ b/include/wx/html/helpdata.h @@ -107,7 +107,7 @@ class WXDLLIMPEXP_HTML wxHtmlSearchEngine : public wxObject { public: wxHtmlSearchEngine() : wxObject() {} - virtual ~wxHtmlSearchEngine() {} + virtual ~wxHtmlSearchEngine() = default; // Sets the keyword we will be searching for virtual void LookFor(const wxString& keyword, bool case_sensitive, bool whole_words_only); diff --git a/include/wx/html/htmlcell.h b/include/wx/html/htmlcell.h index 232377c4a2..d52cd387a6 100644 --- a/include/wx/html/htmlcell.h +++ b/include/wx/html/htmlcell.h @@ -117,7 +117,7 @@ private: class WXDLLIMPEXP_HTML wxHtmlRenderingStyle { public: - virtual ~wxHtmlRenderingStyle() {} + virtual ~wxHtmlRenderingStyle() = default; virtual wxColour GetSelectedTextColour(const wxColour& clr) = 0; virtual wxColour GetSelectedTextBgColour(const wxColour& clr) = 0; }; diff --git a/include/wx/html/htmlfilt.h b/include/wx/html/htmlfilt.h index bd85c482c6..387b34a18b 100644 --- a/include/wx/html/htmlfilt.h +++ b/include/wx/html/htmlfilt.h @@ -30,7 +30,7 @@ class WXDLLIMPEXP_HTML wxHtmlFilter : public wxObject public: wxHtmlFilter() : wxObject() {} - virtual ~wxHtmlFilter() {} + virtual ~wxHtmlFilter() = default; // returns true if this filter is able to open&read given file virtual bool CanRead(const wxFSFile& file) const = 0; diff --git a/include/wx/html/htmlproc.h b/include/wx/html/htmlproc.h index 73e22459f7..09aa3c7600 100644 --- a/include/wx/html/htmlproc.h +++ b/include/wx/html/htmlproc.h @@ -34,7 +34,7 @@ class WXDLLIMPEXP_HTML wxHtmlProcessor : public wxObject public: wxHtmlProcessor() : wxObject(), m_enabled(true) {} - virtual ~wxHtmlProcessor() {} + virtual ~wxHtmlProcessor() = default; // Process input text and return processed result virtual wxString Process(const wxString& text) const = 0; diff --git a/include/wx/html/htmlwin.h b/include/wx/html/htmlwin.h index 35343b56bf..281d568939 100644 --- a/include/wx/html/htmlwin.h +++ b/include/wx/html/htmlwin.h @@ -59,8 +59,8 @@ class WXDLLIMPEXP_HTML wxHtmlWindowInterface { public: /// Ctor - wxHtmlWindowInterface() {} - virtual ~wxHtmlWindowInterface() {} + wxHtmlWindowInterface() = default; + virtual ~wxHtmlWindowInterface() = default; /** Called by the parser to set window's title to given text. @@ -149,7 +149,7 @@ protected: It is not really needed in this case, but at least it prevents gcc from complaining about its absence. */ - virtual ~wxHtmlWindowMouseHelper() { } + virtual ~wxHtmlWindowMouseHelper() = default; /// Returns true if the mouse moved since the last call to HandleIdle bool DidMouseMove() const { return m_tmpMouseMoved; } @@ -575,7 +575,7 @@ wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_HTML, wxEVT_HTML_LINK_CLICKED, wxHtmlLinkE class WXDLLIMPEXP_HTML wxHtmlCellEvent : public wxCommandEvent { public: - wxHtmlCellEvent() {} + wxHtmlCellEvent() = default; wxHtmlCellEvent(wxEventType commandType, int id, wxHtmlCell *cell, const wxPoint &pt, const wxMouseEvent &ev) @@ -616,7 +616,7 @@ private: class WXDLLIMPEXP_HTML wxHtmlLinkEvent : public wxCommandEvent { public: - wxHtmlLinkEvent() {} + wxHtmlLinkEvent() = default; wxHtmlLinkEvent(int id, const wxHtmlLinkInfo &linkinfo) : wxCommandEvent(wxEVT_HTML_LINK_CLICKED, id) , m_linkInfo(linkinfo) diff --git a/include/wx/htmllbox.h b/include/wx/htmllbox.h index 36e0454f42..969f32c304 100644 --- a/include/wx/htmllbox.h +++ b/include/wx/htmllbox.h @@ -209,7 +209,7 @@ public: // wxListbox-compatible constructors // --------------------------------- - wxSimpleHtmlListBox() { } + wxSimpleHtmlListBox() = default; wxSimpleHtmlListBox(wxWindow *parent, wxWindowID id, diff --git a/include/wx/hyperlink.h b/include/wx/hyperlink.h index eecab1ddff..a545c5b7f7 100644 --- a/include/wx/hyperlink.h +++ b/include/wx/hyperlink.h @@ -99,7 +99,7 @@ wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_HYPERLINK, wxHyperlinkEvent ); class WXDLLIMPEXP_CORE wxHyperlinkEvent : public wxCommandEvent { public: - wxHyperlinkEvent() {} + wxHyperlinkEvent() = default; wxHyperlinkEvent(wxObject *generator, wxWindowID id, const wxString& url) : wxCommandEvent(wxEVT_HYPERLINK, id), m_url(url) @@ -147,7 +147,7 @@ typedef void (wxEvtHandler::*wxHyperlinkEventFunction)(wxHyperlinkEvent&); class WXDLLIMPEXP_CORE wxHyperlinkCtrl : public wxGenericHyperlinkCtrl { public: - wxHyperlinkCtrl() { } + wxHyperlinkCtrl() = default; wxHyperlinkCtrl(wxWindow *parent, wxWindowID id, diff --git a/include/wx/image.h b/include/wx/image.h index f07af0a971..0f1ad39a29 100644 --- a/include/wx/image.h +++ b/include/wx/image.h @@ -284,7 +284,7 @@ public: double value; }; - wxImage() {} + wxImage() = default; wxImage( int width, int height, bool clear = true ) { Create( width, height, clear ); } wxImage( int width, int height, unsigned char* data, bool static_data = false ) diff --git a/include/wx/infobar.h b/include/wx/infobar.h index ebda4f695a..65443add66 100644 --- a/include/wx/infobar.h +++ b/include/wx/infobar.h @@ -28,7 +28,7 @@ public: // explicitly shown when it is needed (this is done because it is supposed // to be shown only intermittently and hiding it after creating it from the // user code would result in flicker) - wxInfoBarBase() { } + wxInfoBarBase() = default; // show the info bar with the given message and optionally an icon diff --git a/include/wx/ipcbase.h b/include/wx/ipcbase.h index 28750d2cd8..c6ba994e5c 100644 --- a/include/wx/ipcbase.h +++ b/include/wx/ipcbase.h @@ -228,8 +228,8 @@ protected: class WXDLLIMPEXP_BASE wxServerBase : public wxObject { public: - wxServerBase() { } - virtual ~wxServerBase() { } + wxServerBase() = default; + virtual ~wxServerBase() = default; // Returns false on error (e.g. port number is already in use) virtual bool Create(const wxString& serverName) = 0; @@ -243,8 +243,8 @@ public: class WXDLLIMPEXP_BASE wxClientBase : public wxObject { public: - wxClientBase() { } - virtual ~wxClientBase() { } + wxClientBase() = default; + virtual ~wxClientBase() = default; virtual bool ValidHost(const wxString& host) = 0; diff --git a/include/wx/itemattr.h b/include/wx/itemattr.h index 596cb2bab8..217951e566 100644 --- a/include/wx/itemattr.h +++ b/include/wx/itemattr.h @@ -18,7 +18,7 @@ class wxItemAttr { public: // ctors - wxItemAttr() { } + wxItemAttr() = default; wxItemAttr(const wxColour& colText, const wxColour& colBack, const wxFont& font) diff --git a/include/wx/layout.h b/include/wx/layout.h index 828c835689..96e49acc7a 100644 --- a/include/wx/layout.h +++ b/include/wx/layout.h @@ -69,7 +69,7 @@ public: // note that default copy ctor and assignment operators are ok - virtual ~wxIndividualLayoutConstraint(){} + virtual ~wxIndividualLayoutConstraint() = default; void Set(wxRelationship rel, wxWindowBase *otherW, wxEdge otherE, int val = 0, int marg = wxLAYOUT_DEFAULT_MARGIN); @@ -172,7 +172,7 @@ public: // note that default copy ctor and assignment operators are ok - virtual ~wxLayoutConstraints(){} + virtual ~wxLayoutConstraints() = default; bool SatisfyConstraints(wxWindowBase *win, int *noChanges); bool AreSatisfied() const diff --git a/include/wx/list.h b/include/wx/list.h index 4bfe279db9..86f9d72808 100644 --- a/include/wx/list.h +++ b/include/wx/list.h @@ -1164,14 +1164,14 @@ class WXDLLIMPEXP_BASE wxList : public wxObjectList { public: #if defined(wxWARN_COMPAT_LIST_USE) && !wxUSE_STD_CONTAINERS - wxList() { } + wxList() = default; wxDEPRECATED( wxList(int key_type) ); #elif !wxUSE_STD_CONTAINERS wxList(int key_type = wxKEY_NONE); #endif // this destructor is required for Darwin - ~wxList() { } + ~wxList() = default; #if !wxUSE_STD_CONTAINERS wxList& operator=(const wxList& list) diff --git a/include/wx/listbase.h b/include/wx/listbase.h index 286a92e71a..2b6078f045 100644 --- a/include/wx/listbase.h +++ b/include/wx/listbase.h @@ -331,7 +331,7 @@ private: class WXDLLIMPEXP_CORE wxListCtrlBase : public wxSystemThemedControl { public: - wxListCtrlBase() { } + wxListCtrlBase() = default; // Image-related methods. // ---------------------- diff --git a/include/wx/listbook.h b/include/wx/listbook.h index c5095b699a..5209f85518 100644 --- a/include/wx/listbook.h +++ b/include/wx/listbook.h @@ -37,7 +37,7 @@ wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_LISTBOOK_PAGE_CHANGING, wxBook class WXDLLIMPEXP_CORE wxListbook : public wxCompositeBookCtrlBase { public: - wxListbook() { } + wxListbook() = default; wxListbook(wxWindow *parent, wxWindowID id, diff --git a/include/wx/listbox.h b/include/wx/listbox.h index 28b1cd7177..7266477a39 100644 --- a/include/wx/listbox.h +++ b/include/wx/listbox.h @@ -37,7 +37,7 @@ extern WXDLLIMPEXP_DATA_CORE(const char) wxListBoxNameStr[]; class WXDLLIMPEXP_CORE wxListBoxBase : public wxControlWithItems { public: - wxListBoxBase() { } + wxListBoxBase() = default; virtual ~wxListBoxBase(); void InsertItems(unsigned int nItems, const wxString *items, unsigned int pos) diff --git a/include/wx/listctrl.h b/include/wx/listctrl.h index e04c168904..eb45bf794f 100644 --- a/include/wx/listctrl.h +++ b/include/wx/listctrl.h @@ -41,7 +41,7 @@ extern WXDLLIMPEXP_DATA_CORE(const char) wxListCtrlNameStr[]; class WXDLLIMPEXP_CORE wxListView : public wxListCtrl { public: - wxListView() { } + wxListView() = default; wxListView( wxWindow *parent, wxWindowID winid = wxID_ANY, const wxPoint& pos = wxDefaultPosition, diff --git a/include/wx/log.h b/include/wx/log.h index f226d6fad2..9dfd9117aa 100644 --- a/include/wx/log.h +++ b/include/wx/log.h @@ -317,10 +317,10 @@ class WXDLLIMPEXP_BASE wxLogFormatter { public: // Default constructor. - wxLogFormatter() { } + wxLogFormatter() = default; // Trivial but virtual destructor for the base class. - virtual ~wxLogFormatter() { } + virtual ~wxLogFormatter() = default; // Override this method to implement custom formatting of the given log @@ -660,7 +660,7 @@ private: class WXDLLIMPEXP_BASE wxLogBuffer : public wxLog { public: - wxLogBuffer() { } + wxLogBuffer() = default; // get the string contents with all messages logged const wxString& GetBuffer() const { return m_str; } @@ -1225,7 +1225,7 @@ wxDEFINE_EMPTY_LOG_FUNCTION2(Generic, wxLogLevel); class WXDLLIMPEXP_BASE wxLogNull { public: - wxLogNull() { } + wxLogNull() = default; }; // Dummy macros to replace some functions. diff --git a/include/wx/memtext.h b/include/wx/memtext.h index 39d553826f..ac7c0b9f1d 100644 --- a/include/wx/memtext.h +++ b/include/wx/memtext.h @@ -23,7 +23,7 @@ class WXDLLIMPEXP_BASE wxMemoryText : public wxTextBuffer { public: // Constructors. - wxMemoryText() { } + wxMemoryText() = default; wxMemoryText(const wxString& name) : wxTextBuffer(name) { } protected: diff --git a/include/wx/menu.h b/include/wx/menu.h index 72da146ebd..a62e6144bd 100644 --- a/include/wx/menu.h +++ b/include/wx/menu.h @@ -417,7 +417,7 @@ class WXDLLEXPORT wxMenuInfoHelper : public wxObject { public: wxMenuInfoHelper() { m_menu = nullptr; } - virtual ~wxMenuInfoHelper() { } + virtual ~wxMenuInfoHelper() = default; bool Create( wxMenu *menu, const wxString &title ) { diff --git a/include/wx/mimetype.h b/include/wx/mimetype.h index ac10dd1952..6502d37a31 100644 --- a/include/wx/mimetype.h +++ b/include/wx/mimetype.h @@ -72,7 +72,7 @@ public: class WXDLLIMPEXP_BASE wxMimeTypeCommands { public: - wxMimeTypeCommands() {} + wxMimeTypeCommands() = default; wxMimeTypeCommands(const wxArrayString& verbs, const wxArrayString& commands) @@ -160,7 +160,7 @@ public: // invalid item - use this to terminate the array passed to // wxMimeTypesManager::AddFallbacks - wxFileTypeInfo() { } + wxFileTypeInfo() = default; // test if this object can be used bool IsValid() const { return !m_mimeType.empty(); } @@ -252,7 +252,7 @@ public: { public: // ctors - MessageParameters() { } + MessageParameters() = default; MessageParameters(const wxString& filename, const wxString& mimetype = wxEmptyString) : m_filename(filename), m_mimetype(mimetype) { } @@ -268,7 +268,7 @@ public: { return wxEmptyString; } // virtual dtor as in any base class - virtual ~MessageParameters() { } + virtual ~MessageParameters() = default; protected: wxString m_filename, m_mimetype; @@ -359,8 +359,8 @@ private: class WXDLLIMPEXP_BASE wxMimeTypesManagerFactory { public: - wxMimeTypesManagerFactory() {} - virtual ~wxMimeTypesManagerFactory() {} + wxMimeTypesManagerFactory() = default; + virtual ~wxMimeTypesManagerFactory() = default; virtual wxMimeTypesManagerImpl *CreateMimeTypesManagerImpl(); diff --git a/include/wx/modalhook.h b/include/wx/modalhook.h index a60b77e389..cad9390345 100644 --- a/include/wx/modalhook.h +++ b/include/wx/modalhook.h @@ -26,7 +26,7 @@ class WXDLLIMPEXP_CORE wxModalDialogHook { public: // Default ctor doesn't do anything, call Register() to activate the hook. - wxModalDialogHook() { } + wxModalDialogHook() = default; // Dtor unregisters the hook if it had been registered. virtual ~wxModalDialogHook() { DoUnregister(); } diff --git a/include/wx/module.h b/include/wx/module.h index 4b0e63a314..49e747043b 100644 --- a/include/wx/module.h +++ b/include/wx/module.h @@ -24,8 +24,8 @@ typedef wxVector wxModuleList; class WXDLLIMPEXP_BASE wxModule : public wxObject { public: - wxModule() {} - virtual ~wxModule() {} + wxModule() = default; + virtual ~wxModule() = default; // if module init routine returns false the application // will fail to startup diff --git a/include/wx/msgdlg.h b/include/wx/msgdlg.h index 533a9c533c..7546173114 100644 --- a/include/wx/msgdlg.h +++ b/include/wx/msgdlg.h @@ -98,7 +98,7 @@ public: } // virtual dtor for the base class - virtual ~wxMessageDialogBase() { } + virtual ~wxMessageDialogBase() = default; wxString GetCaption() const { return m_caption; } diff --git a/include/wx/msgout.h b/include/wx/msgout.h index c0d6915b0e..e04e082f00 100644 --- a/include/wx/msgout.h +++ b/include/wx/msgout.h @@ -25,7 +25,7 @@ class WXDLLIMPEXP_BASE wxMessageOutput { public: - virtual ~wxMessageOutput() { } + virtual ~wxMessageOutput() = default; // gets the current wxMessageOutput object (may be null during // initialization or shutdown) @@ -129,7 +129,7 @@ private: class WXDLLIMPEXP_CORE wxMessageOutputMessageBox : public wxMessageOutput { public: - wxMessageOutputMessageBox() { } + wxMessageOutputMessageBox() = default; virtual void Output(const wxString& str) override; }; @@ -143,7 +143,7 @@ public: class WXDLLIMPEXP_BASE wxMessageOutputDebug : public wxMessageOutputStderr { public: - wxMessageOutputDebug() { } + wxMessageOutputDebug() = default; virtual void Output(const wxString& str) override; }; @@ -155,7 +155,7 @@ public: class WXDLLIMPEXP_BASE wxMessageOutputLog : public wxMessageOutput { public: - wxMessageOutputLog() { } + wxMessageOutputLog() = default; virtual void Output(const wxString& str) override; }; diff --git a/include/wx/msw/accel.h b/include/wx/msw/accel.h index d690624262..f26c09f9e7 100644 --- a/include/wx/msw/accel.h +++ b/include/wx/msw/accel.h @@ -20,7 +20,7 @@ class WXDLLIMPEXP_CORE wxAcceleratorTable : public wxObject { public: // default ctor - wxAcceleratorTable() { } + wxAcceleratorTable() = default; // load from .rc resource (Windows specific) wxAcceleratorTable(const wxString& resource); diff --git a/include/wx/msw/bitmap.h b/include/wx/msw/bitmap.h index c35d9e1661..403e6e91c1 100644 --- a/include/wx/msw/bitmap.h +++ b/include/wx/msw/bitmap.h @@ -38,7 +38,7 @@ class WXDLLIMPEXP_CORE wxBitmap : public wxGDIImage, { public: // default ctor creates an invalid bitmap, you must Create() it later - wxBitmap() { } + wxBitmap() = default; // Initialize with raw data wxBitmap(const char bits[], int width, int height, int depth = 1); @@ -292,7 +292,7 @@ protected: class WXDLLIMPEXP_CORE wxBitmapHandler : public wxGDIImageHandler { public: - wxBitmapHandler() { } + wxBitmapHandler() = default; wxBitmapHandler(const wxString& name, const wxString& ext, wxBitmapType type) : wxGDIImageHandler(name, ext, type) { } diff --git a/include/wx/msw/bmpbuttn.h b/include/wx/msw/bmpbuttn.h index 325816a05e..c6a83b299c 100644 --- a/include/wx/msw/bmpbuttn.h +++ b/include/wx/msw/bmpbuttn.h @@ -17,7 +17,7 @@ class WXDLLIMPEXP_CORE wxBitmapButton : public wxBitmapButtonBase { public: - wxBitmapButton() {} + wxBitmapButton() = default; wxBitmapButton(wxWindow *parent, wxWindowID id, diff --git a/include/wx/msw/control.h b/include/wx/msw/control.h index 2816d3e3ea..80cbfa4ccd 100644 --- a/include/wx/msw/control.h +++ b/include/wx/msw/control.h @@ -16,7 +16,7 @@ class WXDLLIMPEXP_CORE wxControl : public wxControlBase { public: - wxControl() { } + wxControl() = default; wxControl(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, diff --git a/include/wx/msw/ctrlsub.h b/include/wx/msw/ctrlsub.h index 3c658bc4d5..24889456cc 100644 --- a/include/wx/msw/ctrlsub.h +++ b/include/wx/msw/ctrlsub.h @@ -17,7 +17,7 @@ class WXDLLIMPEXP_CORE wxControlWithItems : public wxControlWithItemsBase { public: - wxControlWithItems() { } + wxControlWithItems() = default; protected: // preallocate memory for inserting the given new items into the control diff --git a/include/wx/msw/datectrl.h b/include/wx/msw/datectrl.h index fb5998611c..afc696a88b 100644 --- a/include/wx/msw/datectrl.h +++ b/include/wx/msw/datectrl.h @@ -18,7 +18,7 @@ class WXDLLIMPEXP_ADV wxDatePickerCtrl : public wxDatePickerCtrlBase { public: // ctors - wxDatePickerCtrl() { } + wxDatePickerCtrl() = default; wxDatePickerCtrl(wxWindow *parent, wxWindowID id, diff --git a/include/wx/msw/enhmeta.h b/include/wx/msw/enhmeta.h index de48a71477..251ed9d69f 100644 --- a/include/wx/msw/enhmeta.h +++ b/include/wx/msw/enhmeta.h @@ -124,7 +124,7 @@ class WXDLLIMPEXP_CORE wxEnhMetaFileDataObject : public wxDataObject { public: // ctors - wxEnhMetaFileDataObject() { } + wxEnhMetaFileDataObject() = default; wxEnhMetaFileDataObject(const wxEnhMetaFile& metafile) : m_metafile(metafile) { } diff --git a/include/wx/msw/evtloop.h b/include/wx/msw/evtloop.h index 38bf94d430..d29c6d128a 100644 --- a/include/wx/msw/evtloop.h +++ b/include/wx/msw/evtloop.h @@ -20,7 +20,7 @@ class WXDLLIMPEXP_CORE wxGUIEventLoop : public wxMSWEventLoopBase { public: - wxGUIEventLoop() { } + wxGUIEventLoop() = default; // process a single message: calls PreProcessMessage() before dispatching // it diff --git a/include/wx/msw/evtloopconsole.h b/include/wx/msw/evtloopconsole.h index de1a176609..23b76ca1c6 100644 --- a/include/wx/msw/evtloopconsole.h +++ b/include/wx/msw/evtloopconsole.h @@ -53,7 +53,7 @@ private: class WXDLLIMPEXP_BASE wxConsoleEventLoop : public wxMSWEventLoopBase { public: - wxConsoleEventLoop() { } + wxConsoleEventLoop() = default; // override/implement base class virtuals virtual bool Dispatch() override; diff --git a/include/wx/msw/font.h b/include/wx/msw/font.h index d926252825..c2256808b3 100644 --- a/include/wx/msw/font.h +++ b/include/wx/msw/font.h @@ -20,7 +20,7 @@ class WXDLLIMPEXP_CORE wxFont : public wxFontBase { public: // ctors and such - wxFont() { } + wxFont() = default; wxFont(const wxFontInfo& info); diff --git a/include/wx/msw/gauge.h b/include/wx/msw/gauge.h index 3180f1bee0..38af6700a7 100644 --- a/include/wx/msw/gauge.h +++ b/include/wx/msw/gauge.h @@ -18,7 +18,7 @@ extern WXDLLIMPEXP_DATA_CORE(const char) wxGaugeNameStr[]; class WXDLLIMPEXP_CORE wxGauge : public wxGaugeBase { public: - wxGauge() { } + wxGauge() = default; wxGauge(wxWindow *parent, wxWindowID id, diff --git a/include/wx/msw/helpwin.h b/include/wx/msw/helpwin.h index 18f5c664dc..d93238fd53 100644 --- a/include/wx/msw/helpwin.h +++ b/include/wx/msw/helpwin.h @@ -22,7 +22,7 @@ class WXDLLIMPEXP_CORE wxWinHelpController: public wxHelpControllerBase public: wxWinHelpController(wxWindow* parentWindow = nullptr): wxHelpControllerBase(parentWindow) {} - virtual ~wxWinHelpController() {} + virtual ~wxWinHelpController() = default; // Must call this to set the filename virtual bool Initialize(const wxString& file) override; diff --git a/include/wx/msw/hyperlink.h b/include/wx/msw/hyperlink.h index 86f5bd02de..c17aacd962 100644 --- a/include/wx/msw/hyperlink.h +++ b/include/wx/msw/hyperlink.h @@ -20,7 +20,7 @@ class WXDLLIMPEXP_ADV wxHyperlinkCtrl : public wxGenericHyperlinkCtrl { public: // Default constructor (for two-step construction). - wxHyperlinkCtrl() { } + wxHyperlinkCtrl() = default; // Constructor. wxHyperlinkCtrl(wxWindow *parent, diff --git a/include/wx/msw/icon.h b/include/wx/msw/icon.h index a2e68214ff..bb13e27d98 100644 --- a/include/wx/msw/icon.h +++ b/include/wx/msw/icon.h @@ -25,7 +25,7 @@ class WXDLLIMPEXP_CORE wxIconRefData : public wxGDIImageRefData { public: - wxIconRefData() { } + wxIconRefData() = default; virtual ~wxIconRefData() { Free(); } virtual void Free() override; @@ -40,7 +40,7 @@ class WXDLLIMPEXP_CORE wxIcon : public wxGDIImage public: // ctors // default - wxIcon() { } + wxIcon() = default; // from raw data wxIcon(const char bits[], int width, int height); diff --git a/include/wx/msw/mimetype.h b/include/wx/msw/mimetype.h index 0d22a5167b..2cba9dd908 100644 --- a/include/wx/msw/mimetype.h +++ b/include/wx/msw/mimetype.h @@ -25,7 +25,7 @@ class WXDLLIMPEXP_BASE wxFileTypeImpl { public: // ctor - wxFileTypeImpl() { } + wxFileTypeImpl() = default; // one of these Init() function must be called (ctor can't take any // arguments because it's common) @@ -118,7 +118,7 @@ class WXDLLIMPEXP_BASE wxMimeTypesManagerImpl public: // nothing to do here, we don't load any data but just go and fetch it from // the registry when asked for - wxMimeTypesManagerImpl() { } + wxMimeTypesManagerImpl() = default; // implement containing class functions wxFileType *GetFileTypeFromExtension(const wxString& ext); diff --git a/include/wx/msw/minifram.h b/include/wx/msw/minifram.h index 4a3e48b1a4..e340ac3559 100644 --- a/include/wx/msw/minifram.h +++ b/include/wx/msw/minifram.h @@ -15,7 +15,7 @@ class WXDLLIMPEXP_CORE wxMiniFrame : public wxFrame { public: - wxMiniFrame() { } + wxMiniFrame() = default; bool Create(wxWindow *parent, wxWindowID id, diff --git a/include/wx/msw/ole/dataobj2.h b/include/wx/msw/ole/dataobj2.h index 60bafc9c81..eb501a3621 100644 --- a/include/wx/msw/ole/dataobj2.h +++ b/include/wx/msw/ole/dataobj2.h @@ -92,7 +92,7 @@ private: class WXDLLIMPEXP_CORE wxFileDataObject : public wxFileDataObjectBase { public: - wxFileDataObject() { } + wxFileDataObject() = default; // implement base class pure virtuals virtual bool SetData(size_t len, const void *buf) override; diff --git a/include/wx/msw/ownerdrawnbutton.h b/include/wx/msw/ownerdrawnbutton.h index 0e49439f42..e243a987ad 100644 --- a/include/wx/msw/ownerdrawnbutton.h +++ b/include/wx/msw/ownerdrawnbutton.h @@ -37,7 +37,7 @@ protected: // has virtual functions, but no virtual destructor without making the dtor // virtual which is not needed here as objects are never deleted via // pointers to this class (and protected dtor enforces this). - ~wxMSWOwnerDrawnButtonBase() { } + ~wxMSWOwnerDrawnButtonBase() = default; // Make the control owner drawn if necessary to implement support for the // given foreground colour. diff --git a/include/wx/msw/ownerdrw.h b/include/wx/msw/ownerdrw.h index b387138525..4f8bdcd1c2 100644 --- a/include/wx/msw/ownerdrw.h +++ b/include/wx/msw/ownerdrw.h @@ -15,8 +15,8 @@ class WXDLLIMPEXP_CORE wxOwnerDrawn : public wxOwnerDrawnBase { public: - wxOwnerDrawn() {} - virtual ~wxOwnerDrawn() {} + wxOwnerDrawn() = default; + virtual ~wxOwnerDrawn() = default; virtual bool OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODStatus stat) override; diff --git a/include/wx/msw/palette.h b/include/wx/msw/palette.h index 65c71f1e72..6de1231bd5 100644 --- a/include/wx/msw/palette.h +++ b/include/wx/msw/palette.h @@ -15,7 +15,7 @@ class WXDLLIMPEXP_CORE wxPalette : public wxPaletteBase { public: - wxPalette() { } + wxPalette() = default; wxPalette(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue) { diff --git a/include/wx/msw/pen.h b/include/wx/msw/pen.h index 09d4013a39..e0e6359897 100644 --- a/include/wx/msw/pen.h +++ b/include/wx/msw/pen.h @@ -21,14 +21,14 @@ class WXDLLIMPEXP_CORE wxPen : public wxPenBase { public: - wxPen() { } + wxPen() = default; wxPen(const wxColour& col, int width = 1, wxPenStyle style = wxPENSTYLE_SOLID); wxPen(const wxBitmap& stipple, int width); wxPen(const wxPenInfo& info); - virtual ~wxPen() { } + virtual ~wxPen() = default; bool operator==(const wxPen& pen) const; bool operator!=(const wxPen& pen) const { return !(*this == pen); } diff --git a/include/wx/msw/private/comstream.h b/include/wx/msw/private/comstream.h index bff46e6fa8..f0e78d048b 100644 --- a/include/wx/msw/private/comstream.h +++ b/include/wx/msw/private/comstream.h @@ -19,7 +19,7 @@ public: m_stream(stream) { } - virtual ~wxCOMBaseStreamAdapter() { } + virtual ~wxCOMBaseStreamAdapter() = default; // IUnknown STDMETHODIMP QueryInterface(REFIID riid, void** ppv) override diff --git a/include/wx/msw/private/webview_ie.h b/include/wx/msw/private/webview_ie.h index 3259d7a31d..94ada3d396 100644 --- a/include/wx/msw/private/webview_ie.h +++ b/include/wx/msw/private/webview_ie.h @@ -85,7 +85,7 @@ protected: public: VirtualProtocol(wxSharedPtr handler); - virtual ~VirtualProtocol() {} + virtual ~VirtualProtocol() = default; //IUnknown DECLARE_IUNKNOWN_METHODS; @@ -142,7 +142,7 @@ class ClassFactory : public IClassFactory public: ClassFactory(wxSharedPtr handler) : m_handler(handler) { AddRef(); } - virtual ~ClassFactory() {} + virtual ~ClassFactory() = default; wxString GetName() { return m_handler->GetName(); } @@ -172,7 +172,7 @@ class DocHostUIHandler : public wxIDocHostUIHandler { public: DocHostUIHandler(wxWebView* browser) { m_browser = browser; } - virtual ~DocHostUIHandler() {} + virtual ~DocHostUIHandler() = default; virtual HRESULT wxSTDCALL ShowContextMenu(DWORD dwID, POINT *ppt, IUnknown *pcmdtReserved, diff --git a/include/wx/msw/regconf.h b/include/wx/msw/regconf.h index f705a75b4b..30b13cab29 100644 --- a/include/wx/msw/regconf.h +++ b/include/wx/msw/regconf.h @@ -35,7 +35,7 @@ public: long style = wxCONFIG_USE_GLOBAL_FILE); // dtor will save unsaved data - virtual ~wxRegConfig(){} + virtual ~wxRegConfig() = default; // implement inherited pure virtual functions // ------------------------------------------ diff --git a/include/wx/msw/spinbutt.h b/include/wx/msw/spinbutt.h index a5fcad5cbd..4aee05dfa0 100644 --- a/include/wx/msw/spinbutt.h +++ b/include/wx/msw/spinbutt.h @@ -19,7 +19,7 @@ class WXDLLIMPEXP_CORE wxSpinButton : public wxSpinButtonBase { public: // construction - wxSpinButton() { } + wxSpinButton() = default; wxSpinButton(wxWindow *parent, wxWindowID id = wxID_ANY, diff --git a/include/wx/msw/stackwalk.h b/include/wx/msw/stackwalk.h index 6d963612f5..69a1a6a1c7 100644 --- a/include/wx/msw/stackwalk.h +++ b/include/wx/msw/stackwalk.h @@ -89,7 +89,7 @@ class WXDLLIMPEXP_BASE wxStackWalker : public wxStackWalkerBase public: // we don't use ctor argument, it is for compatibility with Unix version // only - wxStackWalker(const char * WXUNUSED(argv0) = nullptr) { } + wxStackWalker(const char * WXUNUSED(argv0) = nullptr) {} virtual void Walk(size_t skip = 1, size_t maxDepth = wxSTACKWALKER_MAX_DEPTH) override; #if wxUSE_ON_FATAL_EXCEPTION diff --git a/include/wx/msw/statline.h b/include/wx/msw/statline.h index c57eb01408..fa1ed2fb0c 100644 --- a/include/wx/msw/statline.h +++ b/include/wx/msw/statline.h @@ -18,7 +18,7 @@ class WXDLLIMPEXP_CORE wxStaticLine : public wxStaticLineBase { public: // constructors and pseudo-constructors - wxStaticLine() { } + wxStaticLine() = default; wxStaticLine( wxWindow *parent, wxWindowID id = wxID_ANY, diff --git a/include/wx/msw/stattext.h b/include/wx/msw/stattext.h index f32b6aa6a8..7c1b0ff08d 100644 --- a/include/wx/msw/stattext.h +++ b/include/wx/msw/stattext.h @@ -13,7 +13,7 @@ class WXDLLIMPEXP_CORE wxStaticText : public wxStaticTextBase { public: - wxStaticText() { } + wxStaticText() = default; wxStaticText(wxWindow *parent, wxWindowID id, diff --git a/include/wx/msw/tglbtn.h b/include/wx/msw/tglbtn.h index b2fa1b980e..f4b27debf6 100644 --- a/include/wx/msw/tglbtn.h +++ b/include/wx/msw/tglbtn.h @@ -73,7 +73,7 @@ class WXDLLIMPEXP_CORE wxBitmapToggleButton: public wxToggleButton { public: // construction/destruction - wxBitmapToggleButton() {} + wxBitmapToggleButton() = default; wxBitmapToggleButton(wxWindow *parent, wxWindowID id, const wxBitmapBundle& label, diff --git a/include/wx/msw/timectrl.h b/include/wx/msw/timectrl.h index 3adbf42af1..dd8da5bff2 100644 --- a/include/wx/msw/timectrl.h +++ b/include/wx/msw/timectrl.h @@ -18,7 +18,7 @@ class WXDLLIMPEXP_ADV wxTimePickerCtrl : public wxTimePickerCtrlBase { public: // ctors - wxTimePickerCtrl() { } + wxTimePickerCtrl() = default; wxTimePickerCtrl(wxWindow *parent, wxWindowID id, diff --git a/include/wx/msw/webview_ie.h b/include/wx/msw/webview_ie.h index faaf2bac45..4dda18bdc6 100644 --- a/include/wx/msw/webview_ie.h +++ b/include/wx/msw/webview_ie.h @@ -47,7 +47,7 @@ class WXDLLIMPEXP_WEBVIEW wxWebViewIE : public wxWebView { public: - wxWebViewIE() {} + wxWebViewIE() = default; wxWebViewIE(wxWindow* parent, wxWindowID id, diff --git a/include/wx/msw/wrl/event.h b/include/wx/msw/wrl/event.h index c01d3c0bcf..fd924d287f 100644 --- a/include/wx/msw/wrl/event.h +++ b/include/wx/msw/wrl/event.h @@ -17,7 +17,7 @@ class CInvokable : public baseT { public: CInvokable() : m_nRefCount(0) {} - virtual ~CInvokable() {} + virtual ~CInvokable() = default; // IUnknown methods HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObj) override { diff --git a/include/wx/nativewin.h b/include/wx/nativewin.h index 984b9b573e..6f3e631cec 100644 --- a/include/wx/nativewin.h +++ b/include/wx/nativewin.h @@ -136,7 +136,7 @@ class WXDLLIMPEXP_CORE wxNativeContainerWindow : public wxTopLevelWindow { public: // default ctor, call Create() later - wxNativeContainerWindow() { } + wxNativeContainerWindow() = default; // create a window from an existing native window handle // diff --git a/include/wx/notebook.h b/include/wx/notebook.h index b59fd4fad4..69c4ffa33c 100644 --- a/include/wx/notebook.h +++ b/include/wx/notebook.h @@ -63,7 +63,7 @@ class WXDLLEXPORT wxNotebookPageInfo : public wxObject { public: wxNotebookPageInfo() { m_page = nullptr; m_imageId = -1; m_selected = false; } - virtual ~wxNotebookPageInfo() { } + virtual ~wxNotebookPageInfo() = default; bool Create(wxNotebookPage *page, const wxString& text, @@ -105,7 +105,7 @@ public: // ctors // ----- - wxNotebookBase() { } + wxNotebookBase() = default; // wxNotebook-specific additions to wxBookCtrlBase interface // --------------------------------------------------------- diff --git a/include/wx/object.h b/include/wx/object.h index bda5386e8a..4ce9e0f8e6 100644 --- a/include/wx/object.h +++ b/include/wx/object.h @@ -202,7 +202,7 @@ public: protected: // this object should never be destroyed directly but only as a // result of a DecRef() call: - virtual ~wxRefCounter() { } + virtual ~wxRefCounter() = default; private: // our refcount: diff --git a/include/wx/osx/anybutton.h b/include/wx/osx/anybutton.h index 6b14793fde..2c75c26fda 100644 --- a/include/wx/osx/anybutton.h +++ b/include/wx/osx/anybutton.h @@ -14,7 +14,7 @@ class WXDLLIMPEXP_CORE wxAnyButton : public wxAnyButtonBase { public: - wxAnyButton() {} + wxAnyButton() = default; static wxSize GetDefaultSize(); diff --git a/include/wx/osx/bitmap.h b/include/wx/osx/bitmap.h index 275b4c8b22..107ac76291 100644 --- a/include/wx/osx/bitmap.h +++ b/include/wx/osx/bitmap.h @@ -85,7 +85,7 @@ class WXDLLIMPEXP_CORE wxBitmap: public wxBitmapBase friend class WXDLLIMPEXP_FWD_CORE wxBitmapHandler; public: - wxBitmap() {} // Platform-specific + wxBitmap() = default; // Platform-specific // Initialize with raw data. wxBitmap(const char bits[], int width, int height, int depth = 1); @@ -123,7 +123,7 @@ public: wxBitmap(const wxCursor &cursor); #endif - virtual ~wxBitmap() {} + virtual ~wxBitmap() = default; wxImage ConvertToImage() const override; diff --git a/include/wx/osx/button.h b/include/wx/osx/button.h index 12e6399c84..c1889ae46d 100644 --- a/include/wx/osx/button.h +++ b/include/wx/osx/button.h @@ -17,7 +17,7 @@ class WXDLLIMPEXP_CORE wxButton : public wxButtonBase { public: - wxButton() {} + wxButton() = default; wxButton(wxWindow *parent, wxWindowID id, const wxString& label = wxEmptyString, diff --git a/include/wx/osx/carbon/region.h b/include/wx/osx/carbon/region.h index 493af2b8b1..c9974a18f0 100644 --- a/include/wx/osx/carbon/region.h +++ b/include/wx/osx/carbon/region.h @@ -15,7 +15,7 @@ class WXDLLIMPEXP_CORE wxRegion : public wxRegionWithCombine { public: - wxRegion() { } + wxRegion() = default; wxRegion(long x, long y, long w, long h); wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight); wxRegion(const wxRect& rect); diff --git a/include/wx/osx/checkbox.h b/include/wx/osx/checkbox.h index 3c944419f6..5ae72da62d 100644 --- a/include/wx/osx/checkbox.h +++ b/include/wx/osx/checkbox.h @@ -14,7 +14,7 @@ class WXDLLIMPEXP_CORE wxCheckBox : public wxCheckBoxBase { public: - wxCheckBox() { } + wxCheckBox() = default; wxCheckBox(wxWindow *parent, wxWindowID id, const wxString& label, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, diff --git a/include/wx/osx/cocoa/private/textimpl.h b/include/wx/osx/cocoa/private/textimpl.h index c7d0093d74..c07fbedcd1 100644 --- a/include/wx/osx/cocoa/private/textimpl.h +++ b/include/wx/osx/cocoa/private/textimpl.h @@ -28,7 +28,7 @@ public : wxTextWidgetImpl(entry) { } - virtual ~wxNSTextBase() { } + virtual ~wxNSTextBase() = default; virtual bool ShouldHandleKeyNavigation(const wxKeyEvent &event) const override; diff --git a/include/wx/osx/combobox.h b/include/wx/osx/combobox.h index 54dbe820db..32008b2c87 100644 --- a/include/wx/osx/combobox.h +++ b/include/wx/osx/combobox.h @@ -37,7 +37,7 @@ class WXDLLIMPEXP_CORE wxComboBox : virtual void DelegateTextChanged( const wxString& value ); virtual void DelegateChoice( const wxString& value ); - wxComboBox() { } + wxComboBox() = default; wxComboBox(wxWindow *parent, wxWindowID id, const wxString& value = wxEmptyString, diff --git a/include/wx/osx/core/cfdataref.h b/include/wx/osx/core/cfdataref.h index e72e40be54..1803e96297 100644 --- a/include/wx/osx/core/cfdataref.h +++ b/include/wx/osx/core/cfdataref.h @@ -27,8 +27,7 @@ public: /*! @method wxCFDataRef @abstract Creates a null data ref */ - wxCFDataRef() - {} + wxCFDataRef() = default; typedef wxCFRef super_type; diff --git a/include/wx/osx/core/colour.h b/include/wx/osx/core/colour.h index 2db90ed5ab..0346a64f27 100644 --- a/include/wx/osx/core/colour.h +++ b/include/wx/osx/core/colour.h @@ -83,8 +83,8 @@ private: class wxColourRefData : public wxGDIRefData { public: - wxColourRefData() {} - virtual ~wxColourRefData() {} + wxColourRefData() = default; + virtual ~wxColourRefData() = default; virtual double Red() const = 0; virtual double Green() const = 0; diff --git a/include/wx/osx/core/private.h b/include/wx/osx/core/private.h index 7017e47cf8..1421ba6f56 100644 --- a/include/wx/osx/core/private.h +++ b/include/wx/osx/core/private.h @@ -615,14 +615,14 @@ protected : class WXDLLIMPEXP_CORE wxListWidgetColumn { public : - virtual ~wxListWidgetColumn() {} + virtual ~wxListWidgetColumn() = default; } ; class WXDLLIMPEXP_CORE wxListWidgetCellValue { public : - wxListWidgetCellValue() {} - virtual ~wxListWidgetCellValue() {} + wxListWidgetCellValue() = default; + virtual ~wxListWidgetCellValue() = default; virtual void Set( CFStringRef value ) = 0; virtual void Set( const wxString& value ) = 0; @@ -637,8 +637,8 @@ public : class WXDLLIMPEXP_CORE wxListWidgetImpl { public: - wxListWidgetImpl() {} - virtual ~wxListWidgetImpl() { } + wxListWidgetImpl() = default; + virtual ~wxListWidgetImpl() = default; virtual wxListWidgetColumn* InsertTextColumn( unsigned pos, const wxString& title, bool editable = false, wxAlignment just = wxALIGN_LEFT , int defaultWidth = -1) = 0 ; @@ -693,7 +693,7 @@ public : // our ctor and implement GetTextEntry() ourselves. wxTextWidgetImpl(wxTextEntry *entry) : m_entry(entry) {} - virtual ~wxTextWidgetImpl() {} + virtual ~wxTextWidgetImpl() = default; wxTextEntry *GetTextEntry() const { return m_entry; } @@ -765,9 +765,9 @@ class WXDLLIMPEXP_CORE wxComboWidgetImpl { public : - wxComboWidgetImpl() {} + wxComboWidgetImpl() = default; - virtual ~wxComboWidgetImpl() {} + virtual ~wxComboWidgetImpl() = default; virtual int GetSelectedItem() const { return -1; } virtual void SetSelectedItem(int WXUNUSED(item)) {} @@ -795,9 +795,9 @@ class WXDLLIMPEXP_CORE wxChoiceWidgetImpl { public : - wxChoiceWidgetImpl() {} + wxChoiceWidgetImpl() = default; - virtual ~wxChoiceWidgetImpl() {} + virtual ~wxChoiceWidgetImpl() = default; virtual int GetSelectedItem() const { return -1; } @@ -829,8 +829,8 @@ public : class wxButtonImpl { public : - wxButtonImpl(){} - virtual ~wxButtonImpl(){} + wxButtonImpl() = default; + virtual ~wxButtonImpl() = default; virtual void SetPressedBitmap( const wxBitmapBundle& bitmap ) = 0; } ; @@ -842,8 +842,8 @@ class wxButtonImpl class wxSearchWidgetImpl { public : - wxSearchWidgetImpl(){} - virtual ~wxSearchWidgetImpl(){} + wxSearchWidgetImpl() = default; + virtual ~wxSearchWidgetImpl() = default; // search field options virtual void ShowSearchButton( bool show ) = 0; diff --git a/include/wx/osx/core/private/datetimectrl.h b/include/wx/osx/core/private/datetimectrl.h index 213e047c69..e629c0ed0f 100644 --- a/include/wx/osx/core/private/datetimectrl.h +++ b/include/wx/osx/core/private/datetimectrl.h @@ -48,7 +48,7 @@ public: virtual void SetDateRange(const wxDateTime& dt1, const wxDateTime& dt2) = 0; virtual bool GetDateRange(wxDateTime* dt1, wxDateTime* dt2) = 0; - virtual ~wxDateTimeWidgetImpl() { } + virtual ~wxDateTimeWidgetImpl() = default; protected: #if wxOSX_USE_COCOA diff --git a/include/wx/osx/dataobj.h b/include/wx/osx/dataobj.h index 26f0277546..a65675b8cd 100644 --- a/include/wx/osx/dataobj.h +++ b/include/wx/osx/dataobj.h @@ -17,7 +17,7 @@ class WXDLLIMPEXP_CORE wxDataObject : public wxDataObjectBase { public: wxDataObject(); - virtual ~wxDataObject() { } + virtual ~wxDataObject() = default; virtual bool IsSupportedFormat( const wxDataFormat& format, Direction dir = Get ) const; diff --git a/include/wx/osx/datectrl.h b/include/wx/osx/datectrl.h index 6ba2652ea5..c5c6a8a54b 100644 --- a/include/wx/osx/datectrl.h +++ b/include/wx/osx/datectrl.h @@ -18,7 +18,7 @@ class WXDLLIMPEXP_ADV wxDatePickerCtrl : public wxDatePickerCtrlBase { public: // Constructors. - wxDatePickerCtrl() { } + wxDatePickerCtrl() = default; wxDatePickerCtrl(wxWindow *parent, wxWindowID id, diff --git a/include/wx/osx/font.h b/include/wx/osx/font.h index 1b4385dc2b..4ba8c44eb6 100644 --- a/include/wx/osx/font.h +++ b/include/wx/osx/font.h @@ -34,7 +34,7 @@ class WXDLLIMPEXP_CORE wxFont : public wxFontBase { public: // ctors and such - wxFont() { } + wxFont() = default; wxFont(const wxFontInfo& info); diff --git a/include/wx/osx/frame.h b/include/wx/osx/frame.h index 84f08aa6bb..323ec1fa38 100644 --- a/include/wx/osx/frame.h +++ b/include/wx/osx/frame.h @@ -20,7 +20,7 @@ class WXDLLIMPEXP_CORE wxFrame: public wxFrameBase { public: // construction - wxFrame() { } + wxFrame() = default; wxFrame(wxWindow *parent, wxWindowID id, const wxString& title, diff --git a/include/wx/osx/gauge.h b/include/wx/osx/gauge.h index b5f75a95f2..0b7390af8b 100644 --- a/include/wx/osx/gauge.h +++ b/include/wx/osx/gauge.h @@ -16,7 +16,7 @@ class WXDLLIMPEXP_CORE wxGauge: public wxGaugeBase { public: - wxGauge() { } + wxGauge() = default; wxGauge(wxWindow *parent, wxWindowID id, int range, diff --git a/include/wx/osx/mdi.h b/include/wx/osx/mdi.h index 743fcc417f..46d07e755c 100644 --- a/include/wx/osx/mdi.h +++ b/include/wx/osx/mdi.h @@ -138,7 +138,7 @@ protected: class WXDLLIMPEXP_CORE wxMDIClientWindow : public wxMDIClientWindowBase { public: - wxMDIClientWindow() { } + wxMDIClientWindow() = default; virtual ~wxMDIClientWindow(); virtual bool CreateClient(wxMDIParentFrame *parent, diff --git a/include/wx/osx/minifram.h b/include/wx/osx/minifram.h index df1eacd654..4f2cf68cec 100644 --- a/include/wx/osx/minifram.h +++ b/include/wx/osx/minifram.h @@ -19,7 +19,7 @@ class WXDLLIMPEXP_CORE wxMiniFrame: public wxFrame { wxDECLARE_DYNAMIC_CLASS(wxMiniFrame); public: - wxMiniFrame() {} + wxMiniFrame() = default; wxMiniFrame(wxWindow *parent, wxWindowID id, const wxString& title, @@ -32,7 +32,7 @@ public: Create(parent, id, title, pos, size, style | wxFRAME_TOOL_WINDOW | wxFRAME_FLOAT_ON_PARENT , name); } - virtual ~wxMiniFrame() {} + virtual ~wxMiniFrame() = default; protected: }; diff --git a/include/wx/osx/notebook.h b/include/wx/osx/notebook.h index 31d5bf4979..3d52ad4cde 100644 --- a/include/wx/osx/notebook.h +++ b/include/wx/osx/notebook.h @@ -32,7 +32,7 @@ public: // ctors // ----- // default for dynamic class - wxNotebook() { } + wxNotebook() = default; // the same arguments as for wxControl (@@@ any special styles?) wxNotebook(wxWindow *parent, wxWindowID id, diff --git a/include/wx/osx/popupwin.h b/include/wx/osx/popupwin.h index 29778f59e3..12456fad8a 100644 --- a/include/wx/osx/popupwin.h +++ b/include/wx/osx/popupwin.h @@ -17,7 +17,7 @@ class WXDLLIMPEXP_CORE wxPopupWindow : public wxPopupWindowBase { public: - wxPopupWindow() { } + wxPopupWindow() = default; ~wxPopupWindow(); wxPopupWindow(wxWindow *parent, int flags = wxBORDER_NONE) diff --git a/include/wx/osx/radiobut.h b/include/wx/osx/radiobut.h index 35bd2b7d0f..1261792518 100644 --- a/include/wx/osx/radiobut.h +++ b/include/wx/osx/radiobut.h @@ -15,7 +15,7 @@ class WXDLLIMPEXP_CORE wxRadioButton: public wxRadioButtonBase wxDECLARE_DYNAMIC_CLASS(wxRadioButton); public: - wxRadioButton() {} + wxRadioButton() = default; wxRadioButton(wxWindow *parent, wxWindowID id, const wxString& label, const wxPoint& pos = wxDefaultPosition, diff --git a/include/wx/osx/statbmp.h b/include/wx/osx/statbmp.h index a657fb5dae..04ddb8e986 100644 --- a/include/wx/osx/statbmp.h +++ b/include/wx/osx/statbmp.h @@ -6,7 +6,7 @@ class WXDLLIMPEXP_CORE wxStaticBitmap : public wxStaticBitmapBase { public: - wxStaticBitmap() {} + wxStaticBitmap() = default; wxStaticBitmap(wxWindow *parent, wxWindowID id, const wxBitmapBundle& bitmap, diff --git a/include/wx/osx/statbox.h b/include/wx/osx/statbox.h index 15106cda40..6879164aca 100644 --- a/include/wx/osx/statbox.h +++ b/include/wx/osx/statbox.h @@ -15,7 +15,7 @@ class WXDLLIMPEXP_CORE wxStaticBox : public wxStaticBoxBase wxDECLARE_DYNAMIC_CLASS(wxStaticBox); public: - wxStaticBox() {} + wxStaticBox() = default; wxStaticBox(wxWindow *parent, wxWindowID id, const wxString& label, const wxPoint& pos = wxDefaultPosition, diff --git a/include/wx/osx/stattext.h b/include/wx/osx/stattext.h index 425f4a98e3..654ccb5024 100644 --- a/include/wx/osx/stattext.h +++ b/include/wx/osx/stattext.h @@ -13,7 +13,7 @@ class WXDLLIMPEXP_CORE wxStaticText: public wxStaticTextBase { public: - wxStaticText() { } + wxStaticText() = default; wxStaticText(wxWindow *parent, wxWindowID id, const wxString& label, diff --git a/include/wx/osx/tglbtn.h b/include/wx/osx/tglbtn.h index 80727032a8..d454dc7d33 100644 --- a/include/wx/osx/tglbtn.h +++ b/include/wx/osx/tglbtn.h @@ -14,7 +14,7 @@ class WXDLLIMPEXP_CORE wxToggleButton : public wxToggleButtonBase { public: - wxToggleButton() {} + wxToggleButton() = default; wxToggleButton(wxWindow *parent, wxWindowID id, const wxString& label, @@ -54,7 +54,7 @@ private: class WXDLLIMPEXP_CORE wxBitmapToggleButton : public wxToggleButton { public: - wxBitmapToggleButton() {} + wxBitmapToggleButton() = default; wxBitmapToggleButton(wxWindow *parent, wxWindowID id, const wxBitmapBundle& label, diff --git a/include/wx/osx/timectrl.h b/include/wx/osx/timectrl.h index a5ad4ad0b4..ee47865738 100644 --- a/include/wx/osx/timectrl.h +++ b/include/wx/osx/timectrl.h @@ -18,7 +18,7 @@ class WXDLLIMPEXP_ADV wxTimePickerCtrl : public wxTimePickerCtrlBase { public: // Constructors. - wxTimePickerCtrl() { } + wxTimePickerCtrl() = default; wxTimePickerCtrl(wxWindow *parent, wxWindowID id, diff --git a/include/wx/ownerdrw.h b/include/wx/ownerdrw.h index 4dfc30b47c..5ae728fe71 100644 --- a/include/wx/ownerdrw.h +++ b/include/wx/ownerdrw.h @@ -38,7 +38,7 @@ public: m_margin = ms_defaultMargin; } - virtual ~wxOwnerDrawnBase() {} + virtual ~wxOwnerDrawnBase() = default; void SetFont(const wxFont& font) { m_font = font; m_ownerDrawn = true; } diff --git a/include/wx/palette.h b/include/wx/palette.h index 83cb865d81..ff2be02688 100644 --- a/include/wx/palette.h +++ b/include/wx/palette.h @@ -21,7 +21,7 @@ class WXDLLIMPEXP_CORE wxPaletteBase: public wxGDIObject { public: - virtual ~wxPaletteBase() { } + virtual ~wxPaletteBase() = default; virtual int GetColoursCount() const { wxFAIL_MSG( wxT("not implemented") ); return 0; } }; diff --git a/include/wx/panel.h b/include/wx/panel.h index 4704c1f466..e12527d6ec 100644 --- a/include/wx/panel.h +++ b/include/wx/panel.h @@ -27,7 +27,7 @@ extern WXDLLIMPEXP_DATA_CORE(const char) wxPanelNameStr[]; class WXDLLIMPEXP_CORE wxPanel : public wxNavigationEnabled { public: - wxPanel() { } + wxPanel() = default; wxPanel(wxWindow *parent, wxWindowID winid = wxID_ANY, diff --git a/include/wx/pen.h b/include/wx/pen.h index df637f9e2c..6ae4df8f62 100644 --- a/include/wx/pen.h +++ b/include/wx/pen.h @@ -62,7 +62,7 @@ private: class WXDLLIMPEXP_CORE wxPenBase : public wxGDIObject { public: - virtual ~wxPenBase() { } + virtual ~wxPenBase() = default; virtual void SetColour(const wxColour& col) = 0; virtual void SetColour(unsigned char r, unsigned char g, unsigned char b) = 0; diff --git a/include/wx/persist.h b/include/wx/persist.h index 6caf660d6b..a1d33724ae 100644 --- a/include/wx/persist.h +++ b/include/wx/persist.h @@ -185,7 +185,7 @@ public: wxPersistentObject(void *obj) : m_obj(obj) { } // trivial but virtual dtor - virtual ~wxPersistentObject() { } + virtual ~wxPersistentObject() = default; // methods used by wxPersistenceManager diff --git a/include/wx/pickerbase.h b/include/wx/pickerbase.h index 4957216343..3bfcac1f2f 100644 --- a/include/wx/pickerbase.h +++ b/include/wx/pickerbase.h @@ -37,7 +37,7 @@ public: // ctor: text is the associated text control wxPickerBase() : m_text(nullptr), m_picker(nullptr), m_sizer(nullptr) { } - virtual ~wxPickerBase() {} + virtual ~wxPickerBase() = default; // if present, intercepts wxPB_USE_TEXTCTRL style and creates the text control diff --git a/include/wx/popupwin.h b/include/wx/popupwin.h index 8a533922d0..8b19d76bd8 100644 --- a/include/wx/popupwin.h +++ b/include/wx/popupwin.h @@ -33,7 +33,7 @@ class WXDLLIMPEXP_CORE wxPopupWindowBase : public wxNonOwnedWindow { public: - wxPopupWindowBase() { } + wxPopupWindowBase() = default; virtual ~wxPopupWindowBase(); // create the popup window @@ -125,7 +125,7 @@ class WXDLLIMPEXP_CORE wxPopupTransientWindow : public wxPopupTransientWindowBas { public: // ctors - wxPopupTransientWindow() { } + wxPopupTransientWindow() = default; wxPopupTransientWindow(wxWindow *parent, int style = wxBORDER_NONE) { Create(parent, style); } diff --git a/include/wx/preferences.h b/include/wx/preferences.h index 10ed71ce4b..4a64b4a2f0 100644 --- a/include/wx/preferences.h +++ b/include/wx/preferences.h @@ -44,8 +44,8 @@ class wxPreferencesEditorImpl; class WXDLLIMPEXP_CORE wxPreferencesPage { public: - wxPreferencesPage() {} - virtual ~wxPreferencesPage() {} + wxPreferencesPage() = default; + virtual ~wxPreferencesPage() = default; // Name of the page, used e.g. for tabs virtual wxString GetName() const = 0; diff --git a/include/wx/printdlg.h b/include/wx/printdlg.h index 44f3d0daa2..75987eb882 100644 --- a/include/wx/printdlg.h +++ b/include/wx/printdlg.h @@ -27,7 +27,7 @@ class WXDLLIMPEXP_CORE wxPrintDialogBase : public wxDialog { public: - wxPrintDialogBase() { } + wxPrintDialogBase() = default; wxPrintDialogBase(wxWindow *parent, wxWindowID id = wxID_ANY, const wxString &title = wxEmptyString, @@ -76,7 +76,7 @@ private: class WXDLLIMPEXP_CORE wxPageSetupDialogBase: public wxDialog { public: - wxPageSetupDialogBase() { } + wxPageSetupDialogBase() = default; wxPageSetupDialogBase(wxWindow *parent, wxWindowID id = wxID_ANY, const wxString &title = wxEmptyString, diff --git a/include/wx/private/animate.h b/include/wx/private/animate.h index 3e85dd854b..d7fba1b815 100644 --- a/include/wx/private/animate.h +++ b/include/wx/private/animate.h @@ -17,8 +17,8 @@ class WXDLLIMPEXP_CORE wxAnimationImpl : public wxRefCounter { public: - wxAnimationImpl() {} - virtual ~wxAnimationImpl() {} + wxAnimationImpl() = default; + virtual ~wxAnimationImpl() = default; virtual bool IsOk() const = 0; virtual bool IsCompatibleWith(wxClassInfo* ci) const = 0; diff --git a/include/wx/private/display.h b/include/wx/private/display.h index 8950fa3e80..e6f5eff568 100644 --- a/include/wx/private/display.h +++ b/include/wx/private/display.h @@ -21,7 +21,7 @@ class wxDisplayFactory { public: - wxDisplayFactory() { } + wxDisplayFactory() = default; virtual ~wxDisplayFactory() { ClearImpls(); } // Create the display if necessary using CreateDisplay(), otherwise just @@ -104,7 +104,7 @@ class wxDisplayImpl { public: // virtual dtor for this base class - virtual ~wxDisplayImpl() { } + virtual ~wxDisplayImpl() = default; // return the full area of this display diff --git a/include/wx/private/eventloopsourcesmanager.h b/include/wx/private/eventloopsourcesmanager.h index 430a2f7f20..8416a1f471 100644 --- a/include/wx/private/eventloopsourcesmanager.h +++ b/include/wx/private/eventloopsourcesmanager.h @@ -21,7 +21,7 @@ public: virtual wxEventLoopSource* AddSourceForFD(int fd, wxEventLoopSourceHandler *handler, int flags) = 0; - virtual ~wxEventLoopSourcesManagerBase() { } + virtual ~wxEventLoopSourcesManagerBase() = default; }; #endif // wxUSE_EVENTLOOP_SOURCE diff --git a/include/wx/private/fdiodispatcher.h b/include/wx/private/fdiodispatcher.h index 14f951a96b..839da9f516 100644 --- a/include/wx/private/fdiodispatcher.h +++ b/include/wx/private/fdiodispatcher.h @@ -59,7 +59,7 @@ public: // -1 if an error occurred virtual int Dispatch(int timeout = TIMEOUT_INFINITE) = 0; - virtual ~wxFDIODispatcher() { } + virtual ~wxFDIODispatcher() = default; }; //entry for wxFDIOHandlerMap @@ -105,7 +105,7 @@ public: // unregister descriptor previously registered with RegisterFD() virtual bool UnregisterFD(int fd) override; - virtual ~wxMappedFDIODispatcher() { } + virtual ~wxMappedFDIODispatcher() = default; protected: // the fd -> handler map containing all the registered handlers diff --git a/include/wx/private/fdiohandler.h b/include/wx/private/fdiohandler.h index 94e36490cd..d356706cdf 100644 --- a/include/wx/private/fdiohandler.h +++ b/include/wx/private/fdiohandler.h @@ -41,7 +41,7 @@ public: // virtual dtor for the base class - virtual ~wxFDIOHandler() { } + virtual ~wxFDIOHandler() = default; private: int m_regmask; diff --git a/include/wx/private/fdiomanager.h b/include/wx/private/fdiomanager.h index 3532b7c6fe..34790852ea 100644 --- a/include/wx/private/fdiomanager.h +++ b/include/wx/private/fdiomanager.h @@ -35,7 +35,7 @@ public: virtual void RemoveInput(wxFDIOHandler *handler, int fd, Direction d) = 0; // empty but virtual dtor for the base class - virtual ~wxFDIOManager() { } + virtual ~wxFDIOManager() = default; }; #endif // _WX_PRIVATE_FDIOMANAGER_H_ diff --git a/include/wx/private/fontmgr.h b/include/wx/private/fontmgr.h index 0a40ea2d0c..094719f2fc 100644 --- a/include/wx/private/fontmgr.h +++ b/include/wx/private/fontmgr.h @@ -32,7 +32,7 @@ class wxFontInstanceBase { protected: wxFontInstanceBase(float ptSize, bool aa) : m_ptSize(ptSize), m_aa(aa) {} - virtual ~wxFontInstanceBase() {} + virtual ~wxFontInstanceBase() = default; public: float GetPointSize() const { return m_ptSize; } diff --git a/include/wx/private/graphics.h b/include/wx/private/graphics.h index 742190fa21..ebe2117bc7 100644 --- a/include/wx/private/graphics.h +++ b/include/wx/private/graphics.h @@ -32,7 +32,7 @@ public : wxGraphicsBitmapData( wxGraphicsRenderer* renderer) : wxGraphicsObjectRefData(renderer) {} - virtual ~wxGraphicsBitmapData() {} + virtual ~wxGraphicsBitmapData() = default; // returns the native representation virtual void * GetNativeBitmap() const = 0; @@ -44,7 +44,7 @@ public : wxGraphicsMatrixData( wxGraphicsRenderer* renderer) : wxGraphicsObjectRefData(renderer) {} - virtual ~wxGraphicsMatrixData() {} + virtual ~wxGraphicsMatrixData() = default; // concatenates the matrix virtual void Concat( const wxGraphicsMatrixData *t ) = 0; @@ -97,7 +97,7 @@ class WXDLLIMPEXP_CORE wxGraphicsPathData : public wxGraphicsObjectRefData { public : wxGraphicsPathData(wxGraphicsRenderer* renderer) : wxGraphicsObjectRefData(renderer) {} - virtual ~wxGraphicsPathData() {} + virtual ~wxGraphicsPathData() = default; // // These are the path primitives from which everything else can be constructed diff --git a/include/wx/private/markupparser.h b/include/wx/private/markupparser.h index 855d92ad05..54a186c736 100644 --- a/include/wx/private/markupparser.h +++ b/include/wx/private/markupparser.h @@ -76,8 +76,8 @@ struct wxMarkupSpanAttributes class wxMarkupParserOutput { public: - wxMarkupParserOutput() { } - virtual ~wxMarkupParserOutput() { } + wxMarkupParserOutput() = default; + virtual ~wxMarkupParserOutput() = default; // Virtual functions called by wxMarkupParser while parsing the markup. diff --git a/include/wx/private/markupparserattr.h b/include/wx/private/markupparserattr.h index 921bfc0c3e..2441fbf26f 100644 --- a/include/wx/private/markupparserattr.h +++ b/include/wx/private/markupparserattr.h @@ -223,7 +223,7 @@ private: template struct FontModifier { - FontModifier() { } + FontModifier() = default; void operator()(wxMarkupSpanAttributes::OptionalBool isIt, wxFont& font, diff --git a/include/wx/private/menuradio.h b/include/wx/private/menuradio.h index dbbb09191b..bfcbfddb48 100644 --- a/include/wx/private/menuradio.h +++ b/include/wx/private/menuradio.h @@ -17,7 +17,7 @@ class wxMenuRadioItemsData { public: - wxMenuRadioItemsData() { } + wxMenuRadioItemsData() = default; // Default copy ctor, assignment operator and dtor are all ok. diff --git a/include/wx/private/notifmsg.h b/include/wx/private/notifmsg.h index 8d706b1bae..4afd5c8ede 100644 --- a/include/wx/private/notifmsg.h +++ b/include/wx/private/notifmsg.h @@ -19,7 +19,7 @@ public: } - virtual ~wxNotificationMessageImpl() { } + virtual ~wxNotificationMessageImpl() = default; virtual bool Show(int timeout) = 0; diff --git a/include/wx/private/preferences.h b/include/wx/private/preferences.h index 8b926450b9..f0436fbf81 100644 --- a/include/wx/private/preferences.h +++ b/include/wx/private/preferences.h @@ -31,10 +31,10 @@ public: virtual void Show(wxWindow* parent) = 0; virtual void Dismiss() = 0; - virtual ~wxPreferencesEditorImpl() {} + virtual ~wxPreferencesEditorImpl() = default; protected: - wxPreferencesEditorImpl() {} + wxPreferencesEditorImpl() = default; }; #endif // _WX_PRIVATE_PREFERENCES_H_ diff --git a/include/wx/private/refcountermt.h b/include/wx/private/refcountermt.h index c40a326990..509104f83c 100644 --- a/include/wx/private/refcountermt.h +++ b/include/wx/private/refcountermt.h @@ -29,7 +29,7 @@ public: } protected: - virtual ~wxRefCounterMT() { } + virtual ~wxRefCounterMT() = default; private: // Ref count is atomic to allow IncRef() and DecRef() to be concurrently diff --git a/include/wx/private/richtooltip.h b/include/wx/private/richtooltip.h index e9dbf942c1..a4661b42cc 100644 --- a/include/wx/private/richtooltip.h +++ b/include/wx/private/richtooltip.h @@ -35,10 +35,10 @@ public: virtual void ShowFor(wxWindow* win, const wxRect* rect = nullptr) = 0; - virtual ~wxRichToolTipImpl() { } + virtual ~wxRichToolTipImpl() = default; protected: - wxRichToolTipImpl() { } + wxRichToolTipImpl() = default; }; #endif // _WX_PRIVATE_RICHTOOLTIP_H_ diff --git a/include/wx/private/socket.h b/include/wx/private/socket.h index 39f5cd6872..6ec7a8de78 100644 --- a/include/wx/private/socket.h +++ b/include/wx/private/socket.h @@ -157,7 +157,7 @@ public: virtual void Uninstall_Callback(wxSocketImpl *socket, wxSocketNotify event = wxSOCKET_LOST) = 0; - virtual ~wxSocketManager() { } + virtual ~wxSocketManager() = default; private: // get the manager to use if we don't have it yet diff --git a/include/wx/private/textmeasure.h b/include/wx/private/textmeasure.h index 416f553a13..2bea7897d0 100644 --- a/include/wx/private/textmeasure.h +++ b/include/wx/private/textmeasure.h @@ -29,7 +29,7 @@ public: // Even though this class is not supposed to be used polymorphically, give // it a virtual dtor to avoid compiler warnings. - virtual ~wxTextMeasureBase() { } + virtual ~wxTextMeasureBase() = default; // Return the extent of a single line string. diff --git a/include/wx/private/timer.h b/include/wx/private/timer.h index 5f4ce0d511..9ce44aea7e 100644 --- a/include/wx/private/timer.h +++ b/include/wx/private/timer.h @@ -30,7 +30,7 @@ public: // empty but virtual base class dtor, the caller is responsible for // stopping the timer before it's destroyed (it can't be done from here as // it's too late) - virtual ~wxTimerImpl() { } + virtual ~wxTimerImpl() = default; // start the timer. When overriding call base version first. diff --git a/include/wx/private/tlwgeom.h b/include/wx/private/tlwgeom.h index 502676a9e4..5b40a00658 100644 --- a/include/wx/private/tlwgeom.h +++ b/include/wx/private/tlwgeom.h @@ -29,8 +29,8 @@ class wxTLWGeometryBase public: typedef wxTopLevelWindow::GeometrySerializer Serializer; - wxTLWGeometryBase() {} - virtual ~wxTLWGeometryBase() {} + wxTLWGeometryBase() = default; + virtual ~wxTLWGeometryBase() = default; // Initialize from the given window. virtual bool GetFrom(const wxTopLevelWindow* tlw) = 0; diff --git a/include/wx/private/uiaction.h b/include/wx/private/uiaction.h index ed6417ac3c..bf594e7a73 100644 --- a/include/wx/private/uiaction.h +++ b/include/wx/private/uiaction.h @@ -17,8 +17,8 @@ class wxUIActionSimulatorImpl { public: - wxUIActionSimulatorImpl() { } - virtual ~wxUIActionSimulatorImpl() { } + wxUIActionSimulatorImpl() = default; + virtual ~wxUIActionSimulatorImpl() = default; // Low level mouse methods which must be implemented in the derived class. virtual bool MouseMove(long x, long y) = 0; diff --git a/include/wx/private/uilocale.h b/include/wx/private/uilocale.h index e1896eff1d..c543a24b2a 100644 --- a/include/wx/private/uilocale.h +++ b/include/wx/private/uilocale.h @@ -99,7 +99,7 @@ public: virtual int CompareStrings(const wxString& lhs, const wxString& rhs, int flags) const = 0; - virtual ~wxUILocaleImpl() { } + virtual ~wxUILocaleImpl() = default; }; #endif // _WX_PRIVATE_UILOCALE_H_ diff --git a/include/wx/private/webrequest.h b/include/wx/private/webrequest.h index 9fc741a065..7da1d6d1f8 100644 --- a/include/wx/private/webrequest.h +++ b/include/wx/private/webrequest.h @@ -32,7 +32,7 @@ const int wxWEBREQUEST_BUFFER_SIZE = 64 * 1024; class wxWebAuthChallengeImpl : public wxRefCounterMT { public: - virtual ~wxWebAuthChallengeImpl() { } + virtual ~wxWebAuthChallengeImpl() = default; wxWebAuthChallenge::Source GetSource() const { return m_source; } @@ -55,7 +55,7 @@ private: class wxWebRequestImpl : public wxRefCounterMT { public: - virtual ~wxWebRequestImpl() { } + virtual ~wxWebRequestImpl() = default; void SetHeader(const wxString& name, const wxString& value) { m_headers[name] = value; } @@ -223,7 +223,7 @@ public: virtual bool Initialize() { return true; } - virtual ~wxWebSessionFactory() { } + virtual ~wxWebSessionFactory() = default; }; // ---------------------------------------------------------------------------- @@ -233,7 +233,7 @@ public: class wxWebSessionImpl : public wxRefCounterMT { public: - virtual ~wxWebSessionImpl() { } + virtual ~wxWebSessionImpl() = default; virtual wxWebRequestImplPtr CreateRequest(wxWebSession& session, diff --git a/include/wx/prntbase.h b/include/wx/prntbase.h index 11f85071f7..cd951a8cae 100644 --- a/include/wx/prntbase.h +++ b/include/wx/prntbase.h @@ -74,8 +74,8 @@ enum wxPreviewFrameModalityKind class WXDLLIMPEXP_CORE wxPrintFactory { public: - wxPrintFactory() {} - virtual ~wxPrintFactory() {} + wxPrintFactory() = default; + virtual ~wxPrintFactory() = default; virtual wxPrinterBase *CreatePrinter( wxPrintDialogData* data ) = 0; diff --git a/include/wx/propgrid/propgriddefs.h b/include/wx/propgrid/propgriddefs.h index e107cef8f9..6febe05ce3 100644 --- a/include/wx/propgrid/propgriddefs.h +++ b/include/wx/propgrid/propgriddefs.h @@ -417,7 +417,7 @@ const char* classname##_VariantType = #classname; \ class classname##VariantData: public wxVariantData \ { \ public:\ - classname##VariantData() {} \ + classname##VariantData() = default; \ classname##VariantData( const classname &value ) : m_value(value) { } \ \ classname &GetValue() { return m_value; } \ diff --git a/include/wx/protocol/log.h b/include/wx/protocol/log.h index fa3481b718..325d155302 100644 --- a/include/wx/protocol/log.h +++ b/include/wx/protocol/log.h @@ -27,7 +27,7 @@ public: } // Virtual dtor for the base class - virtual ~wxProtocolLog() { } + virtual ~wxProtocolLog() = default; // Called by wxProtocol-derived classes to actually log something virtual void LogRequest(const wxString& str) diff --git a/include/wx/qt/colordlg.h b/include/wx/qt/colordlg.h index 98736ebc9f..94a70bd4d4 100644 --- a/include/wx/qt/colordlg.h +++ b/include/wx/qt/colordlg.h @@ -15,7 +15,7 @@ class QColorDialog; class WXDLLIMPEXP_CORE wxColourDialog : public wxDialog { public: - wxColourDialog() { } + wxColourDialog() = default; wxColourDialog(wxWindow *parent, const wxColourData *data = nullptr) { Create(parent, data); } diff --git a/include/wx/qt/cursor.h b/include/wx/qt/cursor.h index b83d3c6b9f..176afdbc5a 100644 --- a/include/wx/qt/cursor.h +++ b/include/wx/qt/cursor.h @@ -15,7 +15,7 @@ class QCursor; class WXDLLIMPEXP_CORE wxCursor : public wxCursorBase { public: - wxCursor() { } + wxCursor() = default; wxCursor(wxStockCursor id) { InitFromStock(id); } #if wxUSE_IMAGE wxCursor( const wxImage & image ); diff --git a/include/wx/qt/dirdlg.h b/include/wx/qt/dirdlg.h index 15fc52bb6e..93e1435d14 100644 --- a/include/wx/qt/dirdlg.h +++ b/include/wx/qt/dirdlg.h @@ -13,7 +13,7 @@ class QFileDialog; class WXDLLIMPEXP_CORE wxDirDialog : public wxDirDialogBase { public: - wxDirDialog() { } + wxDirDialog() = default; wxDirDialog(wxWindow *parent, const wxString& message = wxASCII_STR(wxDirSelectorPromptStr), diff --git a/include/wx/qt/filedlg.h b/include/wx/qt/filedlg.h index 715357dc08..f5331e8768 100644 --- a/include/wx/qt/filedlg.h +++ b/include/wx/qt/filedlg.h @@ -13,7 +13,7 @@ class QFileDialog; class WXDLLIMPEXP_CORE wxFileDialog : public wxFileDialogBase { public: - wxFileDialog() { } + wxFileDialog() = default; wxFileDialog(wxWindow *parent, const wxString& message = wxASCII_STR(wxFileSelectorPromptStr), const wxString& defaultDir = wxEmptyString, diff --git a/include/wx/qt/fontdlg.h b/include/wx/qt/fontdlg.h index 6dd42e4f48..5ff99c1ab1 100644 --- a/include/wx/qt/fontdlg.h +++ b/include/wx/qt/fontdlg.h @@ -13,7 +13,7 @@ class QFontDialog; class WXDLLIMPEXP_CORE wxFontDialog : public wxFontDialogBase { public: - wxFontDialog() { } + wxFontDialog() = default; wxFontDialog(wxWindow *parent) { Create(parent); } wxFontDialog(wxWindow *parent, const wxFontData& data) { Create(parent, data); } diff --git a/include/wx/qt/minifram.h b/include/wx/qt/minifram.h index c18b7edfe5..6b6cd2520f 100644 --- a/include/wx/qt/minifram.h +++ b/include/wx/qt/minifram.h @@ -14,7 +14,7 @@ class WXDLLIMPEXP_CORE wxMiniFrame : public wxFrame { public: - wxMiniFrame() { } + wxMiniFrame() = default; bool Create(wxWindow *parent, wxWindowID id, diff --git a/include/wx/quantize.h b/include/wx/quantize.h index 254b4b76f0..6e314afe51 100644 --- a/include/wx/quantize.h +++ b/include/wx/quantize.h @@ -39,8 +39,8 @@ public: //// Constructor - wxQuantize() {} - virtual ~wxQuantize() {} + wxQuantize() = default; + virtual ~wxQuantize() = default; //// Operations diff --git a/include/wx/radiobut.h b/include/wx/radiobut.h index 618523c1a9..62b3802722 100644 --- a/include/wx/radiobut.h +++ b/include/wx/radiobut.h @@ -33,7 +33,7 @@ class WXDLLIMPEXP_FWD_CORE wxRadioButton; class WXDLLIMPEXP_CORE wxRadioButtonBase : public wxRadioButtonBaseBase { public: - wxRadioButtonBase() { } + wxRadioButtonBase() = default; // Methods to be implemented by the derived classes: virtual void SetValue(bool value) = 0; diff --git a/include/wx/rearrangectrl.h b/include/wx/rearrangectrl.h index 78935f1a3f..e9287f12a6 100644 --- a/include/wx/rearrangectrl.h +++ b/include/wx/rearrangectrl.h @@ -46,7 +46,7 @@ public: // -------------- // default ctor, call Create() later - wxRearrangeList() { } + wxRearrangeList() = default; // ctor creating the control, the arguments are the same as for // wxCheckListBox except for the extra order array which defines the diff --git a/include/wx/richtext/richtextbuffer.h b/include/wx/richtext/richtextbuffer.h index 8a63dcdeec..b710eab031 100644 --- a/include/wx/richtext/richtextbuffer.h +++ b/include/wx/richtext/richtextbuffer.h @@ -494,7 +494,7 @@ public: /** Default constructor. */ - wxTextAttrDimensions() {} + wxTextAttrDimensions() = default; /** Resets the value and flags for all dimensions. @@ -588,7 +588,7 @@ public: /** Default constructor. */ - wxTextAttrSize() {} + wxTextAttrSize() = default; /** Resets the width and height dimensions. @@ -1013,7 +1013,7 @@ public: /** Default constructor. */ - wxTextAttrBorders() { } + wxTextAttrBorders() = default; /** Equality operator. @@ -1764,7 +1764,7 @@ public: /** Default constructor. */ - wxRichTextAttr() {} + wxRichTextAttr() = default; /** Copy function. @@ -1856,7 +1856,7 @@ public: /** Default constructor. */ - wxRichTextProperties() {} + wxRichTextProperties() = default; /** Copy constructor. @@ -2109,7 +2109,7 @@ public: Copy constructor. */ wxRichTextRange(const wxRichTextRange& range) { m_start = range.m_start; m_end = range.m_end; } - ~wxRichTextRange() {} + ~wxRichTextRange() = default; /** Assigns @a range to this range. @@ -4362,7 +4362,7 @@ public: wxRichTextLine(wxRichTextParagraph* parent); wxRichTextLine(const wxRichTextLine& obj) { Init( nullptr); Copy(obj); } - virtual ~wxRichTextLine() {} + virtual ~wxRichTextLine() = default; // Overridables @@ -6959,8 +6959,8 @@ public: /** Constructor. */ - wxRichTextRenderer() {} - virtual ~wxRichTextRenderer() {} + wxRichTextRenderer() = default; + virtual ~wxRichTextRenderer() = default; /** Draws a standard bullet, as specified by the value of GetBulletName. This function should be overridden. @@ -7005,7 +7005,7 @@ public: /** Constructor. */ - wxRichTextStdRenderer() {} + wxRichTextStdRenderer() = default; // Draw a standard bullet, as specified by the value of GetBulletName virtual bool DrawStandardBullet(wxRichTextParagraph* paragraph, wxDC& dc, const wxRichTextAttr& attr, const wxRect& rect) override; diff --git a/include/wx/richtext/richtextdialogpage.h b/include/wx/richtext/richtextdialogpage.h index 31e2dd7f9d..0b776c8b3f 100644 --- a/include/wx/richtext/richtextdialogpage.h +++ b/include/wx/richtext/richtextdialogpage.h @@ -24,7 +24,7 @@ class WXDLLIMPEXP_RICHTEXT wxRichTextDialogPage: public wxPanel { public: wxDECLARE_CLASS(wxRichTextDialogPage); - wxRichTextDialogPage() {} + wxRichTextDialogPage() = default; wxRichTextDialogPage(wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0) { Create(parent, id, pos, size, style); diff --git a/include/wx/richtext/richtextformatdlg.h b/include/wx/richtext/richtextformatdlg.h index be66ef9d84..2116ffe323 100644 --- a/include/wx/richtext/richtextformatdlg.h +++ b/include/wx/richtext/richtextformatdlg.h @@ -84,8 +84,8 @@ enum { class WXDLLIMPEXP_RICHTEXT wxRichTextFormattingDialogFactory: public wxObject { public: - wxRichTextFormattingDialogFactory() {} - virtual ~wxRichTextFormattingDialogFactory() {} + wxRichTextFormattingDialogFactory() = default; + virtual ~wxRichTextFormattingDialogFactory() = default; // Overridables diff --git a/include/wx/richtext/richtextstyles.h b/include/wx/richtext/richtextstyles.h index 38279a8117..e32a4b5a2e 100644 --- a/include/wx/richtext/richtextstyles.h +++ b/include/wx/richtext/richtextstyles.h @@ -59,7 +59,7 @@ public: wxRichTextStyleDefinition(const wxString& name = wxEmptyString) { Init(); m_name = name; } /// Destructor - virtual ~wxRichTextStyleDefinition() {} + virtual ~wxRichTextStyleDefinition() = default; /// Initialises members void Init() {} @@ -136,7 +136,7 @@ public: wxRichTextStyleDefinition(name) {} /// Destructor - virtual ~wxRichTextCharacterStyleDefinition() {} + virtual ~wxRichTextCharacterStyleDefinition() = default; /// Clones the object virtual wxRichTextStyleDefinition* Clone() const override { return new wxRichTextCharacterStyleDefinition(*this); } @@ -161,7 +161,7 @@ public: wxRichTextStyleDefinition(name) {} // Destructor - virtual ~wxRichTextParagraphStyleDefinition() {} + virtual ~wxRichTextParagraphStyleDefinition() = default; /// Sets and gets the next style void SetNextStyle(const wxString& name) { m_nextStyle = name; } @@ -202,7 +202,7 @@ public: wxRichTextParagraphStyleDefinition(name) { Init(); } /// Destructor - virtual ~wxRichTextListStyleDefinition() {} + virtual ~wxRichTextListStyleDefinition() = default; /// Copies from def void Copy(const wxRichTextListStyleDefinition& def); @@ -268,7 +268,7 @@ public: wxRichTextStyleDefinition(name) {} // Destructor - virtual ~wxRichTextBoxStyleDefinition() {} + virtual ~wxRichTextBoxStyleDefinition() = default; /// Copies from def void Copy(const wxRichTextBoxStyleDefinition& def); @@ -712,7 +712,7 @@ public: Create(parent, id, pos, size, style); } - virtual ~wxRichTextStyleComboCtrl() {} + virtual ~wxRichTextStyleComboCtrl() = default; void Init() { diff --git a/include/wx/richtext/richtextuicustomization.h b/include/wx/richtext/richtextuicustomization.h index e05969ebc2..07ad0a0236 100644 --- a/include/wx/richtext/richtextuicustomization.h +++ b/include/wx/richtext/richtextuicustomization.h @@ -33,8 +33,8 @@ class WXDLLIMPEXP_RICHTEXT wxRichTextUICustomization { public: - wxRichTextUICustomization() {} - virtual ~wxRichTextUICustomization() {} + wxRichTextUICustomization() = default; + virtual ~wxRichTextUICustomization() = default; /// Show the help given the current active window, and a help topic id. virtual bool ShowHelp(wxWindow* win, long id) = 0; @@ -54,7 +54,7 @@ public: m_helpTopic = -1; m_uiCustomization = nullptr; } - virtual ~wxRichTextHelpInfo() {} + virtual ~wxRichTextHelpInfo() = default; virtual bool ShowHelp(wxWindow* win) { diff --git a/include/wx/scopeguard.h b/include/wx/scopeguard.h index 1aef35fb6b..2f2fac2fff 100644 --- a/include/wx/scopeguard.h +++ b/include/wx/scopeguard.h @@ -79,7 +79,7 @@ public: bool WasDismissed() const { return m_wasDismissed; } protected: - ~wxScopeGuardImplBase() { } + ~wxScopeGuardImplBase() = default; // must be mutable for copy ctor to work mutable bool m_wasDismissed; diff --git a/include/wx/scrolbar.h b/include/wx/scrolbar.h index 9c323ece6f..2a942c9f3f 100644 --- a/include/wx/scrolbar.h +++ b/include/wx/scrolbar.h @@ -25,7 +25,7 @@ extern WXDLLIMPEXP_DATA_CORE(const char) wxScrollBarNameStr[]; class WXDLLIMPEXP_CORE wxScrollBarBase : public wxControl { public: - wxScrollBarBase() { } + wxScrollBarBase() = default; /* Derived classes should provide the following method and ctor with the diff --git a/include/wx/scrolwin.h b/include/wx/scrolwin.h index fc623c12e6..c612997aab 100644 --- a/include/wx/scrolwin.h +++ b/include/wx/scrolwin.h @@ -69,7 +69,7 @@ class WXDLLIMPEXP_CORE wxAnyScrollHelperBase { public: explicit wxAnyScrollHelperBase(wxWindow* win); - virtual ~wxAnyScrollHelperBase() {} + virtual ~wxAnyScrollHelperBase() = default; // Disable use of keyboard keys for scrolling. By default cursor movement // keys (including Home, End, Page Up and Down) are used to scroll the diff --git a/include/wx/settings.h b/include/wx/settings.h index b1bafde150..3967b98b46 100644 --- a/include/wx/settings.h +++ b/include/wx/settings.h @@ -192,7 +192,7 @@ private: // Ctor is private, even though it's trivial, because objects of this type // are only supposed to be created by wxSystemSettingsNative. - wxSystemAppearance() { } + wxSystemAppearance() = default; // Currently this class doesn't have any internal state because the only // available implementation doesn't need it. If we do need it later, we diff --git a/include/wx/sharedptr.h b/include/wx/sharedptr.h index 087dc17414..ba332ac2cf 100644 --- a/include/wx/sharedptr.h +++ b/include/wx/sharedptr.h @@ -115,7 +115,7 @@ private: struct reftype { reftype(T* ptr) : m_ptr(ptr), m_count(1) {} - virtual ~reftype() {} + virtual ~reftype() = default; virtual void delete_ptr() { delete m_ptr; } T* m_ptr; diff --git a/include/wx/slider.h b/include/wx/slider.h index a6934c19c7..4d3d9800f8 100644 --- a/include/wx/slider.h +++ b/include/wx/slider.h @@ -60,7 +60,7 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxSliderNameStr); */ - wxSliderBase() { } + wxSliderBase() = default; // get/set the current slider value (should be in range) virtual int GetValue() const = 0; diff --git a/include/wx/spinctrl.h b/include/wx/spinctrl.h index 81466dbced..1b0ac59d0d 100644 --- a/include/wx/spinctrl.h +++ b/include/wx/spinctrl.h @@ -31,7 +31,7 @@ wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SPINCTRLDOUBLE, wxSpinDoubleEve class WXDLLIMPEXP_CORE wxSpinCtrlBase : public wxControl { public: - wxSpinCtrlBase() {} + wxSpinCtrlBase() = default; // accessor functions that derived classes are expected to have virtual wxString GetTextValue() const = 0; diff --git a/include/wx/srchctrl.h b/include/wx/srchctrl.h index 544883c52b..d74680f5f6 100644 --- a/include/wx/srchctrl.h +++ b/include/wx/srchctrl.h @@ -63,8 +63,8 @@ wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SEARCH, wxCommandEvent); class WXDLLIMPEXP_CORE wxSearchCtrlBase : public wxSearchCtrlBaseBaseClass { public: - wxSearchCtrlBase() { } - virtual ~wxSearchCtrlBase() { } + wxSearchCtrlBase() = default; + virtual ~wxSearchCtrlBase() = default; // search control #if wxUSE_MENUS diff --git a/include/wx/stack.h b/include/wx/stack.h index 91bcd392de..d288a4689f 100644 --- a/include/wx/stack.h +++ b/include/wx/stack.h @@ -36,7 +36,7 @@ public: typedef typename container_type::size_type size_type; typedef typename container_type::value_type value_type; - wxStack() { } + wxStack() = default; explicit wxStack(const container_type& cont) : m_cont(cont) { } // Default copy ctor, assignment operator and dtor are ok. diff --git a/include/wx/stackwalk.h b/include/wx/stackwalk.h index b22410c583..2b03edb104 100644 --- a/include/wx/stackwalk.h +++ b/include/wx/stackwalk.h @@ -93,7 +93,7 @@ public: // although this class is not supposed to be used polymorphically, give it // a virtual dtor to silence compiler warnings - virtual ~wxStackFrameBase() { } + virtual ~wxStackFrameBase() = default; protected: // hooks for derived classes to initialize some fields on demand @@ -123,10 +123,10 @@ class WXDLLIMPEXP_BASE wxStackWalkerBase { public: // ctor does nothing, use Walk() to walk the stack - wxStackWalkerBase() { } + wxStackWalkerBase() = default; // dtor does nothing either but should be virtual - virtual ~wxStackWalkerBase() { } + virtual ~wxStackWalkerBase() = default; // enumerate stack frames from the current location, skipping the initial // number of them (this can be useful when Walk() is called from some known diff --git a/include/wx/statbmp.h b/include/wx/statbmp.h index 1fdf65cb89..b8d314a174 100644 --- a/include/wx/statbmp.h +++ b/include/wx/statbmp.h @@ -32,7 +32,7 @@ public: Scale_AspectFill }; - wxStaticBitmapBase() { } + wxStaticBitmapBase() = default; virtual ~wxStaticBitmapBase(); // our interface diff --git a/include/wx/statline.h b/include/wx/statline.h index 310c8ac1c5..bd5794b358 100644 --- a/include/wx/statline.h +++ b/include/wx/statline.h @@ -37,7 +37,7 @@ class WXDLLIMPEXP_CORE wxStaticLineBase : public wxControl { public: // constructor - wxStaticLineBase() { } + wxStaticLineBase() = default; // is the line vertical? bool IsVertical() const { return (GetWindowStyle() & wxLI_VERTICAL) != 0; } diff --git a/include/wx/stattext.h b/include/wx/stattext.h index c76c907375..08f124437e 100644 --- a/include/wx/stattext.h +++ b/include/wx/stattext.h @@ -33,7 +33,7 @@ extern WXDLLIMPEXP_DATA_CORE(const char) wxStaticTextNameStr[]; class WXDLLIMPEXP_CORE wxStaticTextBase : public wxControl { public: - wxStaticTextBase() { } + wxStaticTextBase() = default; // wrap the text of the control so that no line is longer than the given // width (if possible: this function won't break words) diff --git a/include/wx/stc/stc.h b/include/wx/stc/stc.h index b3fec1c00c..43ff9d937d 100644 --- a/include/wx/stc/stc.h +++ b/include/wx/stc/stc.h @@ -5897,7 +5897,7 @@ public: #ifndef SWIG wxStyledTextEvent(const wxStyledTextEvent& event); #endif - ~wxStyledTextEvent() {} + ~wxStyledTextEvent() = default; void SetPosition(int pos) { m_position = pos; } void SetKey(int k) { m_key = k; } diff --git a/include/wx/stdpaths.h b/include/wx/stdpaths.h index 7a7f1afa3b..3a0d5e5227 100644 --- a/include/wx/stdpaths.h +++ b/include/wx/stdpaths.h @@ -262,7 +262,7 @@ protected: // Ctor is protected because wxStandardPaths::Get() should always be used // to access the global wxStandardPaths object of the correct type instead // of creating one of a possibly wrong type yourself. - wxStandardPaths() { } + wxStandardPaths() = default; private: wxString m_prefix; diff --git a/include/wx/stdstream.h b/include/wx/stdstream.h index 09efe3e58c..f63fafcd85 100644 --- a/include/wx/stdstream.h +++ b/include/wx/stdstream.h @@ -27,7 +27,7 @@ class WXDLLIMPEXP_BASE wxStdInputStreamBuffer : public std::streambuf { public: wxStdInputStreamBuffer(wxInputStream& stream); - virtual ~wxStdInputStreamBuffer() { } + virtual ~wxStdInputStreamBuffer() = default; protected: virtual std::streambuf *setbuf(char *s, std::streamsize n) override; @@ -70,7 +70,7 @@ class WXDLLIMPEXP_BASE wxStdInputStream : public std::istream { public: wxStdInputStream(wxInputStream& stream); - virtual ~wxStdInputStream() { } + virtual ~wxStdInputStream() = default; protected: wxStdInputStreamBuffer m_streamBuffer; @@ -84,7 +84,7 @@ class WXDLLIMPEXP_BASE wxStdOutputStreamBuffer : public std::streambuf { public: wxStdOutputStreamBuffer(wxOutputStream& stream); - virtual ~wxStdOutputStreamBuffer() { } + virtual ~wxStdOutputStreamBuffer() = default; protected: virtual std::streambuf *setbuf(char *s, std::streamsize n) override; @@ -111,7 +111,7 @@ class WXDLLIMPEXP_BASE wxStdOutputStream : public std::ostream { public: wxStdOutputStream(wxOutputStream& stream); - virtual ~wxStdOutputStream() { } + virtual ~wxStdOutputStream() = default; protected: wxStdOutputStreamBuffer m_streamBuffer; diff --git a/include/wx/strconv.h b/include/wx/strconv.h index bf67b6fd31..8645c1f7ff 100644 --- a/include/wx/strconv.h +++ b/include/wx/strconv.h @@ -162,7 +162,7 @@ public: virtual wxMBConv *Clone() const = 0; // virtual dtor for any base class - virtual ~wxMBConv() { } + virtual ~wxMBConv() = default; private: // Common part of single argument cWC2MB() and cMB2WC() overloads above. @@ -242,7 +242,7 @@ private: class WXDLLIMPEXP_BASE wxMBConvUTF7 : public wxMBConv { public: - wxMBConvUTF7() { } + wxMBConvUTF7() = default; // compiler-generated copy ctor, assignment operator and dtor are ok // (assuming it's ok to copy the shift state -- not really sure about it) diff --git a/include/wx/stream.h b/include/wx/stream.h index 10cbd1ae80..668a1d19fd 100644 --- a/include/wx/stream.h +++ b/include/wx/stream.h @@ -356,7 +356,7 @@ void WXDLLIMPEXP_BASE wxUseFilterClasses(); class WXDLLIMPEXP_BASE wxFilterClassFactoryBase : public wxObject { public: - virtual ~wxFilterClassFactoryBase() { } + virtual ~wxFilterClassFactoryBase() = default; wxString GetProtocol() const { return wxString(*GetProtocols()); } wxString PopExtension(const wxString& location) const; @@ -377,7 +377,7 @@ protected: class WXDLLIMPEXP_BASE wxFilterClassFactory : public wxFilterClassFactoryBase { public: - virtual ~wxFilterClassFactory() { } + virtual ~wxFilterClassFactory() = default; virtual wxFilterInputStream *NewStream(wxInputStream& stream) const = 0; virtual wxFilterOutputStream *NewStream(wxOutputStream& stream) const = 0; diff --git a/include/wx/string.h b/include/wx/string.h index 4d9cc0c705..aed2ca6e5e 100644 --- a/include/wx/string.h +++ b/include/wx/string.h @@ -816,7 +816,7 @@ public: WX_STR_ITERATOR_IMPL(iterator, wxChar*, wxUniCharRef); public: - iterator() {} + iterator() = default; iterator(const iterator& i) : m_cur(i.m_cur), m_node(i.str(), &m_cur) {} iterator& operator=(const iterator& i) @@ -865,7 +865,7 @@ public: WX_STR_ITERATOR_IMPL(const_iterator, const wxChar*, wxUniChar); public: - const_iterator() {} + const_iterator() = default; const_iterator(const const_iterator& i) : m_cur(i.m_cur), m_node(i.str(), &m_cur) {} const_iterator(const iterator& i) @@ -925,7 +925,7 @@ public: WX_STR_ITERATOR_IMPL(iterator, wxChar*, wxUniCharRef); public: - iterator() {} + iterator() = default; reference operator*() { return wxUniCharRef::CreateForString(m_cur); } @@ -958,7 +958,7 @@ public: WX_STR_ITERATOR_IMPL(const_iterator, const wxChar*, wxUniChar); public: - const_iterator() {} + const_iterator() = default; const_iterator(const iterator& i) : m_cur(i.m_cur) {} const_reference operator*() const @@ -1038,7 +1038,7 @@ public: typedef typename T::reference reference; typedef typename T::pointer *pointer; - reverse_iterator_impl() {} + reverse_iterator_impl() = default; reverse_iterator_impl(iterator_type i) : m_cur(i) {} iterator_type base() const { return m_cur; } @@ -1126,7 +1126,7 @@ private: public: // constructors and destructor // ctor for an empty string - wxString() {} + wxString() = default; // copy ctor wxString(const wxString& stringSrc) : m_impl(stringSrc.m_impl) { } diff --git a/include/wx/strvararg.h b/include/wx/strvararg.h index 4193079847..506ba4bb4e 100644 --- a/include/wx/strvararg.h +++ b/include/wx/strvararg.h @@ -543,7 +543,7 @@ struct wxArgNormalizerWithBuffer { typedef wxScopedCharTypeBuffer CharBuffer; - wxArgNormalizerWithBuffer() {} + wxArgNormalizerWithBuffer() = default; wxArgNormalizerWithBuffer(const CharBuffer& buf, const wxFormatString *fmt, unsigned index) diff --git a/include/wx/sysopt.h b/include/wx/sysopt.h index efd112f60a..ab22ae9804 100644 --- a/include/wx/sysopt.h +++ b/include/wx/sysopt.h @@ -23,7 +23,7 @@ WXDLLIMPEXP_BASE wxSystemOptions : public wxObject { public: - wxSystemOptions() { } + wxSystemOptions() = default; // User-customizable hints to wxWidgets or associated libraries // These could also be used to influence GetSystem... calls, indeed diff --git a/include/wx/systhemectrl.h b/include/wx/systhemectrl.h index 5881b6cbd1..c50dab0ee0 100644 --- a/include/wx/systhemectrl.h +++ b/include/wx/systhemectrl.h @@ -37,7 +37,7 @@ public: #endif // wxHAS_SYSTEM_THEMED_CONTROL/!wxHAS_SYSTEM_THEMED_CONTROL } - virtual ~wxSystemThemedControlBase() { } + virtual ~wxSystemThemedControlBase() = default; protected: // This method is virtual and can be overridden, e.g. composite controls do @@ -65,7 +65,7 @@ class wxSystemThemedControl : public C, public wxSystemThemedControlBase { public: - wxSystemThemedControl() { } + wxSystemThemedControl() = default; void EnableSystemTheme(bool enable = true) { diff --git a/include/wx/tarstrm.h b/include/wx/tarstrm.h index 9afafe99ab..6b51144355 100644 --- a/include/wx/tarstrm.h +++ b/include/wx/tarstrm.h @@ -47,7 +47,7 @@ enum wxTarFormat class WXDLLIMPEXP_BASE wxTarNotifier { public: - virtual ~wxTarNotifier() { } + virtual ~wxTarNotifier() = default; virtual void OnEntryUpdated(class wxTarEntry& entry) = 0; }; diff --git a/include/wx/taskbar.h b/include/wx/taskbar.h index d29096bf24..a3f6e2fb13 100644 --- a/include/wx/taskbar.h +++ b/include/wx/taskbar.h @@ -41,7 +41,7 @@ enum wxTaskBarIconType class WXDLLIMPEXP_CORE wxTaskBarIconBase : public wxEvtHandler { public: - wxTaskBarIconBase() { } + wxTaskBarIconBase() = default; #if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXQT__) static bool IsAvailable(); diff --git a/include/wx/taskbarbutton.h b/include/wx/taskbarbutton.h index 20a70d8609..98cc202d70 100644 --- a/include/wx/taskbarbutton.h +++ b/include/wx/taskbarbutton.h @@ -110,7 +110,7 @@ public: // by the current system. static wxTaskBarButton* New(wxWindow* parent); - virtual ~wxTaskBarButton() { } + virtual ~wxTaskBarButton() = default; // Operations: virtual void SetProgressRange(int range) = 0; @@ -132,7 +132,7 @@ public: virtual void Realize() = 0; protected: - wxTaskBarButton() { } + wxTaskBarButton() = default; private: wxDECLARE_NO_COPY_CLASS(wxTaskBarButton); diff --git a/include/wx/testing.h b/include/wx/testing.h index 19021f1e18..a074a214b7 100644 --- a/include/wx/testing.h +++ b/include/wx/testing.h @@ -69,7 +69,7 @@ class wxModalExpectation { public: wxModalExpectation() : m_isOptional(false) {} - virtual ~wxModalExpectation() {} + virtual ~wxModalExpectation() = default; wxString GetDescription() const { diff --git a/include/wx/textcompleter.h b/include/wx/textcompleter.h index ce9e5c2005..fbe2047376 100644 --- a/include/wx/textcompleter.h +++ b/include/wx/textcompleter.h @@ -20,7 +20,7 @@ class WXDLLIMPEXP_CORE wxTextCompleter { public: - wxTextCompleter() { } + wxTextCompleter() = default; // The virtual functions to be implemented by the derived classes: the // first one is called to start preparing for completions for the given @@ -42,7 +42,7 @@ private: class WXDLLIMPEXP_CORE wxTextCompleterSimple : public wxTextCompleter { public: - wxTextCompleterSimple() { } + wxTextCompleterSimple() = default; // Must be implemented to return all the completions for the given prefix. virtual void GetCompletions(const wxString& prefix, wxArrayString& res) = 0; diff --git a/include/wx/textctrl.h b/include/wx/textctrl.h index 3c6cf371bc..e55e5e1820 100644 --- a/include/wx/textctrl.h +++ b/include/wx/textctrl.h @@ -605,8 +605,8 @@ private: class WXDLLIMPEXP_CORE wxTextAreaBase { public: - wxTextAreaBase() { } - virtual ~wxTextAreaBase() { } + wxTextAreaBase() = default; + virtual ~wxTextAreaBase() = default; // lines access // ------------ @@ -713,7 +713,7 @@ class WXDLLIMPEXP_CORE wxTextCtrlIface : public wxTextAreaBase, public wxTextEntryBase { public: - wxTextCtrlIface() { } + wxTextCtrlIface() = default; // wxTextAreaBase overrides virtual wxString GetValue() const override @@ -750,8 +750,8 @@ public: // creation // -------- - wxTextCtrlBase() { } - virtual ~wxTextCtrlBase() { } + wxTextCtrlBase() = default; + virtual ~wxTextCtrlBase() = default; // more readable flag testing methods diff --git a/include/wx/textfile.h b/include/wx/textfile.h index 7a0458f823..cec0fcb9e2 100644 --- a/include/wx/textfile.h +++ b/include/wx/textfile.h @@ -28,7 +28,7 @@ class WXDLLIMPEXP_BASE wxTextFile : public wxTextBuffer { public: // constructors - wxTextFile() { } + wxTextFile() = default; wxTextFile(const wxString& strFileName); protected: diff --git a/include/wx/textwrapper.h b/include/wx/textwrapper.h index da3a7c2d3b..b074984b72 100644 --- a/include/wx/textwrapper.h +++ b/include/wx/textwrapper.h @@ -28,7 +28,7 @@ public: void Wrap(wxWindow *win, const wxString& text, int widthMax); // we don't need it, but just to avoid compiler warnings - virtual ~wxTextWrapper() { } + virtual ~wxTextWrapper() = default; protected: // line may be empty diff --git a/include/wx/tglbtn.h b/include/wx/tglbtn.h index 6e246722de..23abefc0f8 100644 --- a/include/wx/tglbtn.h +++ b/include/wx/tglbtn.h @@ -29,7 +29,7 @@ wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_TOGGLEBUTTON, wxCommandEvent ) class WXDLLIMPEXP_CORE wxToggleButtonBase : public wxAnyButton { public: - wxToggleButtonBase() { } + wxToggleButtonBase() = default; // Get/set the value virtual void SetValue(bool state) = 0; diff --git a/include/wx/timectrl.h b/include/wx/timectrl.h index 83d1621ab5..7f0a45ec86 100644 --- a/include/wx/timectrl.h +++ b/include/wx/timectrl.h @@ -112,7 +112,7 @@ typedef wxTimePickerCtrlCommonBase wxTimePickerCtrlBase; class WXDLLIMPEXP_ADV wxTimePickerCtrl : public wxTimePickerCtrlGeneric { public: - wxTimePickerCtrl() { } + wxTimePickerCtrl() = default; wxTimePickerCtrl(wxWindow *parent, wxWindowID id, const wxDateTime& date = wxDefaultDateTime, diff --git a/include/wx/tipdlg.h b/include/wx/tipdlg.h index 5abb5ae723..8d66e83000 100644 --- a/include/wx/tipdlg.h +++ b/include/wx/tipdlg.h @@ -44,7 +44,7 @@ public: size_t GetCurrentTip() const { return m_currentTip; } // virtual dtor for the base class - virtual ~wxTipProvider() { } + virtual ~wxTipProvider() = default; #if WXWIN_COMPATIBILITY_3_0 diff --git a/include/wx/toplevel.h b/include/wx/toplevel.h index c424f4da7a..37d1f617d0 100644 --- a/include/wx/toplevel.h +++ b/include/wx/toplevel.h @@ -254,7 +254,7 @@ public: class GeometrySerializer { public: - virtual ~GeometrySerializer() {} + virtual ~GeometrySerializer() = default; // If saving a field returns false, it's fatal error and SaveGeometry() // will return false. @@ -396,7 +396,7 @@ private: { public: // construction - wxTopLevelWindow() { } + wxTopLevelWindow() = default; wxTopLevelWindow(wxWindow *parent, wxWindowID winid, const wxString& title, diff --git a/include/wx/tracker.h b/include/wx/tracker.h index 656d343547..c17ae66b34 100644 --- a/include/wx/tracker.h +++ b/include/wx/tracker.h @@ -20,7 +20,7 @@ class WXDLLIMPEXP_BASE wxTrackerNode { public: wxTrackerNode() : m_nxt(nullptr) { } - virtual ~wxTrackerNode() { } + virtual ~wxTrackerNode() = default; virtual void OnObjectDestroy() = 0; diff --git a/include/wx/translation.h b/include/wx/translation.h index 4bba2766f7..ca97649a4b 100644 --- a/include/wx/translation.h +++ b/include/wx/translation.h @@ -221,8 +221,8 @@ private: class WXDLLIMPEXP_BASE wxTranslationsLoader { public: - wxTranslationsLoader() {} - virtual ~wxTranslationsLoader() {} + wxTranslationsLoader() = default; + virtual ~wxTranslationsLoader() = default; virtual wxMsgCatalog *LoadCatalog(const wxString& domain, const wxString& lang) = 0; diff --git a/include/wx/treebase.h b/include/wx/treebase.h index d61ce65dbb..557e6276c3 100644 --- a/include/wx/treebase.h +++ b/include/wx/treebase.h @@ -59,7 +59,7 @@ public: // creation/destruction // -------------------- // default ctor - wxTreeItemData() { } + wxTreeItemData() = default; // default copy ctor/assignment operator are ok diff --git a/include/wx/treelist.h b/include/wx/treelist.h index 9748097cbc..1c0a8a980d 100644 --- a/include/wx/treelist.h +++ b/include/wx/treelist.h @@ -85,7 +85,7 @@ extern WXDLLIMPEXP_DATA_CORE(const wxTreeListItem) wxTLI_LAST; class wxTreeListItemComparator { public: - wxTreeListItemComparator() { } + wxTreeListItemComparator() = default; // The comparison function should return negative, null or positive value // depending on whether the first item is less than, equal to or greater @@ -99,7 +99,7 @@ public: // Although this class is not used polymorphically by wxWidgets itself, // provide virtual dtor in case it's used like this in the user code. - virtual ~wxTreeListItemComparator() { } + virtual ~wxTreeListItemComparator() = default; private: wxDECLARE_NO_COPY_CLASS(wxTreeListItemComparator); diff --git a/include/wx/uilocale.h b/include/wx/uilocale.h index c7e2207e62..7eea1a0ab0 100644 --- a/include/wx/uilocale.h +++ b/include/wx/uilocale.h @@ -41,7 +41,7 @@ public: static wxLocaleIdent FromTag(const wxString& tag); // Default ctor creates an empty, invalid identifier. - wxLocaleIdent() { } + wxLocaleIdent() = default; // Set language wxLocaleIdent& Language(const wxString& language); diff --git a/include/wx/univ/anybutton.h b/include/wx/univ/anybutton.h index 765a0c9745..f2baa549a5 100644 --- a/include/wx/univ/anybutton.h +++ b/include/wx/univ/anybutton.h @@ -17,9 +17,9 @@ class WXDLLIMPEXP_CORE wxAnyButton : public wxAnyButtonBase { public: - wxAnyButton() {} + wxAnyButton() = default; - virtual ~wxAnyButton() {} + virtual ~wxAnyButton() = default; // wxAnyButton actions virtual void Toggle(); diff --git a/include/wx/univ/bmpbuttn.h b/include/wx/univ/bmpbuttn.h index b3dc81e7c8..440e31ba24 100644 --- a/include/wx/univ/bmpbuttn.h +++ b/include/wx/univ/bmpbuttn.h @@ -13,7 +13,7 @@ class WXDLLIMPEXP_CORE wxBitmapButton : public wxBitmapButtonBase { public: - wxBitmapButton() { } + wxBitmapButton() = default; wxBitmapButton(wxWindow *parent, wxWindowID id, diff --git a/include/wx/univ/choice.h b/include/wx/univ/choice.h index d2b43fe472..35886b35bb 100644 --- a/include/wx/univ/choice.h +++ b/include/wx/univ/choice.h @@ -17,7 +17,7 @@ class WXDLLIMPEXP_CORE wxChoice : public wxComboBox { public: - wxChoice() {} + wxChoice() = default; wxChoice(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, diff --git a/include/wx/univ/colschem.h b/include/wx/univ/colschem.h index 14690e7826..ce87c0d608 100644 --- a/include/wx/univ/colschem.h +++ b/include/wx/univ/colschem.h @@ -79,7 +79,7 @@ public: virtual wxColour GetBackground(wxWindow *win) const = 0; // virtual dtor for any base class - virtual ~wxColourScheme() {} + virtual ~wxColourScheme() = default; }; // some people just can't spell it correctly :-) diff --git a/include/wx/univ/custombgwin.h b/include/wx/univ/custombgwin.h index 010060a972..84a629d0d3 100644 --- a/include/wx/univ/custombgwin.h +++ b/include/wx/univ/custombgwin.h @@ -21,7 +21,7 @@ class wxCustomBackgroundWindow : public W, public: typedef W BaseWindowClass; - wxCustomBackgroundWindow() { } + wxCustomBackgroundWindow() = default; protected: virtual void DoSetBackgroundBitmap(const wxBitmap& bmp) override diff --git a/include/wx/univ/frame.h b/include/wx/univ/frame.h index 7b1b5b55e7..00353f3867 100644 --- a/include/wx/univ/frame.h +++ b/include/wx/univ/frame.h @@ -17,7 +17,7 @@ class WXDLLIMPEXP_CORE wxFrame : public wxFrameBase { public: - wxFrame() {} + wxFrame() = default; wxFrame(wxWindow *parent, wxWindowID id, const wxString& title, diff --git a/include/wx/univ/inpcons.h b/include/wx/univ/inpcons.h index 171b0dc87f..7e238a4276 100644 --- a/include/wx/univ/inpcons.h +++ b/include/wx/univ/inpcons.h @@ -37,7 +37,7 @@ class WXDLLIMPEXP_CORE wxInputConsumer { public: wxInputConsumer() { m_inputHandler = nullptr; } - virtual ~wxInputConsumer() { } + virtual ~wxInputConsumer() = default; // get the input handler wxInputHandler *GetInputHandler() const { return m_inputHandler; } diff --git a/include/wx/univ/scrarrow.h b/include/wx/univ/scrarrow.h index cd26dc00ed..73743a51f8 100644 --- a/include/wx/univ/scrarrow.h +++ b/include/wx/univ/scrarrow.h @@ -81,7 +81,7 @@ private: class WXDLLIMPEXP_CORE wxControlWithArrows { public: - virtual ~wxControlWithArrows() {} + virtual ~wxControlWithArrows() = default; // get the renderer to use for drawing the arrows virtual wxRenderer *GetRenderer() const = 0; diff --git a/include/wx/univ/scrthumb.h b/include/wx/univ/scrthumb.h index f507739076..1449bc19a3 100644 --- a/include/wx/univ/scrthumb.h +++ b/include/wx/univ/scrthumb.h @@ -84,7 +84,7 @@ private: class WXDLLIMPEXP_CORE wxControlWithThumb { public: - virtual ~wxControlWithThumb() {} + virtual ~wxControlWithThumb() = default; // simple accessors // ---------------- diff --git a/include/wx/univ/statbox.h b/include/wx/univ/statbox.h index 61d60ae5a7..a0c8506f04 100644 --- a/include/wx/univ/statbox.h +++ b/include/wx/univ/statbox.h @@ -13,7 +13,7 @@ class WXDLLIMPEXP_CORE wxStaticBox : public wxStaticBoxBase { public: - wxStaticBox() { } + wxStaticBox() = default; wxStaticBox(wxWindow *parent, const wxString& label, diff --git a/include/wx/univ/statline.h b/include/wx/univ/statline.h index 455fe8792e..3fb830b874 100644 --- a/include/wx/univ/statline.h +++ b/include/wx/univ/statline.h @@ -14,7 +14,7 @@ class WXDLLIMPEXP_CORE wxStaticLine : public wxStaticLineBase { public: // constructors and pseudo-constructors - wxStaticLine() { } + wxStaticLine() = default; wxStaticLine(wxWindow *parent, const wxPoint &pos, diff --git a/include/wx/univ/stattext.h b/include/wx/univ/stattext.h index 6091e042e0..780ab8d905 100644 --- a/include/wx/univ/stattext.h +++ b/include/wx/univ/stattext.h @@ -15,7 +15,7 @@ class WXDLLIMPEXP_CORE wxStaticText : public wxGenericStaticText { public: - wxStaticText() { } + wxStaticText() = default; // usual ctor wxStaticText(wxWindow *parent, diff --git a/include/wx/unix/private/wakeuppipe.h b/include/wx/unix/private/wakeuppipe.h index c01b5649a7..d6bf4c3332 100644 --- a/include/wx/unix/private/wakeuppipe.h +++ b/include/wx/unix/private/wakeuppipe.h @@ -69,7 +69,7 @@ class wxWakeUpPipeMT : public wxWakeUpPipe { #if wxUSE_THREADS public: - wxWakeUpPipeMT() { } + wxWakeUpPipeMT() = default; // Thread-safe wrapper around WakeUpNoLock(): can be called from another // thread to wake up the main one. diff --git a/include/wx/unix/sound.h b/include/wx/unix/sound.h index 88eb24af0a..87c4e82f6f 100644 --- a/include/wx/unix/sound.h +++ b/include/wx/unix/sound.h @@ -118,7 +118,7 @@ struct wxSoundPlaybackStatus class WXDLLIMPEXP_CORE wxSoundBackend { public: - virtual ~wxSoundBackend() {} + virtual ~wxSoundBackend() = default; // Returns the name of the backend (e.g. "Open Sound System") virtual wxString GetName() const = 0; diff --git a/include/wx/unix/stdpaths.h b/include/wx/unix/stdpaths.h index 0d4f62ed83..018ed602e9 100644 --- a/include/wx/unix/stdpaths.h +++ b/include/wx/unix/stdpaths.h @@ -55,7 +55,7 @@ public: protected: // Ctor is protected, use wxStandardPaths::Get() instead of instantiating // objects of this class directly. - wxStandardPaths() { } + wxStandardPaths() = default; private: wxString m_prefix; diff --git a/include/wx/url.h b/include/wx/url.h index 457b043b9f..5d5c4f9c53 100644 --- a/include/wx/url.h +++ b/include/wx/url.h @@ -38,7 +38,7 @@ class WXDLLIMPEXP_FWD_NET wxURL; class WXDLLIMPEXP_NET wxURLNativeImp : public wxObject { public: - virtual ~wxURLNativeImp() { } + virtual ~wxURLNativeImp() = default; virtual wxInputStream *GetInputStream(wxURL *owner) = 0; }; #endif // wxUSE_URL_NATIVE diff --git a/include/wx/ustring.h b/include/wx/ustring.h index 7790ac1656..8aa136614b 100644 --- a/include/wx/ustring.h +++ b/include/wx/ustring.h @@ -41,7 +41,7 @@ typedef wxScopedCharTypeBuffer wxScopedU32CharBuffer; class WXDLLIMPEXP_BASE wxUString: public std::basic_string { public: - wxUString() { } + wxUString() = default; wxUString( const wxChar32 *str ) { assign(str); } wxUString( const wxScopedU32CharBuffer &buf ) { assign(buf); } diff --git a/include/wx/valgen.h b/include/wx/valgen.h index 4a3f60882c..8f26bd1740 100644 --- a/include/wx/valgen.h +++ b/include/wx/valgen.h @@ -51,7 +51,7 @@ public: wxGenericValidator(const wxGenericValidator& copyFrom); - virtual ~wxGenericValidator(){} + virtual ~wxGenericValidator() = default; // Make a clone of this validator (or return nullptr) - currently necessary // if you're passing a reference to a validator. diff --git a/include/wx/valtext.h b/include/wx/valtext.h index b292f31447..1f67db1fcc 100644 --- a/include/wx/valtext.h +++ b/include/wx/valtext.h @@ -51,7 +51,7 @@ public: wxTextValidator(long style = wxFILTER_NONE, wxString *val = nullptr); wxTextValidator(const wxTextValidator& val); - virtual ~wxTextValidator(){} + virtual ~wxTextValidator() = default; // Make a clone of this validator (or return nullptr) - currently necessary // if you're passing a reference to a validator. diff --git a/include/wx/variant.h b/include/wx/variant.h index f2f42cc9d4..4d5f1fe44c 100644 --- a/include/wx/variant.h +++ b/include/wx/variant.h @@ -56,7 +56,7 @@ class WXDLLIMPEXP_BASE wxVariantData : public wxObjectRefData { friend class wxVariant; public: - wxVariantData() { } + wxVariantData() = default; // Override these to provide common functionality virtual bool Eq(wxVariantData& data) const = 0; @@ -87,7 +87,7 @@ protected: // Protected dtor should make some incompatible code // break more louder. That is, they should do data->DecRef() // instead of delete data. - virtual ~wxVariantData() { } + virtual ~wxVariantData() = default; }; /* @@ -485,7 +485,7 @@ expdecl wxVariant& operator << ( wxVariant &variant, const classname &object ); class classname##VariantData: public wxVariantData \ { \ public:\ - classname##VariantData() {} \ + classname##VariantData() = default; \ classname##VariantData( const classname &value ) : m_value(value) { } \ \ classname &GetValue() { return m_value; } \ diff --git a/include/wx/variantbase.h b/include/wx/variantbase.h index 9f9710745e..27bbddfd6b 100644 --- a/include/wx/variantbase.h +++ b/include/wx/variantbase.h @@ -99,7 +99,7 @@ protected: // Protected dtor should make some incompatible code // break more louder. That is, they should do data->DecRef() // instead of delete data. - virtual ~wxVariantData() {} + virtual ~wxVariantData() = default; private: int m_count; @@ -109,7 +109,7 @@ template class wxVariantDataT : public wxVariantData { public: wxVariantDataT(const T& d) : m_data(d) {} - virtual ~wxVariantDataT() {} + virtual ~wxVariantDataT() = default; // get a ref to the stored data T & Get() { return m_data; } diff --git a/include/wx/webview.h b/include/wx/webview.h index 4209e82685..33bd1485fd 100644 --- a/include/wx/webview.h +++ b/include/wx/webview.h @@ -97,7 +97,7 @@ enum wxWebViewUserScriptInjectionTime class WXDLLIMPEXP_WEBVIEW wxWebViewHandlerRequest { public: - virtual ~wxWebViewHandlerRequest() { } + virtual ~wxWebViewHandlerRequest() = default; virtual wxString GetRawURI() const = 0; virtual wxString GetURI() const { return GetRawURI(); } virtual wxInputStream* GetData() const = 0; @@ -109,14 +109,14 @@ public: class WXDLLIMPEXP_WEBVIEW wxWebViewHandlerResponseData { public: - virtual ~wxWebViewHandlerResponseData() { } + virtual ~wxWebViewHandlerResponseData() = default; virtual wxInputStream* GetStream() = 0; }; class WXDLLIMPEXP_WEBVIEW wxWebViewHandlerResponse { public: - virtual ~wxWebViewHandlerResponse() { } + virtual ~wxWebViewHandlerResponse() = default; virtual void SetStatus(int status) = 0; virtual void SetContentType(const wxString& contentType) = 0; virtual void SetHeader(const wxString& name, const wxString& value) = 0; @@ -131,7 +131,7 @@ class WXDLLIMPEXP_WEBVIEW wxWebViewHandler public: wxWebViewHandler(const wxString& scheme) : m_scheme(scheme), m_securityURL() {} - virtual ~wxWebViewHandler() {} + virtual ~wxWebViewHandler() = default; virtual wxString GetName() const { return m_scheme; } virtual wxFSFile* GetFile(const wxString &uri); virtual void SetSecurityURL(const wxString& url) { m_securityURL = url; } @@ -199,7 +199,7 @@ public: m_syncScriptResult = 0; } - virtual ~wxWebView() {} + virtual ~wxWebView() = default; virtual bool Create(wxWindow* parent, wxWindowID id, @@ -376,7 +376,7 @@ protected: class WXDLLIMPEXP_WEBVIEW wxWebViewEvent : public wxNotifyEvent { public: - wxWebViewEvent() {} + wxWebViewEvent() = default; wxWebViewEvent(wxEventType type, int id, const wxString& url, const wxString target, wxWebViewNavigationActionFlags flags = wxWEBVIEW_NAV_ACTION_NONE, diff --git a/include/wx/window.h b/include/wx/window.h index e596814923..49316194f2 100644 --- a/include/wx/window.h +++ b/include/wx/window.h @@ -2114,7 +2114,7 @@ class WXDLLIMPEXP_CORE wxWindowAccessible: public wxAccessible { public: wxWindowAccessible(wxWindow* win): wxAccessible(win) { if (win) win->SetAccessible(this); } - virtual ~wxWindowAccessible() {} + virtual ~wxWindowAccessible() = default; // Overridables diff --git a/include/wx/windowptr.h b/include/wx/windowptr.h index 9d136b77fa..6f0a6b352e 100644 --- a/include/wx/windowptr.h +++ b/include/wx/windowptr.h @@ -40,7 +40,7 @@ public: { } - wxWindowPtr() {} + wxWindowPtr() = default; wxWindowPtr(const wxWindowPtr& tocopy) : wxSharedPtr(tocopy) {} wxWindowPtr& operator=(const wxWindowPtr& tocopy) diff --git a/include/wx/wizard.h b/include/wx/wizard.h index fb7a7f4845..f586ce39e2 100644 --- a/include/wx/wizard.h +++ b/include/wx/wizard.h @@ -201,7 +201,7 @@ public: const wxPoint& pos = wxDefaultPosition, long style = wxDEFAULT_DIALOG_STYLE); */ - wxWizardBase() { } + wxWizardBase() = default; // executes the wizard starting from the given page, returns true if it was // successfully finished, false if user cancelled it diff --git a/include/wx/x11/bitmap.h b/include/wx/x11/bitmap.h index 921190d442..2161cdfc8a 100644 --- a/include/wx/x11/bitmap.h +++ b/include/wx/x11/bitmap.h @@ -54,7 +54,7 @@ private: class WXDLLIMPEXP_CORE wxBitmap: public wxBitmapBase { public: - wxBitmap() {} + wxBitmap() = default; wxBitmap( int width, int height, int depth = -1 ) { Create( width, height, depth ); } wxBitmap( const wxSize& sz, int depth = -1 ) { Create( sz, depth ); } wxBitmap( int width, int height, const wxDC& dc ) { Create(width, height, dc); } diff --git a/include/wx/x11/brush.h b/include/wx/x11/brush.h index bb5acb5940..7a3f76cfc5 100644 --- a/include/wx/x11/brush.h +++ b/include/wx/x11/brush.h @@ -27,7 +27,7 @@ class WXDLLIMPEXP_FWD_CORE wxBitmap; class WXDLLIMPEXP_CORE wxBrush : public wxBrushBase { public: - wxBrush() { } + wxBrush() = default; wxBrush( const wxColour &colour, wxBrushStyle style = wxBRUSHSTYLE_SOLID ); wxBrush( const wxBitmap &stippleBitmap ); diff --git a/include/wx/x11/dataobj.h b/include/wx/x11/dataobj.h index 2ad6f0ec80..e94765bd6c 100644 --- a/include/wx/x11/dataobj.h +++ b/include/wx/x11/dataobj.h @@ -19,7 +19,7 @@ public: wxDataObject(); #ifdef __DARWIN__ - virtual ~wxDataObject() { } + virtual ~wxDataObject() = default; #endif virtual bool IsSupportedFormat( const wxDataFormat& format, Direction dir = Get ) const; diff --git a/include/wx/x11/dc.h b/include/wx/x11/dc.h index 801bfac9d0..220e89fa70 100644 --- a/include/wx/x11/dc.h +++ b/include/wx/x11/dc.h @@ -24,7 +24,7 @@ class WXDLLIMPEXP_CORE wxX11DCImpl : public wxDCImpl { public: wxX11DCImpl( wxDC *owner ); - virtual ~wxX11DCImpl() { } + virtual ~wxX11DCImpl() = default; virtual wxSize GetPPI() const; diff --git a/include/wx/x11/dnd.h b/include/wx/x11/dnd.h index 76073d5e59..8622d140f6 100644 --- a/include/wx/x11/dnd.h +++ b/include/wx/x11/dnd.h @@ -62,7 +62,7 @@ class WXDLLIMPEXP_CORE wxTextDropTarget: public wxDropTarget { public: - wxTextDropTarget() {} + wxTextDropTarget() = default; virtual bool OnDrop( long x, long y, const void *data, size_t size ); virtual bool OnDropText( long x, long y, const char *psz ); @@ -110,7 +110,7 @@ class WXDLLIMPEXP_CORE wxFileDropTarget: public wxDropTarget { public: - wxFileDropTarget() {} + wxFileDropTarget() = default; virtual bool OnDrop( long x, long y, const void *data, size_t size ); virtual bool OnDropFiles( long x, long y, diff --git a/include/wx/x11/font.h b/include/wx/x11/font.h index 6b3815d08d..d3fde5fad9 100644 --- a/include/wx/x11/font.h +++ b/include/wx/x11/font.h @@ -17,7 +17,7 @@ class WXDLLIMPEXP_CORE wxFont : public wxFontBase { public: // ctors and such - wxFont() { } + wxFont() = default; wxFont(const wxFontInfo& info) { diff --git a/include/wx/x11/minifram.h b/include/wx/x11/minifram.h index f2a3052a8e..c709208206 100644 --- a/include/wx/x11/minifram.h +++ b/include/wx/x11/minifram.h @@ -19,7 +19,7 @@ class WXDLLIMPEXP_CORE wxMiniFrame: public wxFrame { wxDECLARE_DYNAMIC_CLASS(wxMiniFrame); public: - inline wxMiniFrame() {} + inline wxMiniFrame() = default; inline wxMiniFrame(wxWindow *parent, wxWindowID id, const wxString& title, @@ -32,7 +32,7 @@ public: Create(parent, id, title, pos, size, style, name); } - virtual ~wxMiniFrame() {} + virtual ~wxMiniFrame() = default; protected: }; diff --git a/include/wx/x11/pen.h b/include/wx/x11/pen.h index 0b27d992ab..e7f780fad8 100644 --- a/include/wx/x11/pen.h +++ b/include/wx/x11/pen.h @@ -30,7 +30,7 @@ typedef char wxX11Dash; class WXDLLIMPEXP_CORE wxPen: public wxPenBase { public: - wxPen() { } + wxPen() = default; wxPen( const wxColour &colour, int width = 1, wxPenStyle style = wxPENSTYLE_SOLID ); diff --git a/include/wx/x11/popupwin.h b/include/wx/x11/popupwin.h index c1435a5ecb..8f6b782610 100644 --- a/include/wx/x11/popupwin.h +++ b/include/wx/x11/popupwin.h @@ -21,7 +21,7 @@ class WXDLLIMPEXP_CORE wxPopupWindow: public wxPopupWindowBase { public: - wxPopupWindow() { } + wxPopupWindow() = default; virtual ~wxPopupWindow() ; wxPopupWindow(wxWindow *parent, int flags = wxBORDER_NONE) diff --git a/include/wx/x11/region.h b/include/wx/x11/region.h index c65622d0a1..5a7f95298e 100644 --- a/include/wx/x11/region.h +++ b/include/wx/x11/region.h @@ -19,7 +19,7 @@ class WXDLLIMPEXP_CORE wxRegion : public wxRegionBase { public: - wxRegion() { } + wxRegion() = default; wxRegion( wxCoord x, wxCoord y, wxCoord w, wxCoord h ) { diff --git a/include/wx/x11/reparent.h b/include/wx/x11/reparent.h index a752538ec5..fd858af4c3 100644 --- a/include/wx/x11/reparent.h +++ b/include/wx/x11/reparent.h @@ -20,7 +20,7 @@ class WXDLLIMPEXP_FWD_CORE wxAdoptedWindow; class WXDLLIMPEXP_CORE wxReparenter: public wxObject { public: - wxReparenter() {} + wxReparenter() = default; // We assume that toReparent has had its X window set // appropriately. toReparent is typically a wxAdoptedWindow. diff --git a/include/wx/xml/xml.h b/include/wx/xml/xml.h index 0a72143985..485f706932 100644 --- a/include/wx/xml/xml.h +++ b/include/wx/xml/xml.h @@ -67,7 +67,7 @@ public: wxXmlAttribute(const wxString& name, const wxString& value, wxXmlAttribute *next = nullptr) : m_name(name), m_value(value), m_next(next) {} - virtual ~wxXmlAttribute() {} + virtual ~wxXmlAttribute() = default; const wxString& GetName() const { return m_name; } const wxString& GetValue() const { return m_value; } diff --git a/include/wx/xpmdecod.h b/include/wx/xpmdecod.h index 46b5aafb3d..1f5e22ccce 100644 --- a/include/wx/xpmdecod.h +++ b/include/wx/xpmdecod.h @@ -24,8 +24,8 @@ class WXDLLIMPEXP_CORE wxXPMDecoder { public: // constructor, destructor, etc. - wxXPMDecoder() {} - ~wxXPMDecoder() {} + wxXPMDecoder() = default; + ~wxXPMDecoder() = default; #if wxUSE_STREAMS // Is the stream XPM file? diff --git a/include/wx/xrc/xmlres.h b/include/wx/xrc/xmlres.h index 868c5eb216..4bcd32b180 100644 --- a/include/wx/xrc/xmlres.h +++ b/include/wx/xrc/xmlres.h @@ -488,7 +488,7 @@ public: wxXmlResourceHandlerImpl(wxXmlResourceHandler *handler); // Destructor. - virtual ~wxXmlResourceHandlerImpl() {} + virtual ~wxXmlResourceHandlerImpl() = default; // Creates an object (menu, dialog, control, ...) from an XML node. // Should check for validity. @@ -702,7 +702,7 @@ public: // Try to create instance of given class and return it, return nullptr on // failure: virtual wxObject *Create(const wxString& className) = 0; - virtual ~wxXmlSubclassFactory() {} + virtual ~wxXmlSubclassFactory() = default; }; diff --git a/include/wx/xrc/xmlreshandler.h b/include/wx/xrc/xmlreshandler.h index 7c0dc4773d..bfbbfb4318 100644 --- a/include/wx/xrc/xmlreshandler.h +++ b/include/wx/xrc/xmlreshandler.h @@ -55,7 +55,7 @@ public: {} // Destructor. - virtual ~wxXmlResourceHandlerImplBase() {} + virtual ~wxXmlResourceHandlerImplBase() = default; virtual wxObject *CreateResource(wxXmlNode *node, wxObject *parent, wxObject *instance) = 0; diff --git a/include/wx/xtictor.h b/include/wx/xtictor.h index 0f9c1f0c8b..ce2032da3f 100644 --- a/include/wx/xtictor.h +++ b/include/wx/xtictor.h @@ -27,7 +27,7 @@ class WXDLLIMPEXP_BASE wxObjectAllocatorAndCreator { public: - virtual ~wxObjectAllocatorAndCreator() { } + virtual ~wxObjectAllocatorAndCreator() = default; virtual bool Create(wxObject * &o, wxAny *args) = 0; }; diff --git a/include/wx/xtiprop.h b/include/wx/xtiprop.h index 4a596ab434..0e2c8c9a77 100644 --- a/include/wx/xtiprop.h +++ b/include/wx/xtiprop.h @@ -41,7 +41,7 @@ class WXDLLIMPEXP_BASE wxPropertySetter { public: wxPropertySetter( const wxString name ) { m_name = name; } - virtual ~wxPropertySetter() {} + virtual ~wxPropertySetter() = default; virtual void Set( wxObject *object, const wxAny &variantValue ) const = 0; const wxString& GetName() const { return m_name; } @@ -54,7 +54,7 @@ class WXDLLIMPEXP_BASE wxPropertyGetter { public: wxPropertyGetter( const wxString name ) { m_name = name; } - virtual ~wxPropertyGetter() {} + virtual ~wxPropertyGetter() = default; virtual void Get( const wxObject *object, wxAny& result) const = 0; const wxString& GetName() const { return m_name; } @@ -67,7 +67,7 @@ class WXDLLIMPEXP_BASE wxPropertyCollectionGetter { public: wxPropertyCollectionGetter( const wxString name ) { m_name = name; } - virtual ~wxPropertyCollectionGetter() {} + virtual ~wxPropertyCollectionGetter() = default; virtual void Get( const wxObject *object, wxAnyList& result) const = 0; const wxString& GetName() const { return m_name; } @@ -83,7 +83,7 @@ class WXDLLIMPEXP_BASE wxPropertyCollectionAdder { public: wxPropertyCollectionAdder( const wxString name ) { m_name = name; } - virtual ~wxPropertyCollectionAdder() {} + virtual ~wxPropertyCollectionAdder() = default; virtual void Add( wxObject *object, const wxAny &variantValue ) const= 0; const wxString& GetName() const { return m_name; } @@ -97,7 +97,7 @@ class wxPropertySetter##property : public wxPropertySetter \ { \ public: \ wxPropertySetter##property() : wxPropertySetter( wxT(#setterMethod) ) {} \ - virtual ~wxPropertySetter##property() {} \ + virtual ~wxPropertySetter##property() = default; \ \ void Set( wxObject *object, const wxAny &variantValue ) const \ { \ @@ -115,7 +115,7 @@ class wxPropertyGetter##property : public wxPropertyGetter { \ public: \ wxPropertyGetter##property() : wxPropertyGetter( wxT(#gettermethod) ) {} \ - virtual ~wxPropertyGetter##property() {} \ + virtual ~wxPropertyGetter##property() = default; \ \ void Get( const wxObject *object, wxAny &result) const \ { \ @@ -129,7 +129,7 @@ class wxPropertyCollectionAdder##property : public wxPropertyCollectionAdder { \ public: \ wxPropertyCollectionAdder##property() : wxPropertyCollectionAdder( wxT(#addermethod) ) {} \ - virtual ~wxPropertyCollectionAdder##property() {} \ + virtual ~wxPropertyCollectionAdder##property() = default; \ \ void Add( wxObject *object, const wxAny &variantValue ) const \ { \ @@ -147,7 +147,7 @@ class wxPropertyCollectionGetter##property : public wxPropertyCollectionGetter { \ public: \ wxPropertyCollectionGetter##property() : wxPropertyCollectionGetter( wxT(#gettermethod) ) {} \ - virtual ~wxPropertyCollectionGetter##property() {} \ + virtual ~wxPropertyCollectionGetter##property() = default; \ \ void Get( const wxObject *object, wxAnyList &result) const \ { \ @@ -164,7 +164,7 @@ public: { m_setter = setter; m_getter = getter; m_adder = adder; m_collectionGetter = collectionGetter; } - virtual ~wxPropertyAccessor() {} + virtual ~wxPropertyAccessor() = default; // Setting a simple property (non-collection) virtual void SetProperty(wxObject *object, const wxAny &value) const diff --git a/include/wx/xtistrm.h b/include/wx/xtistrm.h index e0c7bc7e8e..015cca88e5 100644 --- a/include/wx/xtistrm.h +++ b/include/wx/xtistrm.h @@ -50,7 +50,7 @@ class WXDLLIMPEXP_BASE wxObjectReader; class WXDLLIMPEXP_BASE wxObjectWriterCallback { public: - virtual ~wxObjectWriterCallback() {} + virtual ~wxObjectWriterCallback() = default; // will be called before an object is written, may veto by returning false virtual bool BeforeWriteObject( wxObjectWriter *WXUNUSED(writer), @@ -248,7 +248,7 @@ private: class WXDLLIMPEXP_BASE wxObjectReaderCallback { public: - virtual ~wxObjectReaderCallback() {} + virtual ~wxObjectReaderCallback() = default; // allocate the new object on the heap, that object will have the passed in ID virtual void AllocateObject(int objectID, wxClassInfo *classInfo, diff --git a/include/wx/xtixml.h b/include/wx/xtixml.h index 7962ec1b83..8251a4fc51 100644 --- a/include/wx/xtixml.h +++ b/include/wx/xtixml.h @@ -97,7 +97,7 @@ class WXDLLIMPEXP_XML wxObjectXmlReader: public wxObjectReader { public: wxObjectXmlReader(wxXmlNode *parent) { m_parent = parent; } - virtual ~wxObjectXmlReader() {} + virtual ~wxObjectXmlReader() = default; // Reads a component from XML. The return value is the root object ID, which can // then be used to ask the readercallback about that object diff --git a/include/wx/zipstrm.h b/include/wx/zipstrm.h index c5140f9519..3dccdd5ee3 100644 --- a/include/wx/zipstrm.h +++ b/include/wx/zipstrm.h @@ -133,7 +133,7 @@ class WXDLLIMPEXP_FWD_BASE wxZipInputStream; class WXDLLIMPEXP_BASE wxZipNotifier { public: - virtual ~wxZipNotifier() { } + virtual ~wxZipNotifier() = default; virtual void OnEntryUpdated(wxZipEntry& entry) = 0; }; diff --git a/interface/wx/any.h b/interface/wx/any.h index c18c7f5c62..fa66c46bb7 100644 --- a/interface/wx/any.h +++ b/interface/wx/any.h @@ -284,7 +284,7 @@ union wxAnyValueBuffer public: wxAnyValueTypeImpl() : wxAnyValueTypeImplBase() { } - virtual ~wxAnyValueTypeImpl() { } + virtual ~wxAnyValueTypeImpl() = default; virtual bool ConvertValue(const wxAnyValueBuffer& src, wxAnyValueType* dstType, diff --git a/interface/wx/containr.h b/interface/wx/containr.h index a798896b38..76ff6970bd 100644 --- a/interface/wx/containr.h +++ b/interface/wx/containr.h @@ -23,7 +23,7 @@ { public: // Default constructor is implemented in the same way as always. - MyControlWithSubChildren() { } + MyControlWithSubChildren() = default; // Non-default constructor can't use wxControl ctor any more as // wxControl is not its direct base class, but it can use Create(). diff --git a/interface/wx/defs.h b/interface/wx/defs.h index 3cde43201a..e0263a77ce 100644 --- a/interface/wx/defs.h +++ b/interface/wx/defs.h @@ -1847,7 +1847,7 @@ template void wxDELETEA(T*& array); void DecRef() { if ( !--m_nRef ) delete this; } private: - ~RefCounted() { } + ~RefCounted() = default; wxSUPPRESS_GCC_PRIVATE_DTOR(RefCounted) }; diff --git a/interface/wx/hashmap.h b/interface/wx/hashmap.h index 0e88577aa3..2a8ac7f8a7 100644 --- a/interface/wx/hashmap.h +++ b/interface/wx/hashmap.h @@ -95,7 +95,7 @@ class MyKeyHash { public: - MyKeyHash() { } + MyKeyHash() = default; unsigned long operator()( const MyKey& k ) const { @@ -109,7 +109,7 @@ class MyKeyEqual { public: - MyKeyEqual() { } + MyKeyEqual() = default; bool operator()( const MyKey& a, const MyKey& b ) const { // compare for equality diff --git a/interface/wx/hashset.h b/interface/wx/hashset.h index 3f45f8dbcd..4c2f459724 100644 --- a/interface/wx/hashset.h +++ b/interface/wx/hashset.h @@ -81,7 +81,7 @@ class MyKeyHash { public: - MyKeyHash() { } + MyKeyHash() = default; unsigned long operator()( const MyKey& k ) const { @@ -95,7 +95,7 @@ class MyKeyEqual { public: - MyKeyEqual() { } + MyKeyEqual() = default; bool operator()( const MyKey& a, const MyKey& b ) const { // compare for equality diff --git a/interface/wx/module.h b/interface/wx/module.h index a8b4767a93..741731d684 100644 --- a/interface/wx/module.h +++ b/interface/wx/module.h @@ -31,7 +31,7 @@ class wxDDEModule: public wxModule { public: - wxDDEModule() { } + wxDDEModule() = default; virtual bool OnInit() { wxDDEInitialize(); return true; }; virtual void OnExit() { wxDDECleanUp(); }; diff --git a/interface/wx/object.h b/interface/wx/object.h index 231985cd29..74d073ed0f 100644 --- a/interface/wx/object.h +++ b/interface/wx/object.h @@ -26,7 +26,7 @@ class MyCar : public wxObject { public: - MyCar() { } + MyCar() = default; MyCar( int price ); bool IsOk() const { return m_refData != nullptr; } diff --git a/interface/wx/propgrid/editors.h b/interface/wx/propgrid/editors.h index 7527ba65f2..ad070ba0f0 100644 --- a/interface/wx/propgrid/editors.h +++ b/interface/wx/propgrid/editors.h @@ -441,8 +441,8 @@ public: wxDECLARE_DYNAMIC_CLASS(wxSampleMultiButtonEditor); public: - wxSampleMultiButtonEditor() {} - virtual ~wxSampleMultiButtonEditor() {} + wxSampleMultiButtonEditor() = default; + virtual ~wxSampleMultiButtonEditor() = default; virtual wxString GetName() const { return "SampleMultiButtonEditor"; } @@ -543,7 +543,7 @@ public: /** Destructor. */ - virtual ~wxPGMultiButton() { } + virtual ~wxPGMultiButton() = default; /** Adds new button, with given label. diff --git a/interface/wx/propgrid/property.h b/interface/wx/propgrid/property.h index 5dcaf12201..debf028d9a 100644 --- a/interface/wx/propgrid/property.h +++ b/interface/wx/propgrid/property.h @@ -797,7 +797,7 @@ constexpr wxPGPropertyFlags wxPG_PROP_MAX = wxPG_PROP_AUTO_UNSPECIFIED; { public: // Default constructor - MyProperty() { } + MyProperty() = default; // All arguments of this ctor must have a default value - // use wxPG_LABEL for label and name @@ -810,7 +810,7 @@ constexpr wxPGPropertyFlags wxPG_PROP_MAX = wxPG_PROP_AUTO_UNSPECIFIED; m_value = value; } - virtual ~MyProperty() { } + virtual ~MyProperty() = default; const wxPGEditor* DoGetEditorClass() const { diff --git a/interface/wx/propgrid/props.h b/interface/wx/propgrid/props.h index 7f65e06fd0..c5ac027f96 100644 --- a/interface/wx/propgrid/props.h +++ b/interface/wx/propgrid/props.h @@ -94,7 +94,7 @@ public: }; wxNumericPropertyValidator( NumericType numericType, int base = 10 ); - virtual ~wxNumericPropertyValidator() { } + virtual ~wxNumericPropertyValidator() = default; virtual bool Validate(wxWindow* parent); }; @@ -832,7 +832,7 @@ class wxPGArrayStringEditorDialog : public wxPGArrayEditorDialog { public: wxPGArrayStringEditorDialog(); - virtual ~wxPGArrayStringEditorDialog() { } + virtual ~wxPGArrayStringEditorDialog() = default; void Init(); diff --git a/interface/wx/richtext/richtextbuffer.h b/interface/wx/richtext/richtextbuffer.h index 83f4868b73..3a7104031b 100644 --- a/interface/wx/richtext/richtextbuffer.h +++ b/interface/wx/richtext/richtextbuffer.h @@ -370,7 +370,7 @@ public: /** Default constructor. */ - wxTextAttrDimensions() {} + wxTextAttrDimensions() = default; /** Resets the value and flags for all dimensions. @@ -464,7 +464,7 @@ public: /** Default constructor. */ - wxTextAttrSize() {} + wxTextAttrSize() = default; /** Resets the width and height dimensions. @@ -862,7 +862,7 @@ public: /** Default constructor. */ - wxTextAttrBorders() { } + wxTextAttrBorders() = default; /** Equality operator. @@ -1604,7 +1604,7 @@ public: /** Default constructor. */ - wxRichTextAttr() {} + wxRichTextAttr() = default; /** Copy function. @@ -1692,7 +1692,7 @@ public: /** Default constructor. */ - wxRichTextProperties() {} + wxRichTextProperties() = default; /** Copy constructor. @@ -1943,7 +1943,7 @@ public: Copy constructor. */ wxRichTextRange(const wxRichTextRange& range) { m_start = range.m_start; m_end = range.m_end; } - ~wxRichTextRange() {} + ~wxRichTextRange() = default; /** Assigns @a range to this range. @@ -4191,7 +4191,7 @@ public: wxRichTextLine(wxRichTextParagraph* parent); wxRichTextLine(const wxRichTextLine& obj); - virtual ~wxRichTextLine() {} + virtual ~wxRichTextLine() = default; // Overridables @@ -6731,8 +6731,8 @@ public: /** Constructor. */ - wxRichTextRenderer() {} - virtual ~wxRichTextRenderer() {} + wxRichTextRenderer() = default; + virtual ~wxRichTextRenderer() = default; /** Draws a standard bullet, as specified by the value of GetBulletName. This function should be overridden. @@ -6777,7 +6777,7 @@ public: /** Constructor. */ - wxRichTextStdRenderer() {} + wxRichTextStdRenderer() = default; // Draw a standard bullet, as specified by the value of GetBulletName virtual bool DrawStandardBullet(wxRichTextParagraph* paragraph, wxDC& dc, const wxRichTextAttr& attr, const wxRect& rect); diff --git a/tests/strings/stdstrings.cpp b/tests/strings/stdstrings.cpp index c695dd21fc..26333ebc76 100644 --- a/tests/strings/stdstrings.cpp +++ b/tests/strings/stdstrings.cpp @@ -54,9 +54,13 @@ TEST_CASE("StdString::Iterators", "[stdstring]") { // test compilation of default iterators ctors: wxString::iterator i1; + wxUnusedVar(i1); wxString::const_iterator i2; + wxUnusedVar(i2); wxString::reverse_iterator i3; + wxUnusedVar(i3); wxString::const_reverse_iterator i4; + wxUnusedVar(i4); } TEST_CASE("StdString::IteratorsCmp", "[stdstring]")