X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/34cbe514cf01425bdb928c133404ab7b97a661a4..7a5e53abb3f9ea13eba2880972306446e4e21e83:/include/wx/features.h diff --git a/include/wx/features.h b/include/wx/features.h index 6add38e02d..67ca4cfc8b 100644 --- a/include/wx/features.h +++ b/include/wx/features.h @@ -1,14 +1,14 @@ -/* /////////////////////////////////////////////////////////////////////////// */ -/* 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: */ -/* Created: 18.03.02 */ -/* RCS-ID: $Id$ */ -/* Copyright: (c) 2002 Vadim Zeitlin */ -/* Licence: wxWindows licence */ -/* /////////////////////////////////////////////////////////////////////////// */ +/** +* 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 +* Licence: wxWindows licence +*/ /* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */ @@ -29,14 +29,6 @@ #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__) @@ -56,5 +48,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_ */