compilation fixes for win32 dll+multilib

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22595 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/dynarray.h b/include/wx/dynarray.h
index 852ade1717f5f2555e9d861d38ef80d61f0f5cbe..834f6fc4d3d17db17d0503b2fbf633c36d76b778 100644 (file)
--- a/include/wx/dynarray.h
+++ b/include/wx/dynarray.h
@@ -820,6 +820,8 @@ WX_DECLARE_USER_EXPORTED_BASEARRAY(double, wxBaseArrayDouble, WXDLLIMPEXP_BASE);
     WX_DEFINE_EXPORTED_TYPEARRAY(T, name, wxBaseArrayPtrVoid)
 #define WX_DEFINE_EXPORTED_ARRAY_NO_PTR(T, name)                       \
     WX_DEFINE_EXPORTED_TYPEARRAY_NO_PTR(T, name, wxBaseArrayPtrVoid)
+#define WX_DEFINE_ARRAY_WITH_DECL_NO_PTR(T, name, decl)                \
+    WX_DEFINE_TYPEARRAY_WITH_DECL_NO_PTR(T, name, wxBaseArrayPtrVoid, decl)
 #define WX_DEFINE_USER_EXPORTED_ARRAY(T, name, expmode)                \
     WX_DEFINE_TYPEARRAY_WITH_DECL(T, name, wxBaseArrayPtrVoid, expmode)
 #define WX_DEFINE_USER_EXPORTED_ARRAY_NO_PTR(T, name, expmode)         \

diff --git a/include/wx/generic/grid.h b/include/wx/generic/grid.h
index 22c869cd7ad1b0bfb0626afe9ae21a67ab9af41d..616eefd72d845d0177cceb2d79544f931419db55 100644 (file)
--- a/include/wx/generic/grid.h
+++ b/include/wx/generic/grid.h
@@ -937,7 +937,8 @@ private:
 // A 2-dimensional array of strings for data values
 //
 
-WX_DECLARE_EXPORTED_OBJARRAY(wxArrayString, wxGridStringArray);
+WX_DECLARE_OBJARRAY_WITH_DECL(wxArrayString, wxGridStringArray,
+                              class WXDLLIMPEXP_ADV);
 
 
 
@@ -1051,7 +1052,8 @@ extern WXDLLIMPEXP_ADV wxRect           wxGridNoCellRect;
 
 // An array of cell coords...
 //
-WX_DECLARE_EXPORTED_OBJARRAY(wxGridCellCoords, wxGridCellCoordsArray);
+WX_DECLARE_OBJARRAY_WITH_DECL(wxGridCellCoords, wxGridCellCoordsArray,
+                              class WXDLLIMPEXP_ADV);
 
 // ----------------------------------------------------------------------------
 // wxGrid

diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index 37281b564597c886c5696ed2005fdfdefa0b0a7a..43e4e40dc28a2a8775fe496ed5ced1bd658d87f5 100644 (file)
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -69,7 +69,8 @@
 // array classes
 // ----------------------------------------------------------------------------
 
-WX_DEFINE_EXPORTED_ARRAY_NO_PTR(wxGridCellAttr *, wxArrayAttrs);
+WX_DEFINE_ARRAY_WITH_DECL_NO_PTR(wxGridCellAttr *, wxArrayAttrs,
+                                 class WXDLLIMPEXP_ADV);
 
 struct wxGridCellWithAttr
 {
@@ -91,7 +92,8 @@ struct wxGridCellWithAttr
 // without rewriting the macros, which require a public copy constructor.
 };
 
-WX_DECLARE_EXPORTED_OBJARRAY(wxGridCellWithAttr, wxGridCellWithAttrArray);
+WX_DECLARE_OBJARRAY_WITH_DECL(wxGridCellWithAttr, wxGridCellWithAttrArray,
+                              class WXDLLIMPEXP_ADV);
 
 #include "wx/arrimpl.cpp"
 
@@ -332,7 +334,8 @@ struct wxGridDataTypeInfo
 };
 
 
-WX_DEFINE_EXPORTED_ARRAY_NO_PTR(wxGridDataTypeInfo*, wxGridDataTypeInfoArray);
+WX_DEFINE_ARRAY_WITH_DECL_NO_PTR(wxGridDataTypeInfo*, wxGridDataTypeInfoArray,
+                                 class WXDLLIMPEXP_ADV);
 
 
 class WXDLLIMPEXP_ADV wxGridTypeRegistry