don't assume that __thread is available just because we use g++ 4, it doesn't support...

[wxWidgets.git] / setup.h_vms

diff --git a/setup.h_vms b/setup.h_vms
index 7ae26caae899eb6d798f2e3171bfe5598a08c016..7de7bf7acd587b1f43b0958b63e2f5ae59b5f8c9 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 September 2007                                                   *
+ * Date : 12 September 2008                                                  *

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


@@ -82,9 +82,6 @@
 #ifdef VMS_GTK2
 #define __WXGTK20__ 1
 
 #ifdef VMS_GTK2
 #define __WXGTK20__ 1
 

-/* Define this if your version of GTK+ is greater than 2.4 */
-#define __WXGTK24__ 1
-

 /* Define this if your version of GTK+ is greater than 2.6 */
 #define __WXGTK26__ 1
 
 /* Define this if your version of GTK+ is greater than 2.6 */
 #define __WXGTK26__ 1
 


@@ -191,7 +188,7 @@ typedef pid_t GPid;
 
 
 #ifndef wxUSE_UNICODE
 
 
 #ifndef wxUSE_UNICODE

-#if defined( __WXX11__ )
+#if defined( __WXX11__ ) || defined ( __WXMOTIF__ )

     #define wxUSE_UNICODE 0
 #else
     #define wxUSE_UNICODE 1
     #define wxUSE_UNICODE 0
 #else
     #define wxUSE_UNICODE 1


@@ -213,7 +210,7 @@ typedef pid_t GPid;
 
 #define wxUSE_LOGGUI 1
 
 
 #define wxUSE_LOGGUI 1
 

-#define wxUSE_LOG_DIALOG 0
+#define wxUSE_LOG_DIALOG 1

 
 #define wxUSE_CMDLINE_PARSER 1
 
 
 #define wxUSE_CMDLINE_PARSER 1
 


@@ -221,22 +218,24 @@ typedef pid_t GPid;
 
 #define wxUSE_STREAMS       1
 
 
 #define wxUSE_STREAMS       1
 

-#define wxUSE_STD_IOSTREAM  0
-

 #if defined(__DMC__) || defined(__WATCOMC__) \
 #if defined(__DMC__) || defined(__WATCOMC__) \

-     || (defined(_MSC_VER) && _MSC_VER < 1200)
-    #define wxUSE_STD_STRING  0
+        || (defined(_MSC_VER) && _MSC_VER < 1200)
+    #define wxUSE_STD_DEFAULT  0  

 #else
 #else

-    #define wxUSE_STD_STRING  0
+    #define wxUSE_STD_DEFAULT  0

 #endif
 
 #endif
 

+#define wxUSE_STD_IOSTREAM  wxUSE_STD_DEFAULT
+
+#define wxUSE_STD_STRING  wxUSE_STD_DEFAULT
+

 #define wxUSE_PRINTF_POS_PARAMS 0
 
 #define wxUSE_LONGLONG      1
 
 #define wxUSE_BASE64        1
 
 #define wxUSE_PRINTF_POS_PARAMS 0
 
 #define wxUSE_LONGLONG      1
 
 #define wxUSE_BASE64        1
 

-#define wxUSE_CONSOLE_EVENTLOOP 0
+#define wxUSE_CONSOLE_EVENTLOOP 1

 
 #define wxUSE_FILE          1
 #define wxUSE_FFILE         1
 
 #define wxUSE_FILE          1
 #define wxUSE_FFILE         1


@@ -252,6 +251,8 @@ typedef pid_t GPid;
 #define wxUSE_INTL          1
 #include <locale.h>
 
 #define wxUSE_INTL          1
 #include <locale.h>
 

+#define wxUSE_XLOCALE 1
+

 #define wxUSE_DATETIME      1
 
 #define wxUSE_TIMER         1
 #define wxUSE_DATETIME      1
 
 #define wxUSE_TIMER         1


@@ -271,6 +272,8 @@ typedef pid_t GPid;
 #define wxUSE_SOCKETS       1
 #include <socket.h>
 
 #define wxUSE_SOCKETS       1
 #include <socket.h>
 

+#define wxUSE_IPV6          0
+

 #define wxUSE_FILESYSTEM    1
 
 #define wxUSE_FS_ZIP        1
 #define wxUSE_FILESYSTEM    1
 
 #define wxUSE_FS_ZIP        1


@@ -325,6 +328,8 @@ typedef pid_t GPid;
 
 #define wxUSE_AUI       1
 
 
 #define wxUSE_AUI       1
 

+#define wxUSE_PROPGRID  1
+

 #ifndef wxUSE_GRAPHICS_CONTEXT
 #define wxUSE_GRAPHICS_CONTEXT 0
 #endif
 #ifndef wxUSE_GRAPHICS_CONTEXT
 #define wxUSE_GRAPHICS_CONTEXT 0
 #endif


@@ -426,6 +431,8 @@ typedef pid_t GPid;
 
 #define wxUSE_MENUS         1
 
 
 #define wxUSE_MENUS         1
 

+#define wxUSE_NOTIFICATION_MESSAGE 1
+

 #define wxUSE_SASH          1
 
 #define wxUSE_SPLITTER      1
 #define wxUSE_SASH          1
 
 #define wxUSE_SPLITTER      1


@@ -438,6 +445,11 @@ typedef pid_t GPid;
 
 #define wxUSE_VALIDATORS 1
 
 
 #define wxUSE_VALIDATORS 1
 

