# define WXMAKINGDLL_XML
# define WXMAKINGDLL_XRC
# define WXMAKINGDLL_AUI
+# define WXMAKINGDLL_RIBBON
+# define WXMAKINGDLL_PROPGRID
# define WXMAKINGDLL_RICHTEXT
# define WXMAKINGDLL_MEDIA
# define WXMAKINGDLL_STC
+# define WXMAKINGDLL_WEB
#endif /* WXMAKINGDLL */
/*
#ifdef WXMAKINGDLL_BASE
# define WXDLLIMPEXP_BASE WXEXPORT
# define WXDLLIMPEXP_DATA_BASE(type) WXEXPORT type
+# if defined(HAVE_VISIBILITY)
+# define WXDLLIMPEXP_INLINE_BASE WXEXPORT
+# else
+# define WXDLLIMPEXP_INLINE_BASE
+# endif
#elif defined(WXUSINGDLL)
# define WXDLLIMPEXP_BASE WXIMPORT
# define WXDLLIMPEXP_DATA_BASE(type) WXIMPORT type
+# if defined(HAVE_VISIBILITY)
+# define WXDLLIMPEXP_INLINE_BASE WXIMPORT
+# else
+# define WXDLLIMPEXP_INLINE_BASE
+# endif
#else /* not making nor using DLL */
# define WXDLLIMPEXP_BASE
# define WXDLLIMPEXP_DATA_BASE(type) type
+# define WXDLLIMPEXP_INLINE_BASE
#endif
#ifdef WXMAKINGDLL_NET
#ifdef WXMAKINGDLL_CORE
# define WXDLLIMPEXP_CORE WXEXPORT
# define WXDLLIMPEXP_DATA_CORE(type) WXEXPORT type
+# if defined(HAVE_VISIBILITY)
+# define WXDLLIMPEXP_INLINE_CORE WXEXPORT
+# else
+# define WXDLLIMPEXP_INLINE_CORE
+# endif
#elif defined(WXUSINGDLL)
# define WXDLLIMPEXP_CORE WXIMPORT
# define WXDLLIMPEXP_DATA_CORE(type) WXIMPORT type
+# if defined(HAVE_VISIBILITY)
+# define WXDLLIMPEXP_INLINE_CORE WXIMPORT
+# else
+# define WXDLLIMPEXP_INLINE_CORE
+# endif
#else /* not making nor using DLL */
# define WXDLLIMPEXP_CORE
# define WXDLLIMPEXP_DATA_CORE(type) type
+# define WXDLLIMPEXP_INLINE_CORE
#endif
#ifdef WXMAKINGDLL_ADV
# 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
#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_DATA_STC(type) WXIMPORT type
+#else /* not making nor using DLL */
+# define WXDLLIMPEXP_STC
+# define WXDLLIMPEXP_DATA_STC(type) type
+#endif
+
+#ifdef WXMAKINGDLL_WEB
+# define WXDLLIMPEXP_WEB WXEXPORT
+# define WXDLLIMPEXP_DATA_WEB(type) WXEXPORT type
#elif defined(WXUSINGDLL)
- #define WXDLLIMPEXP_STC WXIMPORT
+# define WXDLLIMPEXP_WEB WXIMPORT
+# define WXDLLIMPEXP_DATA_WEB(type) WXIMPORT type
#else /* not making nor using DLL */
- #define WXDLLIMPEXP_STC
+# define WXDLLIMPEXP_WEB
+# define WXDLLIMPEXP_DATA_WEB(type) type
#endif
/*
#define WXDLLIMPEXP_FWD_XML
#define WXDLLIMPEXP_FWD_XRC
#define WXDLLIMPEXP_FWD_AUI
+ #define WXDLLIMPEXP_FWD_PROPGRID
#define WXDLLIMPEXP_FWD_RICHTEXT
#define WXDLLIMPEXP_FWD_MEDIA
#define WXDLLIMPEXP_FWD_STC
+ #define WXDLLIMPEXP_FWD_WEB
#else
#define WXDLLIMPEXP_FWD_BASE WXDLLIMPEXP_BASE
#define WXDLLIMPEXP_FWD_NET WXDLLIMPEXP_NET
#define WXDLLIMPEXP_FWD_XML WXDLLIMPEXP_XML
#define WXDLLIMPEXP_FWD_XRC WXDLLIMPEXP_XRC
#define WXDLLIMPEXP_FWD_AUI WXDLLIMPEXP_AUI
+ #define WXDLLIMPEXP_FWD_PROPGRID WXDLLIMPEXP_PROPGRID
#define WXDLLIMPEXP_FWD_RICHTEXT WXDLLIMPEXP_RICHTEXT
#define WXDLLIMPEXP_FWD_MEDIA WXDLLIMPEXP_MEDIA
#define WXDLLIMPEXP_FWD_STC WXDLLIMPEXP_STC
+ #define WXDLLIMPEXP_FWD_WEB WXDLLIMPEXP_WEB
#endif
/* for backwards compatibility, define suffix-less versions too */