X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a2d541ca9c552d1a30ba75970968a7a220f4955a..6d9022fe3bb50a75b9b5eaf5cf32558e518ba310:/include/wx/defs.h diff --git a/include/wx/defs.h b/include/wx/defs.h index 7a07fa8be8..a3ea865ebd 100644 --- a/include/wx/defs.h +++ b/include/wx/defs.h @@ -174,12 +174,23 @@ typedef unsigned int bool; #endif // bool -// define boolean constants: don't use true/false here as not all compilers -// support them -#undef TRUE -#undef FALSE -#define TRUE ((bool)1) -#define FALSE ((bool)0) +#ifdef __cplusplus + // define boolean constants: don't use true/false here as not all compilers + // support them + #undef TRUE + #undef FALSE + #define TRUE ((bool)1) + #define FALSE ((bool)0) +#else // !__cplusplus + // the definitions above don't work for C sources + #ifndef TRUE + #define TRUE 1 + #endif + + #ifndef FALSE + #define FALSE 0 + #endif +#endif // C++/!C++ typedef short int WXTYPE; @@ -1452,6 +1463,7 @@ enum wxDataFormatId wxDF_FILENAME = 15, /* CF_HDROP */ wxDF_LOCALE = 16, wxDF_PRIVATE = 20, + wxDF_HTML = 30, /* Note: does not correspond to CF_ constant */ wxDF_MAX };