reverted previous change

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

diff --git a/build/bakefiles/multilib.bkl b/build/bakefiles/multilib.bkl
index a977678950bd42bfdc72b5e5368ee0798fdca7a4..1e70d1aef9b49d01fe3da1cef2402d0b4459d319 100644 (file)
--- a/build/bakefiles/multilib.bkl
+++ b/build/bakefiles/multilib.bkl
@@ -7,7 +7,6 @@
     
     <dll id="basedll" template="wx_dll"
          cond="SHARED=='1' and MONOLITHIC=='0'">
-        <define>WXUSINGDLL</define>
         <define>WXMAKINGDLL_BASE</define>
         <define>wxUSE_BASE=1</define>
         <define>wxUSE_GUI=0</define> 
@@ -27,7 +26,7 @@
     
     <dll id="coredll" template="wx_dll"
          cond="SHARED=='1' and USE_GUI=='1' and MONOLITHIC=='0'">
-        <define>WXUSINGDLL</define>
+        <define>WXUSINGDLL_BASE</define>
         <define>WXMAKINGDLL_CORE</define>
         <define>wxUSE_BASE=0</define> 
         <sources>$(BASE_AND_GUI_SRC) $(CORE_SRC)</sources>
@@ -47,7 +46,8 @@
     
     <dll id="htmldll" template="wx_dll"
          cond="SHARED=='1' and USE_GUI=='1' and MONOLITHIC=='0'">
-        <define>WXUSINGDLL</define>
+        <define>WXUSINGDLL_BASE</define>
+        <define>WXUSINGDLL_CORE</define>
         <define>WXMAKINGDLL_HTML</define>
         <sources>$(HTML_SRC)</sources>
         <library>coredll</library>

diff --git a/include/wx/defs.h b/include/wx/defs.h
index f5f2d18659c854380b16739e91df82c81ae19ee1..bcbb1856e686d12283ece241f4e1829d4eef7c59 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -387,7 +387,6 @@ 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)
@@ -399,7 +398,6 @@ 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)