Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

compilation fixes for win32 dll+multilib

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22595 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2003-08-05 16:16:49 +00:00
parent 0b659b0a51
commit 160ba750f2
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/dynarray.h
View File

@@ -820,6 +820,8 @@ WX_DECLARE_USER_EXPORTED_BASEARRAY(double, wxBaseArrayDouble, WXDLLIMPEXP_BASE);
WX_DEFINE_EXPORTED_TYPEARRAY(T, name, wxBaseArrayPtrVoid) WX_DEFINE_EXPORTED_TYPEARRAY(T, name, wxBaseArrayPtrVoid)
#define WX_DEFINE_EXPORTED_ARRAY_NO_PTR(T, name) \ #define WX_DEFINE_EXPORTED_ARRAY_NO_PTR(T, name) \
WX_DEFINE_EXPORTED_TYPEARRAY_NO_PTR(T, name, wxBaseArrayPtrVoid) 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) \ #define WX_DEFINE_USER_EXPORTED_ARRAY(T, name, expmode) \
WX_DEFINE_TYPEARRAY_WITH_DECL(T, name, wxBaseArrayPtrVoid, expmode) WX_DEFINE_TYPEARRAY_WITH_DECL(T, name, wxBaseArrayPtrVoid, expmode)
#define WX_DEFINE_USER_EXPORTED_ARRAY_NO_PTR(T, name, expmode) \ #define WX_DEFINE_USER_EXPORTED_ARRAY_NO_PTR(T, name, expmode) \

6
include/wx/generic/grid.h
View File

@@ -937,7 +937,8 @@ private:
// A 2-dimensional array of strings for data values // 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... // An array of cell coords...
// //
WX_DECLARE_EXPORTED_OBJARRAY(wxGridCellCoords, wxGridCellCoordsArray); WX_DECLARE_OBJARRAY_WITH_DECL(wxGridCellCoords, wxGridCellCoordsArray,
class WXDLLIMPEXP_ADV);
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxGrid // wxGrid

9
src/generic/grid.cpp
View File

@@ -69,7 +69,8 @@
// array classes // array classes
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
WX_DEFINE_EXPORTED_ARRAY_NO_PTR(wxGridCellAttr *, wxArrayAttrs); WX_DEFINE_ARRAY_WITH_DECL_NO_PTR(wxGridCellAttr *, wxArrayAttrs,
class WXDLLIMPEXP_ADV);
struct wxGridCellWithAttr struct wxGridCellWithAttr
{ {
@@ -91,7 +92,8 @@ struct wxGridCellWithAttr
// without rewriting the macros, which require a public copy constructor. // 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" #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 class WXDLLIMPEXP_ADV wxGridTypeRegistry