X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/94e0018723919fe2ca2f5b5f0a42804c16dbf3a1..7ddb15416407390de67cc26b04e91ea99a521f57:/include/wx/dlimpexp.h?ds=inline diff --git a/include/wx/dlimpexp.h b/include/wx/dlimpexp.h index 12e98fea54..934c7c57cb 100644 --- a/include/wx/dlimpexp.h +++ b/include/wx/dlimpexp.h @@ -57,11 +57,6 @@ # define WXEXPORT _Export # define WXIMPORT _Export # endif -#elif defined(__WXMAC__) || defined(__WXCOCOA__) -# ifdef __MWERKS__ -# define WXEXPORT __declspec(export) -# define WXIMPORT __declspec(import) -# endif #elif defined(__CYGWIN__) # define WXEXPORT __declspec(dllexport) # define WXIMPORT __declspec(dllimport) @@ -97,12 +92,12 @@ # define WXMAKINGDLL_XML # define WXMAKINGDLL_XRC # define WXMAKINGDLL_AUI -# define WXMAKINGDLL_RIBBON # define WXMAKINGDLL_PROPGRID +# define WXMAKINGDLL_RIBBON # define WXMAKINGDLL_RICHTEXT # define WXMAKINGDLL_MEDIA # define WXMAKINGDLL_STC -# define WXMAKINGDLL_WEB +# define WXMAKINGDLL_WEBVIEW #endif /* WXMAKINGDLL */ /* @@ -229,14 +224,6 @@ # 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 @@ -248,6 +235,14 @@ # define WXDLLIMPEXP_DATA_PROPGRID(type) type #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_RICHTEXT # define WXDLLIMPEXP_RICHTEXT WXEXPORT #elif defined(WXUSINGDLL) @@ -275,15 +270,15 @@ # define WXDLLIMPEXP_DATA_STC(type) type #endif -#ifdef WXMAKINGDLL_WEB -# define WXDLLIMPEXP_WEB WXEXPORT -# define WXDLLIMPEXP_DATA_WEB(type) WXEXPORT type +#ifdef WXMAKINGDLL_WEBVIEW +# define WXDLLIMPEXP_WEBVIEW WXEXPORT +# define WXDLLIMPEXP_DATA_WEBVIEW(type) WXEXPORT type #elif defined(WXUSINGDLL) -# define WXDLLIMPEXP_WEB WXIMPORT -# define WXDLLIMPEXP_DATA_WEB(type) WXIMPORT type +# define WXDLLIMPEXP_WEBVIEW WXIMPORT +# define WXDLLIMPEXP_DATA_WEBVIEW(type) WXIMPORT type #else /* not making nor using DLL */ -# define WXDLLIMPEXP_WEB -# define WXDLLIMPEXP_DATA_WEB(type) type +# define WXDLLIMPEXP_WEBVIEW +# define WXDLLIMPEXP_DATA_WEBVIEW(type) type #endif /* @@ -304,10 +299,11 @@ #define WXDLLIMPEXP_FWD_XRC #define WXDLLIMPEXP_FWD_AUI #define WXDLLIMPEXP_FWD_PROPGRID + #define WXDLLIMPEXP_FWD_RIBBON #define WXDLLIMPEXP_FWD_RICHTEXT #define WXDLLIMPEXP_FWD_MEDIA #define WXDLLIMPEXP_FWD_STC - #define WXDLLIMPEXP_FWD_WEB + #define WXDLLIMPEXP_FWD_WEBVIEW #else #define WXDLLIMPEXP_FWD_BASE WXDLLIMPEXP_BASE #define WXDLLIMPEXP_FWD_NET WXDLLIMPEXP_NET @@ -320,10 +316,11 @@ #define WXDLLIMPEXP_FWD_XRC WXDLLIMPEXP_XRC #define WXDLLIMPEXP_FWD_AUI WXDLLIMPEXP_AUI #define WXDLLIMPEXP_FWD_PROPGRID WXDLLIMPEXP_PROPGRID + #define WXDLLIMPEXP_FWD_RIBBON WXDLLIMPEXP_RIBBON #define WXDLLIMPEXP_FWD_RICHTEXT WXDLLIMPEXP_RICHTEXT #define WXDLLIMPEXP_FWD_MEDIA WXDLLIMPEXP_MEDIA #define WXDLLIMPEXP_FWD_STC WXDLLIMPEXP_STC - #define WXDLLIMPEXP_FWD_WEB WXDLLIMPEXP_WEB + #define WXDLLIMPEXP_FWD_WEBVIEW WXDLLIMPEXP_WEBVIEW #endif /* for backwards compatibility, define suffix-less versions too */