From eee614d37e50cdada50bd2c62e331ce5fb7e701b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Thu, 3 Jul 2003 13:25:58 +0000 Subject: [PATCH] fixed compilation of multilib dll git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21606 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/dynarray.h | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/include/wx/dynarray.h b/include/wx/dynarray.h index fb4b3f6d8b..02bbcff0dd 100644 --- a/include/wx/dynarray.h +++ b/include/wx/dynarray.h @@ -467,11 +467,16 @@ private: \ // Some commonly used predefined base arrays // ---------------------------------------------------------------------------- -WX_DECLARE_EXPORTED_BASEARRAY(const void *, wxBaseArrayPtrVoid); -WX_DECLARE_EXPORTED_BASEARRAY(short, wxBaseArrayShort); -WX_DECLARE_EXPORTED_BASEARRAY(int, wxBaseArrayInt); -WX_DECLARE_EXPORTED_BASEARRAY(long, wxBaseArrayLong); -WX_DECLARE_EXPORTED_BASEARRAY(double, wxBaseArrayDouble); +WX_DECLARE_USER_EXPORTED_BASEARRAY(const void *, wxBaseArrayPtrVoid, + WXDLLIMPEXP_BASE); +WX_DECLARE_USER_EXPORTED_BASEARRAY(short, wxBaseArrayShort, + WXDLLIMPEXP_BASE); +WX_DECLARE_USER_EXPORTED_BASEARRAY(int, wxBaseArrayInt, + WXDLLIMPEXP_BASE); +WX_DECLARE_USER_EXPORTED_BASEARRAY(long, wxBaseArrayLong, + WXDLLIMPEXP_BASE); +WX_DECLARE_USER_EXPORTED_BASEARRAY(double, wxBaseArrayDouble, + WXDLLIMPEXP_BASE); // ---------------------------------------------------------------------------- // Convenience macros to define arrays from base arrays @@ -588,10 +593,10 @@ WX_DECLARE_EXPORTED_BASEARRAY(double, wxBaseArrayDouble); // Some commonly used predefined arrays // ---------------------------------------------------------------------------- -WX_DEFINE_EXPORTED_ARRAY_SHORT (short, wxArrayShort); -WX_DEFINE_EXPORTED_ARRAY_INT (int, wxArrayInt); -WX_DEFINE_EXPORTED_ARRAY_LONG (long, wxArrayLong); -WX_DEFINE_EXPORTED_ARRAY (void *, wxArrayPtrVoid); +WX_DEFINE_USER_EXPORTED_ARRAY_SHORT (short, wxArrayShort, WXDLLIMPEXP_BASE); +WX_DEFINE_USER_EXPORTED_ARRAY_INT (int, wxArrayInt, WXDLLIMPEXP_BASE); +WX_DEFINE_USER_EXPORTED_ARRAY_LONG (long, wxArrayLong, WXDLLIMPEXP_BASE); +WX_DEFINE_USER_EXPORTED_ARRAY (void *, wxArrayPtrVoid, WXDLLIMPEXP_BASE); // ----------------------------------------------------------------------------- // convenience macros