declare all NameStr[] strings as const char using the correct WXDLLIMPEXP_DATA_ macros; in the process, change wxPropGrid window classes to take 'const wxString& name' arguments instead of 'const wxChar *name'
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56651 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -218,10 +218,13 @@
|
||||
|
||||
#ifdef WXMAKINGDLL_PROPGRID
|
||||
# define WXDLLIMPEXP_PROPGRID WXEXPORT
|
||||
# define WXDLLIMPEXP_DATA_PROPGRID(type) WXEXPORT type
|
||||
#elif defined(WXUSINGDLL)
|
||||
# define WXDLLIMPEXP_PROPGRID WXIMPORT
|
||||
# define WXDLLIMPEXP_DATA_PROPGRID(type) WXIMPORT type
|
||||
#else /* not making nor using DLL */
|
||||
# define WXDLLIMPEXP_PROPGRID
|
||||
# define WXDLLIMPEXP_DATA_PROPGRID(type) type
|
||||
#endif
|
||||
|
||||
#ifdef WXMAKINGDLL_RICHTEXT
|
||||
@@ -241,11 +244,14 @@
|
||||
#endif
|
||||
|
||||
#ifdef WXMAKINGDLL_STC
|
||||
#define WXDLLIMPEXP_STC WXEXPORT
|
||||
# define WXDLLIMPEXP_STC WXEXPORT
|
||||
# define WXDLLIMPEXP_DATA_STC(type) WXEXPORT type
|
||||
#elif defined(WXUSINGDLL)
|
||||
#define WXDLLIMPEXP_STC WXIMPORT
|
||||
# define WXDLLIMPEXP_STC WXIMPORT
|
||||
# define WXDLLIMPEXP_DATA_STC(type) WXIMPORT type
|
||||
#else /* not making nor using DLL */
|
||||
#define WXDLLIMPEXP_STC
|
||||
# define WXDLLIMPEXP_STC
|
||||
# define WXDLLIMPEXP_DATA_STC(type) type
|
||||
#endif
|
||||
|
||||
/*
|
||||
|
Reference in New Issue
Block a user