fixing warning and compile error against 10.4

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

diff --git a/include/wx/dlimpexp.h b/include/wx/dlimpexp.h
index 3f400f52d8413a9669bbea107c0779d12d1da1a4..13231ed6fd33e746cbc070f566291e03e3204bc2 100644 (file)
--- a/include/wx/dlimpexp.h
+++ b/include/wx/dlimpexp.h
@@ -86,6 +86,7 @@
 #    define WXMAKINGDLL_XML
 #    define WXMAKINGDLL_XRC
 #    define WXMAKINGDLL_AUI
+#    define WXMAKINGDLL_RIBBON
 #    define WXMAKINGDLL_PROPGRID
 #    define WXMAKINGDLL_RICHTEXT
 #    define WXMAKINGDLL_MEDIA
@@ -216,6 +217,14 @@
 #    define WXDLLIMPEXP_AUI
 #endif
 
+#ifdef WXMAKINGDLL_RIBBON
+#    define WXDLLIMPEXP_RIBBON WXEXPORT
+#elif defined(WXUSINGDLL)
+#    define WXDLLIMPEXP_RIBBON WXIMPORT
+#else /* not making nor using DLL */
+#    define WXDLLIMPEXP_RIBBON
+#endif
+
 #ifdef WXMAKINGDLL_PROPGRID
 #    define WXDLLIMPEXP_PROPGRID WXEXPORT
 #    define WXDLLIMPEXP_DATA_PROPGRID(type) WXEXPORT type