From: Václav Slavík Date: Sun, 3 Aug 2003 10:42:22 +0000 (+0000) Subject: added WX_DECLARE_OBJARRAY_WITH_DECL X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/fd68cfdbfb73b76322c83bddbc39d5360a2b590d?ds=inline added WX_DECLARE_OBJARRAY_WITH_DECL git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22510 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/dynarray.h b/include/wx/dynarray.h index 746591411d..852ade1717 100644 --- a/include/wx/dynarray.h +++ b/include/wx/dynarray.h @@ -781,9 +781,12 @@ private: \ #define WX_DECLARE_EXPORTED_OBJARRAY(T, name) \ WX_DECLARE_USER_EXPORTED_OBJARRAY(T, name, WXDLLEXPORT) -#define WX_DECLARE_USER_EXPORTED_OBJARRAY(T, name, expmode) \ +#define WX_DECLARE_OBJARRAY_WITH_DECL(T, name, decl) \ typedef T _wxObjArray##name; \ - _WX_DECLARE_OBJARRAY(_wxObjArray##name, name, wxArrayPtrVoid, class expmode) + _WX_DECLARE_OBJARRAY(_wxObjArray##name, name, wxArrayPtrVoid, decl) + +#define WX_DECLARE_USER_EXPORTED_OBJARRAY(T, name, expmode) \ + WX_DECLARE_OBJARRAY_WITH_DECL(T, name, class expmode) // WX_DEFINE_OBJARRAY is going to be redefined when arrimpl.cpp is included, // try to provoke a human-understandable error if it used incorrectly.