X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7047ddc0cfda29bce70136d1d15d03af3b6f7d00..05c3f0fc73d9124061c08e3d707b4e3d6bab4ff4:/include/wx/features.h

diff --git a/include/wx/features.h b/include/wx/features.h
index 1c39ea05d4..62370ae63b 100644
--- a/include/wx/features.h
+++ b/include/wx/features.h
@@ -1,13 +1,13 @@
 /**
-*  Name:        wx/features.h 
-*  Purpose:     test macros for the features which might be available in some 
-*               wxWindows ports but not others 
-*  Author:      Vadim Zeitlin 
+*  Name:        wx/features.h
+*  Purpose:     test macros for the features which might be available in some
+*               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> 
-*  Licence:     wxWindows licence 
+*  Created:     18.03.02
+*  RCS-ID:      $Id$
+*  Copyright:   (c) 2002 Vadim Zeitlin <vadim@wxwidgets.org>
+*  Licence:     wxWindows licence
 */
 
 /* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */
@@ -29,17 +29,10 @@
     #undef wxHAS_RAW_KEY_CODES
 #endif
 
-/*  detect SmartPhone */
-#ifdef WIN32_PLATFORM_WFSP
-    #ifdef wxUSE_SMARTPHONE
-    #undef wxUSE_SMARTPHONE
-    #endif
-    #define wxUSE_SMARTPHONE 1
-#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
@@ -58,10 +51,6 @@
 
 /*  wxRE_ADVANCED is not always available, depending on regex library used
  *  (it's unavailable only if compiling via configure against system library) */
-#ifdef __INNOTEK_LIBC__
-    #define WX_NO_REGEX_ADVANCED
-#endif
-
 #ifndef WX_NO_REGEX_ADVANCED
     #define wxHAS_REGEX_ADVANCED
 #else