tidy up

[wxWidgets.git] / setup.h_vms

diff --git a/setup.h_vms b/setup.h_vms
index 4dcc4f36dc0f3deabd2cb68f4c0862703d0549ac..573c7ea641a6060183c0438bb84d5a64287d283f 100644 (file)
--- a/setup.h_vms
+++ b/setup.h_vms
@@ -3,7 +3,7 @@
  * Template for the set.h file for VMS                                       *
  * Created from setup.h_in                                                   *
  * Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                            *
  * Template for the set.h file for VMS                                       *
  * Created from setup.h_in                                                   *
  * Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                            *

- * Date : 25 October 2006                                                     *
+ * Date : 14 November 2006                                                    *

  *                                                                           *
  *****************************************************************************/
 
  *                                                                           *
  *****************************************************************************/
 


@@ -219,7 +219,12 @@ typedef pid_t GPid;
 
 #define wxUSE_STD_IOSTREAM  0
 
 
 #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
 
 
 #define wxUSE_PRINTF_POS_PARAMS 0
 


@@ -304,11 +309,7 @@ typedef pid_t GPid;
 
 #define wxUSE_XRC       1
 
 
 #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
 
 
 #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_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
 #define wxUSE_COLOURPICKERCTRL 1
 #define wxUSE_COMBOBOX     1
 #define wxUSE_DATAVIEWCTRL   1


@@ -537,6 +539,8 @@ typedef pid_t GPid;
 
 #define wxUSE_LIBTIFF       1
 
 
 #define wxUSE_LIBTIFF       1
 

+#define wxUSE_TGA           1
+

 #define wxUSE_GIF           1
 
 #define wxUSE_PNM           1
 #define wxUSE_GIF           1
 
 #define wxUSE_PNM           1


@@ -939,6 +943,9 @@ typedef pid_t GPid;
 /* Define if you have strptime() declaration */
 #define HAVE_STRPTIME_DECL 1
 
 /* Define if you have strptime() declaration */
 #define HAVE_STRPTIME_DECL 1
 

+/* Define if you have strtoull() and strtoll() */
+#define HAVE_STRTOULL 1
+

 /* Define if you have all functions to set thread priority */
 #define HAVE_THREAD_PRIORITY_FUNCTIONS 1
 
 /* Define if you have all functions to set thread priority */
 #define HAVE_THREAD_PRIORITY_FUNCTIONS 1
 


@@ -969,6 +976,9 @@ typedef pid_t GPid;
 /* Define if you have wcslen function  */
 #define HAVE_WCSLEN 1
 
 /* Define if you have wcslen function  */
 #define HAVE_WCSLEN 1
 

+/* Define if you have wcstoull() and wcstoll() */
+#undef HAVE_WCSTOULL
+

 /* define if you have vsscanf function */
 #undef HAVE_VSSCANF
 
 /* define if you have vsscanf function */
 #undef HAVE_VSSCANF
 


@@ -1137,6 +1147,9 @@ typedef pid_t GPid;
 #undef HAVE_WCTYPE_H
 #endif
 
 #undef HAVE_WCTYPE_H
 #endif
 

+/* Define if you have <widec.h> (Solaris only) */
+#undef HAVE_WIDEC_H
+

 /* Define if you have the <iconv.h> header file and iconv() symbol.  */
 #define HAVE_ICONV_H 1
 
 /* Define if you have the <iconv.h> header file and iconv() symbol.  */
 #define HAVE_ICONV_H 1
 


@@ -1230,10 +1243,6 @@ typedef pid_t GPid;
 
 #define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1
 
 
 #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
 
 /* Define if the header pbt.h is missing.  */
 #undef NEED_PBT_H