From 021f9dee07486c1171b7db0060802a7cab215cad Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 27 Feb 2009 11:36:10 +0000 Subject: [PATCH] added wxDECLARE_NO_COPY_TEMPLATE_CLASS_2 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59184 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/defs.h | 5 +++++ interface/wx/defs.h | 18 ++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/include/wx/defs.h b/include/wx/defs.h index 1fdea42..64bd994 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 1640d7b..924470b 100644 --- a/interface/wx/defs.h +++ b/interface/wx/defs.h @@ -975,10 +975,28 @@ 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. This function uses operator delete to free the pointer and also sets it to -- 2.7.4