X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b5f62a0b2db198609b45dec622a018dae37008e..b808efdb885aa82a6c34a8278119bae63c7f4183:/contrib/include/wx/fl/fldefs.h?ds=sidebyside

diff --git a/contrib/include/wx/fl/fldefs.h b/contrib/include/wx/fl/fldefs.h
index d8346b6229..010117b39d 100644
--- a/contrib/include/wx/fl/fldefs.h
+++ b/contrib/include/wx/fl/fldefs.h
@@ -18,32 +18,28 @@
  * If we're using wx in Dynamic Library format do we 
  * want FL to be in DLL form as well?
  */
-#if defined(WXUSINGDLL) && \
-    (defined(WXMAKING_FL_DLL) || defined(WXUSING_FL_DLL))
-
-#if defined(WXMAKING_FL_DLL)
-    // When building the DLL WXFLDECLSPEC exports classes
-#   define WXFL_DECLSPEC            WXEXPORT
-#elif defined(WXUSING_FL_DLL)
-    // When building the DLL WXFLDECLSPEC imports classes
-#   define WXFL_DECLSPEC            WXIMPORT
-#endif // defined(WXBUILD_FL_DLL)
-
-#else
-// When building the static library nullify the effect of WXFL_DECLSPEC
-#define WXFL_DECLSPEC
-#endif // WXUSINGDLL && (WXMAKING_FL_DLL || WXUSING_FL_DLL)
+#ifdef WXMAKINGDLL_FL
+    #define WXDLLIMPEXP_FL WXEXPORT
+#elif defined(WXUSINGDLL)
+    #define WXDLLIMPEXP_FL WXIMPORT
+#else // not making nor using DLL
+    #define WXDLLIMPEXP_FL
+#endif
 
 ///////////////////////////////////////////////////////////////////////////////
 // Override some of the wxArray functions to
 // include our definitions
 ///////////////////////////////////////////////////////////////////////////////
 #define WXFL_DEFINE_ARRAY(c,l)      \
-    class WXFL_DECLSPEC l;          \
+    class WXDLLIMPEXP_FL l;          \
     WX_DEFINE_ARRAY(c,l)
 
+#define WXFL_DEFINE_ARRAY_PTR(c,l)\
+    class WXDLLIMPEXP_FL l;          \
+    WX_DEFINE_ARRAY_PTR(c,l)
+
 #define WXFL_DEFINE_ARRAY_LONG(t,l) \
-    class WXFL_DECLSPEC l;          \
+    class WXDLLIMPEXP_FL l;          \
     WX_DEFINE_ARRAY_LONG(t,l)