Get rid of wxFontMapper in wxBase library.

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

diff --git a/include/wx/features.h b/include/wx/features.h
index d4a19c9748309ee05740ff971f6aae2188677bd2..62370ae63b1b3c5ffc8b6235ee6a34518affea08 100644 (file)
--- a/include/wx/features.h
+++ b/include/wx/features.h
@@ -1,12 +1,12 @@
 /**
 *  Name:        wx/features.h
 *  Purpose:     test macros for the features which might be available in some
-*               wxWindows ports but not others
+*               wxWidgets ports but not others
 *  Author:      Vadim Zeitlin
 *  Modified by: Ryan Norton (Converted to C)
 *  Created:     18.03.02
 *  RCS-ID:      $Id$
-*  Copyright:   (c) 2002 Vadim Zeitlin <vadim@wxwindows.org>
+*  Copyright:   (c) 2002 Vadim Zeitlin <vadim@wxwidgets.org>
 *  Licence:     wxWindows licence
 */
 
@@ -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