only define globals when wxUSE_BASE to avoid duplicate definitions in wxBase and...

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

diff --git a/include/wx/features.h b/include/wx/features.h
index 67ca4cfc8b75c0f4a53e762ccd25e6874a4bc4cd..62370ae63b1b3c5ffc8b6235ee6a34518affea08 100644 (file)
--- a/include/wx/features.h
+++ b/include/wx/features.h
@@ -29,9 +29,10 @@
     #undef wxHAS_RAW_KEY_CODES
 #endif
 
-/*  taskbar is only implemented in wxMSW and X11 ports */
-#if defined(__WXMSW__) || \
-        defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXX11__)
+/*  taskbar is implemented in the major ports */
+#if defined(__WXMSW__) || defined(__WXCOCOA__) || \
+        defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXX11__) || \
+       (defined(__WXMAC__) && defined(__WXMAC_OSX__)) || defined(__WXCOCOA__)
     #define wxHAS_TASK_BAR_ICON
 #else
     #undef wxHAS_TASK_BAR_ICON