X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/32c479fdf18dabe2719ea0a15ee2feae7d81a088..7b162e540e98415f8ac6bc1fd5b880e143aa85e5:/include/wx/features.h

diff --git a/include/wx/features.h b/include/wx/features.h
index c3341f0a95..89dde316d2 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
+*               wxWindows 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@wxwindows.org>
+*  Licence:     wxWindows licence
 */
 
 /* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */
@@ -38,7 +38,7 @@
 #endif
 
 /*  taskbar is only implemented in wxMSW and X11 ports */
-#if defined(__WXMSW__) || defined(__DARWIN__) || \
+#if defined(__WXMSW__) || \
         defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXX11__)
     #define wxHAS_TASK_BAR_ICON
 #else
@@ -56,5 +56,13 @@
     #undef wxHAS_CRASH_REPORT
 #endif
 
+/*  wxRE_ADVANCED is not always available, depending on regex library used
+ *  (it's unavailable only if compiling via configure against system library) */
+#ifndef WX_NO_REGEX_ADVANCED
+    #define wxHAS_REGEX_ADVANCED
+#else
+    #undef wxHAS_REGEX_ADVANCED
+#endif
+
 #endif /*  _WX_FEATURES_H_ */