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

diff --git a/include/wx/dlimpexp.h b/include/wx/dlimpexp.h
index f0b6eb861fa7280426a57a475ba94e007065daf7..fd823a514436d4be9d094d50fb73a1d9c181d5e5 100644 (file)
--- 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_DBGRID
 #    define WXMAKINGDLL_HTML
 #    define WXMAKINGDLL_XML

+#    define WXMAKINGDLL_XRC

 #endif /* WXMAKINGDLL */
 
 /*
 #endif /* WXMAKINGDLL */
 
 /*


@@ -177,6 +178,14 @@
 #    define WXDLLIMPEXP_XML
 #endif
 
 #    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
 /* 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 ded3f30324458511a8f010470caf2dbde0ab0596..a2194f1198a625cb6a28a64443f596aa3316b023 100644 (file)
--- a/include/wx/xrc/xmlres.h
+++ b/include/wx/xrc/xmlres.h
@@ -31,14 +31,6 @@
 
 #include "wx/xml/xml.h"
 
 
 #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;
 class WXDLLEXPORT wxMenu;
 class WXDLLEXPORT wxMenuBar;
 class WXDLLEXPORT wxDialog;