From a7140600c9fa39b8cd9f7817d4293edfbd35c016 Mon Sep 17 00:00:00 2001
From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= <vslavik@fastmail.fm>
Date: Sat, 5 Jul 2003 17:11:57 +0000
Subject: [PATCH] removed WXUSINGDLL_FOO, one WXUSINGDLL is enough
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21672 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
build/bakefiles/multilib.bkl | 5 ++---
include/wx/defs.h | 15 +++------------
2 files changed, 5 insertions(+), 15 deletions(-)
diff --git a/build/bakefiles/multilib.bkl b/build/bakefiles/multilib.bkl
index ebc6a54642..4f4422bfad 100644
--- a/build/bakefiles/multilib.bkl
+++ b/build/bakefiles/multilib.bkl
@@ -28,7 +28,7 @@
<dll id="coredll" template="wx_dll"
cond="SHARED=='1' and USE_GUI=='1' and MONOLITHIC=='0'">
- <define>WXUSINGDLL_BASE</define>
+ <define>WXUSINGDLL</define>
<define>WXMAKINGDLL_CORE</define>
<define>wxUSE_BASE=0</define>
<sources>$(BASE_AND_GUI_SRC) $(CORE_SRC)</sources>
@@ -48,8 +48,7 @@
<dll id="htmldll" template="wx_dll"
cond="SHARED=='1' and USE_GUI=='1' and MONOLITHIC=='0'">
- <define>WXUSINGDLL_BASE</define>
- <define>WXUSINGDLL_CORE</define>
+ <define>WXUSINGDLL</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 63a0822e76..a95dac23ce 100644
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -371,27 +371,18 @@ typedef int wxWindowID;
#ifdef WXMAKINGDLL
#if wxUSE_BASE
#define WXMAKINGDLL_BASE
- #else
- #define WXUSINGDLL_BASE
#endif
#define WXMAKINGDLL_CORE
#define WXMAKINGDLL_HTML
#endif // WXMAKINGDLL
-#ifdef WXUSINGDLL
- #define WXUSINGDLL_BASE
- #define WXUSINGDLL_CORE
- #define WXUSINGDLL_HTML
-#endif // WXUSINGDLL
-
-
// 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
#define WXDLLIMPEXP_BASE WXEXPORT
#define WXDLLIMPEXP_DATA_BASE(type) WXEXPORT type
-#elif defined(WXUSINGDLL_BASE)
+#elif defined(WXUSINGDLL)
#define WXDLLIMPEXP_BASE WXIMPORT
#define WXDLLIMPEXP_DATA_BASE(type) WXIMPORT type
#else // not making nor using DLL
@@ -402,7 +393,7 @@ typedef int wxWindowID;
#ifdef WXMAKINGDLL_CORE
#define WXDLLIMPEXP_CORE WXEXPORT
#define WXDLLIMPEXP_DATA_CORE(type) WXEXPORT type
-#elif defined(WXUSINGDLL_CORE)
+#elif defined(WXUSINGDLL)
#define WXDLLIMPEXP_CORE WXIMPORT
#define WXDLLIMPEXP_DATA_CORE(type) WXIMPORT type
#else // not making nor using DLL
@@ -413,7 +404,7 @@ typedef int wxWindowID;
#ifdef WXMAKINGDLL_HTML
#define WXDLLIMPEXP_HTML WXEXPORT
#define WXDLLIMPEXP_DATA_HTML(type) WXEXPORT type
-#elif defined(WXUSINGDLL_HTML)
+#elif defined(WXUSINGDLL)
#define WXDLLIMPEXP_HTML WXIMPORT
#define WXDLLIMPEXP_DATA_HTML(type) WXIMPORT type
#else // not making nor using DLL
--
2.47.2