Commented out the #include of <windows.h> as it should not be needed any longer

[wxWidgets.git] / setup.h_vms

diff --git a/setup.h_vms b/setup.h_vms
index 30278ac9d4fa305e20a77017514010a4be06ba27..e64f73b3fc81205f56b12381ae619bebfc38058d 100644 (file)
--- a/setup.h_vms
+++ b/setup.h_vms
@@ -67,8 +67,12 @@
 /* Define if lex declares yytext as a char * by default, not a char[].  */
 #undef YYTEXT_POINTER
 
 /* Define if lex declares yytext as a char * by default, not a char[].  */
 #undef YYTEXT_POINTER
 

+/* Define this if your version of GTK+ is greater than 1.2 */

 #undef __WXGTK12__
 
 #undef __WXGTK12__
 

+/* Define this if your version of GTK+ is greater than 1.3 */
+#undef __WXGTK13__
+

 /*
  * Define to 1 for Unix[-like] system
  */
 /*
  * Define to 1 for Unix[-like] system
  */


@@ -137,7 +141,7 @@
 /*
  * Use Threads
  */
 /*
  * Use Threads
  */

-#define wxUSE_THREADS 0
+#define wxUSE_THREADS 1

 /*
  * Have glibc2
  */
 /*
  * Have glibc2
  */


@@ -312,7 +316,17 @@
  */
 #define wxUSE_TOOLBAR 1
 
  */
 #define wxUSE_TOOLBAR 1
 

-#if defined(__WXWINE__) || defined(__GNUWIN32__)
+/* If 1, use the native toolbar, otherwise use the generic version
+ * (wxToolBarSimple) which may also be use together with the native one.
+ */
+#define wxUSE_TOOLBAR_NATIVE 1
+
+/*
+ * Use generic wxToolBar instead of/together with the native one?
+ */
+#define wxUSE_TOOLBAR_SIMPLE 1
+
+#if defined(__WXWINE__) || defined(__GNUWIN32__) || defined(__WXPM__)

 #define wxUSE_OWNER_DRAWN 1 
   #if wxUSE_TOOLBAR
     #define wxUSE_BUTTONBAR 1
 #define wxUSE_OWNER_DRAWN 1 
   #if wxUSE_TOOLBAR
     #define wxUSE_BUTTONBAR 1


@@ -600,8 +614,11 @@
  */
 #define CONST_COMPATIBILITY 0
 
  */
 #define CONST_COMPATIBILITY 0
 

+/* define with the name of timezone variable */
+#undef WX_TIMEZONE
+ 

 /* The type of 3rd argument to getsockname() - usually size_t or int */
 /* The type of 3rd argument to getsockname() - usually size_t or int */

-#define SOCKLEN_T int
+#define SOCKLEN_T size_t

 
 /* gettimeofday() usually takes 2 arguments, but some really old systems might
  * have only one, in which case define WX_GETTIMEOFDAY_NO_TZ */
 
 /* gettimeofday() usually takes 2 arguments, but some really old systems might
  * have only one, in which case define WX_GETTIMEOFDAY_NO_TZ */


@@ -630,16 +647,19 @@
 #undef HAVE_SCHED_YIELD
 
 /* Define if you have pthread_cancel */
 #undef HAVE_SCHED_YIELD
 
 /* Define if you have pthread_cancel */

-#undef HAVE_PTHREAD_CANCEL
+#define HAVE_PTHREAD_CANCEL 1

 
 /* Define if you have shl_load() */
 #undef HAVE_SHL_LOAD
 
 
 /* Define if you have shl_load() */
 #undef HAVE_SHL_LOAD
 

+/* Define if you have strptime() */
+#define HAVE_STRPTIME 1
+ 

 /* Define if you have all functions to set thread priority */
 /* Define if you have all functions to set thread priority */

-#undef HAVE_THREAD_PRIORITY_FUNCTIONS
+#define HAVE_THREAD_PRIORITY_FUNCTIONS 1

 
 /* Define if you can specify exit functions to a thread */
 
 /* Define if you can specify exit functions to a thread */

-#undef HAVE_THREAD_CLEANUP_FUNCTIONS
+#define HAVE_THREAD_CLEANUP_FUNCTIONS 1

 
 /* Define if you have timegm() function */
 #undef HAVE_TIMEGM
 
 /* Define if you have timegm() function */
 #undef HAVE_TIMEGM