don't required all WXMAKINGDLL_FOO defines

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21574 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/defs.h b/include/wx/defs.h
index bcbb1856e686d12283ece241f4e1829d4eef7c59..f5f2d18659c854380b16739e91df82c81ae19ee1 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -387,6 +387,7 @@ typedef int wxWindowID;
 // WXDLLEXPORT maps to export declaration when building the DLL, to import
 // declaration if using it or to nothing at all if we don't use wxWin as DLL
 #ifdef WXMAKINGDLL_BASE
+    #undef WXUSINGDLL_BASE
     #define WXDLLIMPEXP_BASE WXEXPORT
     #define WXDLLIMPEXP_DATA_BASE(type) WXEXPORT type
 #elif defined(WXUSINGDLL_BASE)
@@ -398,6 +399,7 @@ typedef int wxWindowID;
 #endif
 
 #ifdef WXMAKINGDLL_CORE
+    #undef WXUSINGDLL_CORE
     #define WXDLLIMPEXP_CORE WXEXPORT
     #define WXDLLIMPEXP_DATA_CORE(type) WXEXPORT type
 #elif defined(WXUSINGDLL_CORE)