From c846884b3801ce9881ed270f79b52811af11cf9e Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Thu, 7 Oct 2004 22:58:09 +0000 Subject: [PATCH] Make sure that WXMAKINGDLL_XRC is defined correctly for monolithic DLL builds git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29719 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/dlimpexp.h | 9 +++++++++ include/wx/xrc/xmlres.h | 8 -------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/include/wx/dlimpexp.h b/include/wx/dlimpexp.h index f0b6eb861f..fd823a5144 100644 --- a/include/wx/dlimpexp.h +++ b/include/wx/dlimpexp.h @@ -78,6 +78,7 @@ # define WXMAKINGDLL_DBGRID # define WXMAKINGDLL_HTML # define WXMAKINGDLL_XML +# define WXMAKINGDLL_XRC #endif /* WXMAKINGDLL */ /* @@ -177,6 +178,14 @@ # define WXDLLIMPEXP_XML #endif +#ifdef WXMAKINGDLL_XRC +# define WXDLLIMPEXP_XRC WXEXPORT +#elif defined(WXUSINGDLL) +# define WXDLLIMPEXP_XRC WXIMPORT +#else /* not making nor using DLL */ +# define WXDLLIMPEXP_XRC +#endif + /* for backwards compatibility, define suffix-less versions too */ #define WXDLLEXPORT WXDLLIMPEXP_CORE #define WXDLLEXPORT_DATA WXDLLIMPEXP_DATA_CORE diff --git a/include/wx/xrc/xmlres.h b/include/wx/xrc/xmlres.h index ded3f30324..a2194f1198 100644 --- a/include/wx/xrc/xmlres.h +++ b/include/wx/xrc/xmlres.h @@ -31,14 +31,6 @@ #include "wx/xml/xml.h" -#ifdef WXMAKINGDLL_XRC - #define WXDLLIMPEXP_XRC WXEXPORT -#elif defined(WXUSINGDLL) - #define WXDLLIMPEXP_XRC WXIMPORT -#else // not making nor using DLL - #define WXDLLIMPEXP_XRC -#endif - class WXDLLEXPORT wxMenu; class WXDLLEXPORT wxMenuBar; class WXDLLEXPORT wxDialog; -- 2.45.2