X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/74cc3ec18e117a6ea6bc1c23a9b70ff960f4c0ae..58ce18f2fdadecffb21e27555115af708325cf18:/include/wx/dlimpexp.h?ds=sidebyside diff --git a/include/wx/dlimpexp.h b/include/wx/dlimpexp.h index 3c0a823edd..13231ed6fd 100644 --- a/include/wx/dlimpexp.h +++ b/include/wx/dlimpexp.h @@ -86,6 +86,7 @@ # define WXMAKINGDLL_XML # define WXMAKINGDLL_XRC # define WXMAKINGDLL_AUI +# define WXMAKINGDLL_RIBBON # define WXMAKINGDLL_PROPGRID # define WXMAKINGDLL_RICHTEXT # define WXMAKINGDLL_MEDIA @@ -216,12 +217,23 @@ # define WXDLLIMPEXP_AUI #endif +#ifdef WXMAKINGDLL_RIBBON +# define WXDLLIMPEXP_RIBBON WXEXPORT +#elif defined(WXUSINGDLL) +# define WXDLLIMPEXP_RIBBON WXIMPORT +#else /* not making nor using DLL */ +# define WXDLLIMPEXP_RIBBON +#endif + #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 +253,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 /*