X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e0a717e94dffd13485e4b84d1c67b86d38e30309..e94e2d73e12960bbeec09ec8a50d9bf4d1834a3a:/setup.h_vms diff --git a/setup.h_vms b/setup.h_vms index 0aa702b24a..573c7ea641 100644 --- a/setup.h_vms +++ b/setup.h_vms @@ -1,9 +1,9 @@ - /***************************************************************************** +/***************************************************************************** * * * Template for the set.h file for VMS * * Created from setup.h_in * * Author : J.Jansen (joukj@hrem.nano.tudelft.nl) * - * Date : 30 October 2006 * + * Date : 14 November 2006 * * * *****************************************************************************/ @@ -219,7 +219,12 @@ typedef pid_t GPid; #define wxUSE_STD_IOSTREAM 0 -#define wxUSE_STD_STRING 0 +#if defined(__DMC__) || defined(__WATCOMC__) \ + || (defined(_MSC_VER) && _MSC_VER < 1200) + #define wxUSE_STD_STRING 0 +#else + #define wxUSE_STD_STRING 0 +#endif #define wxUSE_PRINTF_POS_PARAMS 0 @@ -304,11 +309,7 @@ typedef pid_t GPid; #define wxUSE_XRC 1 -#if wxUSE_XRC -#define wxUSE_XML 1 -#else -# define wxUSE_XML 1 -#endif +#define wxUSE_XML wxUSE_XRC #define wxUSE_AUI 1 @@ -333,6 +334,7 @@ typedef pid_t GPid; #define wxUSE_CHECKBOX 1 #define wxUSE_CHECKLISTBOX 1 #define wxUSE_CHOICE 1 +#define wxUSE_COLLPANE 1 #define wxUSE_COLOURPICKERCTRL 1 #define wxUSE_COMBOBOX 1 #define wxUSE_DATAVIEWCTRL 1 @@ -1145,6 +1147,9 @@ typedef pid_t GPid; #undef HAVE_WCTYPE_H #endif +/* Define if you have (Solaris only) */ +#undef HAVE_WIDEC_H + /* Define if you have the header file and iconv() symbol. */ #define HAVE_ICONV_H 1 @@ -1238,10 +1243,6 @@ typedef pid_t GPid; #define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1 -/* Define if the system headers declare the type boolean (which will conflict - * with the jpeg headers unless HAVE_BOOLEAN is defined). */ -#undef HAVE_BOOLEAN - /* Define if the header pbt.h is missing. */ #undef NEED_PBT_H