diff --git a/include/wx/defs.h b/include/wx/defs.h index 1fdea42202..64bd994a80 100644 --- a/include/wx/defs.h +++ b/include/wx/defs.h @@ -3145,6 +3145,11 @@ typedef const void* WXWidget; classname(const classname&); \ classname& operator=(const classname&) +#define wxDECLARE_NO_COPY_TEMPLATE_CLASS_2(classname, arg1, arg2) \ + private: \ + classname(const classname&); \ + classname& operator=(const classname&) + #define wxDECLARE_NO_ASSIGN_CLASS(classname) \ private: \ classname& operator=(const classname&) diff --git a/interface/wx/defs.h b/interface/wx/defs.h index 1640d7b3bd..924470bed1 100644 --- a/interface/wx/defs.h +++ b/interface/wx/defs.h @@ -975,9 +975,27 @@ typedef double wxDouble; @param classname The name of the template class. @param arg The name of the template parameter. + + @see wxDECLARE_NO_COPY_TEMPLATE_CLASS_2 */ #define wxDECLARE_NO_COPY_TEMPLATE_CLASS(classname, arg) +/** + Analog of wxDECLARE_NO_COPY_TEMPLATE_CLASS() for templates with 2 + parameters. + + This macro can be used for template classes with two template + parameters for the same purpose as wxDECLARE_NO_COPY_CLASS() is used with + the non-template classes. + + @param classname The name of the template class. + @param arg1 The name of the first template parameter. + @param arg2 The name of the second template parameter. + + @see wxDECLARE_NO_COPY_TEMPLATE_CLASS + */ +#define wxDECLARE_NO_COPY_TEMPLATE_CLASS_2(classname, arg1, arg2) + /** A function which deletes and nulls the pointer.