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

Revert default-member changes, only keep and use wxHAS_MEMBER_DEFAULT

Browse Source
This commit is contained in:
Maarten Bent
2020-04-13 19:44:04 +02:00
parent 1448b210b8
commit 9039340da9
4 changed files with 7 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/wx/animate.h
View File

@@ -38,7 +38,10 @@ public:
wxAnimation(); wxAnimation();
explicit wxAnimation(const wxString &name, wxAnimationType type = wxANIMATION_TYPE_ANY); explicit wxAnimation(const wxString &name, wxAnimationType type = wxANIMATION_TYPE_ANY);
wxDECLARE_DEFAULT_COPY_CLASS(wxAnimation); #ifdef wxHAS_MEMBER_DEFAULT
wxAnimation(const wxAnimation&) = default;
wxAnimation& operator=(const wxAnimation&) = default;
#endif
bool IsOk() const; bool IsOk() const;
bool IsCompatibleWith(wxClassInfo* ci) const; bool IsCompatibleWith(wxClassInfo* ci) const;

16
include/wx/defs.h
View File

@@ -3039,22 +3039,6 @@ typedef const void* WXWidget;
#define DECLARE_NO_ASSIGN_CLASS(classname) \ #define DECLARE_NO_ASSIGN_CLASS(classname) \
wxDECLARE_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 */ /* If a manifest is being automatically generated, add common controls 6 to it */
/* --------------------------------------------------------------------------- */ /* --------------------------------------------------------------------------- */

4
include/wx/unichar.h
View File

@@ -267,7 +267,9 @@ public:
wxUniCharRef& operator=(const wxUniCharRef& c) wxUniCharRef& operator=(const wxUniCharRef& c)
{ if (&c != this) *this = c.UniChar(); return *this; } { if (&c != this) *this = c.UniChar(); return *this; }
wxDECLARE_DEFAULT_COPY_CTOR(wxUniCharRef); #ifdef wxHAS_MEMBER_DEFAULT
wxUniCharRef(const wxUniCharRef&) = default;
#endif
#define wxUNICHAR_REF_DEFINE_OPERATOR_EQUAL(type) \ #define wxUNICHAR_REF_DEFINE_OPERATOR_EQUAL(type) \
wxUniCharRef& operator=(type c) { return *this = wxUniChar(c); } wxUniCharRef& operator=(type c) { return *this = wxUniChar(c); }

16
interface/wx/defs.h
View File

@@ -1561,22 +1561,6 @@ typedef double wxDouble;
*/ */
#define wxDECLARE_NO_COPY_TEMPLATE_CLASS_2(classname, arg1, arg2) #define wxDECLARE_NO_COPY_TEMPLATE_CLASS_2(classname, arg1, arg2)
/**
This macro can be used in a class declaration to enable declaring the
default copy constructor and assignment operator.
@since 3.1.4
*/
#define wxDECLARE_DEFAULT_COPY_CLASS(classname)
/**
This macro can be used in a class declaration to enable declaring the
default copy constructor.
@since 3.1.4
*/
#define wxDECLARE_DEFAULT_COPY_CTOR(classname)
/** /**
A function which deletes and nulls the pointer. A function which deletes and nulls the pointer.