no changes, just corrected the comment for wxConvLocal

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

diff --git a/include/wx/dlimpexp.h b/include/wx/dlimpexp.h
index b2f24e348ad086e4e48f1f453ad3ebfdc86e8eda..16e58d497495c34ad373c19f5691618bc1f3847a 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
+#elif defined(__CYGWIN__)
+#    define WXEXPORT __declspec(dllexport)
+#    define WXIMPORT __declspec(dllimport)
 #endif
 
 /* for other platforms/compilers we don't anything */
@@ -77,8 +80,10 @@
 #    define WXMAKINGDLL_ODBC
 #    define WXMAKINGDLL_DBGRID
 #    define WXMAKINGDLL_HTML
+#    define WXMAKINGDLL_GL
 #    define WXMAKINGDLL_XML
 #    define WXMAKINGDLL_XRC
+#    define WXMAKINGDLL_MEDIA
 #endif /* WXMAKINGDLL */
 
 /*
@@ -140,6 +145,17 @@
 #    define WXDLLIMPEXP_DATA_ODBC(type) type
 #endif
 
+#ifdef WXMAKINGDLL_QA
+#    define WXDLLIMPEXP_QA WXEXPORT
+#    define WXDLLIMPEXP_DATA_QA(type) WXEXPORT type
+#elif defined(WXUSINGDLL)
+#    define WXDLLIMPEXP_QA WXIMPORT
+#    define WXDLLIMPEXP_DATA_QA(type) WXIMPORT type
+#else /* not making nor using DLL */
+#    define WXDLLIMPEXP_QA
+#    define WXDLLIMPEXP_DATA_QA(type) type
+#endif
+
 #ifdef WXMAKINGDLL_DBGRID
 #    define WXDLLIMPEXP_DBGRID WXEXPORT
 #    define WXDLLIMPEXP_DATA_DBGRID(type) WXEXPORT type