+#ifdef __WXMSW__
+#define wxUSE_AUTOID_MANAGEMENT 0
+#else
+#define wxUSE_AUTOID_MANAGEMENT 0
+#endif

 
 #define wxUSE_COMMON_DIALOGS 1
 
 
 #define wxUSE_COMMON_DIALOGS 1
 


@@ -608,6 +620,8 @@ typedef pid_t GPid;
 
 #define wxUSE_OWNER_DRAWN 0
 
 
 #define wxUSE_OWNER_DRAWN 0
 

+#define wxUSE_TASKBARICON_BALLOONS 0
+

 #define wxUSE_UXTHEME           0
 
 #define wxUSE_INKEDIT  0
 #define wxUSE_UXTHEME           0
 
 #define wxUSE_INKEDIT  0


@@ -620,37 +634,13 @@ typedef pid_t GPid;
 
 #define wxUSE_CRASHREPORT 0
 
 
 #define wxUSE_CRASHREPORT 0
 

-
-
-#define wxUSE_BITMAP_MESSAGE         0
-

 /* --- end MSW options --- */
 
 /* --- end MSW options --- */
 

-/*
- * Supports bool type
- */
-#define HAVE_BOOL
-

 /*
  * Define if your compiler supports the explicit keyword
  */
 #define HAVE_EXPLICIT 1
 
 /*
  * Define if your compiler supports the explicit keyword
  */
 #define HAVE_EXPLICIT 1
 

-/*
- * Define if your compiler supports const_cast<>()
- */
-#define HAVE_CONST_CAST 1
-
-/*
- * Define if your compiler supports reinterpret_cast<>()
- */
-#define HAVE_REINTERPRET_CAST 1
-
-/*
- * Define if your compiler supports const_cast<>()
- */
-#define HAVE_STATIC_CAST 1
-

 /*
  * Define if your compiler has C99 va_copy
  */
 /*
  * Define if your compiler has C99 va_copy
  */


@@ -703,6 +693,26 @@ typedef pid_t GPid;
  */
 #undef HAVE_GNU_CXX_HASH_MAP
 
  */
 #undef HAVE_GNU_CXX_HASH_MAP
 

+/*
+ * Define if your compiler has std::unordered_map
+ */
+#undef HAVE_STD_UNORDERED_MAP
+
+/*
+ * Define if your compiler has std::unordered_set
+ */
+#undef HAVE_STD_UNORDERED_SET
+
+/*
+ * Define if your compiler has std::tr1::unordered_map
+ */
+#undef HAVE_TR1_UNORDERED_MAP
+
+/*
+ * Define if your compiler has std::tr1::unordered_set
+ */
+#undef HAVE_TR1_UNORDERED_SET
+

 /*
  * Define if the compiler supports simple visibility declarations.
  */
 /*
  * Define if the compiler supports simple visibility declarations.
  */


@@ -766,6 +776,11 @@ typedef pid_t GPid;
  */
 #define wxHAVE_PTHREAD_CLEANUP 1
 
  */
 #define wxHAVE_PTHREAD_CLEANUP 1
 

+/*
+ * Define if compiler has __thread keyword.
+ */
+#undef HAVE___THREAD_KEYWORD
+

 /* compatibility */
 /*
  * Use OpenGL
 /* compatibility */
 /*
  * Use OpenGL


@@ -966,6 +981,12 @@ typedef pid_t GPid;
  * with 'char*' for the 3rd parameter instead of 'const char*' */
 #undef HAVE_BROKEN_VSNPRINTF_DECL
 
  * with 'char*' for the 3rd parameter instead of 'const char*' */
 #undef HAVE_BROKEN_VSNPRINTF_DECL
 

+/* Define if you have vsscanf() */
+#define HAVE_VSSCANF 1
+
+/* Define if you have vsscanf() declaration in the header */
+#define HAVE_VSSCANF_DECL 1
+

 /* Define if you have usleep() */
 #define HAVE_USLEEP 1
 
 /* Define if you have usleep() */
 #define HAVE_USLEEP 1
 


@@ -1180,9 +1201,6 @@ typedef pid_t GPid;
 /* Define if you have pango_font_family_is_monospace() (Pango >= 1.3.3) */
 #undef HAVE_PANGO_FONT_FAMILY_IS_MONOSPACE
 
 /* Define if you have pango_font_family_is_monospace() (Pango >= 1.3.3) */
 #undef HAVE_PANGO_FONT_FAMILY_IS_MONOSPACE
 

-/* Define if gtk_icon_size_lookup is missing from the GTK+ headers */
-#undef NEED_GTK_ICON_SIZE_LOOKUP
-

 /* Define if you have Pango xft support */
 #undef HAVE_PANGO_XFT
 
 /* Define if you have Pango xft support */
 #undef HAVE_PANGO_XFT
 


@@ -1198,6 +1216,9 @@ typedef pid_t GPid;
 /* Define if getgrgid_r is available. */
 #undef HAVE_GETGRGID_R
 
 /* Define if getgrgid_r is available. */
 #undef HAVE_GETGRGID_R
 

+/* Define if locale_t is available */
+#undef HAVE_LOCALE_T
+

 /* ---------------------------------------------------------------------
    Win32 adjustments section
    ---------------------------------------------------------------------
 /* ---------------------------------------------------------------------
    Win32 adjustments section
    ---------------------------------------------------------------------


@@ -1234,4 +1255,6 @@ typedef pid_t GPid;
 
 #undef HAVE_SYS_SELECT_H
 
 
 #undef HAVE_SYS_SELECT_H
 

+#define __VMS_BROKEN_TEMPLATES
+

 #endif /* __WX_SETUP_H__ */
 #endif /* __WX_SETUP_H__ */