AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed compilation of multilib dll

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21606 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík 2003-07-03 13:25:58 +00:00
parent a8f12b67c4
commit eee614d37e
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
include/wx/dynarray.h
View File

@ -467,11 +467,16 @@ private: \
// Some commonly used predefined base arrays // Some commonly used predefined base arrays
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
WX_DECLARE_EXPORTED_BASEARRAY(const void *, wxBaseArrayPtrVoid); WX_DECLARE_USER_EXPORTED_BASEARRAY(const void *, wxBaseArrayPtrVoid,
WX_DECLARE_EXPORTED_BASEARRAY(short, wxBaseArrayShort); WXDLLIMPEXP_BASE);
WX_DECLARE_EXPORTED_BASEARRAY(int, wxBaseArrayInt); WX_DECLARE_USER_EXPORTED_BASEARRAY(short, wxBaseArrayShort,
WX_DECLARE_EXPORTED_BASEARRAY(long, wxBaseArrayLong); WXDLLIMPEXP_BASE);
WX_DECLARE_EXPORTED_BASEARRAY(double, wxBaseArrayDouble); 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 // Convenience macros to define arrays from base arrays
@ -588,10 +593,10 @@ WX_DECLARE_EXPORTED_BASEARRAY(double, wxBaseArrayDouble);
// Some commonly used predefined arrays // Some commonly used predefined arrays
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
WX_DEFINE_EXPORTED_ARRAY_SHORT (short, wxArrayShort); WX_DEFINE_USER_EXPORTED_ARRAY_SHORT (short, wxArrayShort, WXDLLIMPEXP_BASE);
WX_DEFINE_EXPORTED_ARRAY_INT (int, wxArrayInt); WX_DEFINE_USER_EXPORTED_ARRAY_INT (int, wxArrayInt, WXDLLIMPEXP_BASE);
WX_DEFINE_EXPORTED_ARRAY_LONG (long, wxArrayLong); WX_DEFINE_USER_EXPORTED_ARRAY_LONG (long, wxArrayLong, WXDLLIMPEXP_BASE);
WX_DEFINE_EXPORTED_ARRAY (void *, wxArrayPtrVoid); WX_DEFINE_USER_EXPORTED_ARRAY (void *, wxArrayPtrVoid, WXDLLIMPEXP_BASE);
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// convenience macros // convenience macros