[ 1487463 ] XRC handler for wxOwnerDrawnComboBox.

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

diff --git a/include/wx/features.h b/include/wx/features.h
index 9e3472861bc15c4c2e7bc02e859a2bfa41e0e3ed..796dedd445be20d0804599b6e9ba5ffe47962cc5 100644 (file)
--- a/include/wx/features.h
+++ b/include/wx/features.h
@@ -7,7 +7,7 @@
 *  Created:     18.03.02
 *  RCS-ID:      $Id$
 *  Copyright:   (c) 2002 Vadim Zeitlin <vadim@wxwidgets.org>
-*  Licence:     wxWidgets licence
+*  Licence:     wxWindows licence
 */
 
 /* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */
@@ -23,15 +23,16 @@
 #endif
 
 /*  the raw keyboard codes are generated under wxGTK and wxMSW only */
-#if defined(__WXGTK__) || defined(__WXMSW__)
+#if defined(__WXGTK__) || defined(__WXMSW__) || defined(__WXMAC__)
     #define wxHAS_RAW_KEY_CODES
 #else
     #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_OSX__) || defined(__WXCOCOA__)
     #define wxHAS_TASK_BAR_ICON
 #else
     #undef wxHAS_TASK_BAR_ICON