removed operator>>(istream&, wxString&) -- it's better to not have it at all than...

[wxWidgets.git] / include / wx / dlimpexp.h

diff --git a/include/wx/dlimpexp.h b/include/wx/dlimpexp.h
index 6bdfbf458b3cf1109378797171d19a6ac5e1bf7d..f3ac1f085b4aefade3b62afb4a55d6958dd3ca10 100644 (file)
--- a/include/wx/dlimpexp.h
+++ b/include/wx/dlimpexp.h
@@ -48,6 +48,9 @@
 #        define WXEXPORT __declspec(export)
 #        define WXIMPORT __declspec(import)
 #    endif
 #        define WXEXPORT __declspec(export)
 #        define WXIMPORT __declspec(import)
 #    endif

+#elif defined(__CYGWIN__)
+#    define WXEXPORT __declspec(dllexport)
+#    define WXIMPORT __declspec(dllimport)

 #endif
 
 /* for other platforms/compilers we don't anything */
 #endif
 
 /* for other platforms/compilers we don't anything */


@@ -74,12 +77,15 @@
 #    define WXMAKINGDLL_NET
 #    define WXMAKINGDLL_CORE
 #    define WXMAKINGDLL_ADV
 #    define WXMAKINGDLL_NET
 #    define WXMAKINGDLL_CORE
 #    define WXMAKINGDLL_ADV

+#    define WXMAKINGDLL_QA

 #    define WXMAKINGDLL_ODBC
 #    define WXMAKINGDLL_DBGRID
 #    define WXMAKINGDLL_HTML
 #    define WXMAKINGDLL_GL
 #    define WXMAKINGDLL_XML
 #    define WXMAKINGDLL_XRC
 #    define WXMAKINGDLL_ODBC
 #    define WXMAKINGDLL_DBGRID
 #    define WXMAKINGDLL_HTML
 #    define WXMAKINGDLL_GL
 #    define WXMAKINGDLL_XML
 #    define WXMAKINGDLL_XRC

+#    define WXMAKINGDLL_AUI
+#    define WXMAKINGDLL_RICHTEXT

 #    define WXMAKINGDLL_MEDIA
 #endif /* WXMAKINGDLL */
 
 #    define WXMAKINGDLL_MEDIA
 #endif /* WXMAKINGDLL */
 


@@ -199,6 +205,22 @@
 #    define WXDLLIMPEXP_XRC
 #endif
 
 #    define WXDLLIMPEXP_XRC
 #endif
 

+#ifdef WXMAKINGDLL_AUI
+#    define WXDLLIMPEXP_AUI WXEXPORT
+#elif defined(WXUSINGDLL)
+#    define WXDLLIMPEXP_AUI WXIMPORT
+#else /* not making nor using DLL */
+#    define WXDLLIMPEXP_AUI
+#endif
+
+#ifdef WXMAKINGDLL_RICHTEXT
+#    define WXDLLIMPEXP_RICHTEXT WXEXPORT
+#elif defined(WXUSINGDLL)
+#    define WXDLLIMPEXP_RICHTEXT WXIMPORT
+#else /* not making nor using DLL */
+#    define WXDLLIMPEXP_RICHTEXT
+#endif
+

 #ifdef WXMAKINGDLL_MEDIA
 #    define WXDLLIMPEXP_MEDIA WXEXPORT
 #elif defined(WXUSINGDLL)
 #ifdef WXMAKINGDLL_MEDIA
 #    define WXDLLIMPEXP_MEDIA WXEXPORT
 #elif defined(WXUSINGDLL)