Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use macros to define default copy constructor and assignment operator

Browse Source
This commit is contained in:
Maarten Bent
2020-04-13 15:05:29 +02:00
parent 287c1b1d11
commit 1448b210b8
5 changed files with 35 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
include/wx/defs.h
View File

@@ -290,13 +290,10 @@ typedef short int WXTYPE;
still requires handling MSVS specially, unfortunately) */
#if __cplusplus >= 201103L || wxCHECK_VISUALC_VERSION(14)
#define wxHAS_MEMBER_DEFAULT
#define wxMEMBER_DEFAULT = default
#define wxHAS_NOEXCEPT
#define wxNOEXCEPT noexcept
#else
#define wxMEMBER_DEFAULT
#define wxNOEXCEPT
#endif
@@ -3042,6 +3039,22 @@ typedef const void* WXWidget;
#define DECLARE_NO_ASSIGN_CLASS(classname) \
wxDECLARE_NO_ASSIGN_CLASS(classname);
/* --------------------------------------------------------------------------- */
/* macros to define a class with default copy constructor and/or assignment operator */
/* --------------------------------------------------------------------------- */
#ifdef wxHAS_MEMBER_DEFAULT
#define wxDECLARE_DEFAULT_COPY_CTOR(classname) \
classname(const classname&) = default
#define wxDECLARE_DEFAULT_COPY_CLASS(classname) \
wxDECLARE_DEFAULT_COPY_CTOR(classname); \
classname& operator=(const classname&) = default
#else
#define wxDECLARE_DEFAULT_COPY_CTOR(classname)
#define wxDECLARE_DEFAULT_COPY_CLASS(classname)
#endif
/* --------------------------------------------------------------------------- */
/* If a manifest is being automatically generated, add common controls 6 to it */
/* --------------------------------------------------------------------------- */