fix WXDLLIMPEXP_STC definition when building all wx libraries as DLLs (patch 1704527)

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

diff --git a/include/wx/dlimpexp.h b/include/wx/dlimpexp.h
index f3ac1f085b4aefade3b62afb4a55d6958dd3ca10..b3e4258db8773b89c640cc2cf5c7324ee30e6e8a 100644 (file)
--- a/include/wx/dlimpexp.h
+++ b/include/wx/dlimpexp.h
@@ -87,6 +87,7 @@
 #    define WXMAKINGDLL_AUI
 #    define WXMAKINGDLL_RICHTEXT
 #    define WXMAKINGDLL_MEDIA
+#    define WXMAKINGDLL_STC
 #endif /* WXMAKINGDLL */
 
 /*
@@ -229,6 +230,14 @@
 #    define WXDLLIMPEXP_MEDIA
 #endif
 
+#ifdef WXMAKINGDLL_STC
+    #define WXDLLIMPEXP_STC WXEXPORT
+#elif defined(WXUSINGDLL)
+    #define WXDLLIMPEXP_STC WXIMPORT
+#else /* not making nor using DLL */
+    #define WXDLLIMPEXP_STC
+#endif
+
 /* for backwards compatibility, define suffix-less versions too */
 #define WXDLLEXPORT WXDLLIMPEXP_CORE
 #define WXDLLEXPORT_DATA WXDLLIMPEXP_DATA_CORE

diff --git a/include/wx/stc/stc.h b/include/wx/stc/stc.h
index 10a2e656ab8d17c69f6c2509620e1e3d37b244e2..bd36f73a317ebe469b19a1767dfacce4df690456 100644 (file)
--- a/include/wx/stc/stc.h
+++ b/include/wx/stc/stc.h
@@ -30,15 +30,6 @@
 
 class WXDLLIMPEXP_CORE wxScrollBar;
 
-#ifdef WXMAKINGDLL_STC
-    #define WXDLLIMPEXP_STC WXEXPORT
-#elif defined(WXUSINGDLL)
-    #define WXDLLIMPEXP_STC WXIMPORT
-#else // not making nor using DLL
-    #define WXDLLIMPEXP_STC
-#endif
-
-
 // SWIG can't handle "#if" type of conditionals, only "#ifdef"
 #ifdef SWIG
 #define STC_USE_DND 1

diff --git a/src/stc/ScintillaWX.h b/src/stc/ScintillaWX.h
index d791fa25e458c05632567e0ffbbd24a198a25d51..cdad2be175a58fcdf9c2bee9a47614031862f2d6 100644 (file)
--- a/src/stc/ScintillaWX.h
+++ b/src/stc/ScintillaWX.h
@@ -16,6 +16,7 @@
 
 #ifndef __ScintillaWX_h__
 #define __ScintillaWX_h__
+#include "wx/defs.h"
 
 //----------------------------------------------------------------------
 
@@ -58,13 +59,6 @@
 
 //----------------------------------------------------------------------
 
-#ifdef WXMAKINGDLL_STC
-    #define WXDLLIMPEXP_STC WXEXPORT
-#elif defined(WXUSINGDLL)
-    #define WXDLLIMPEXP_STC WXIMPORT
-#else // not making nor using DLL
-    #define WXDLLIMPEXP_STC
-#endif
 
 class WXDLLIMPEXP_CORE wxDC;
 class WXDLLIMPEXP_STC wxStyledTextCtrl;           // forward