add wxGTK_CONVs to fix STL and ANSI builds

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index 4082d28d54526528a44c35acfa16e391daf49eb6..498fd6f323ba2453086858849616a4d25bcddf69 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -198,15 +198,17 @@
 
 #define wxUSE_STREAMS       0
 
 
 #define wxUSE_STREAMS       0
 

-#define wxUSE_STD_IOSTREAM  0
-

 #if defined(__DMC__) || defined(__WATCOMC__) \
         || (defined(_MSC_VER) && _MSC_VER < 1200)
 #if defined(__DMC__) || defined(__WATCOMC__) \
         || (defined(_MSC_VER) && _MSC_VER < 1200)

-    #define wxUSE_STD_STRING  0
+    #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_PRINTF_POS_PARAMS      0
 
 


@@ -229,6 +231,8 @@
 
 #define wxUSE_INTL          0
 
 
 #define wxUSE_INTL          0
 

+#define wxUSE_XLOCALE       0
+

 #define wxUSE_DATETIME      0
 
 #define wxUSE_TIMER         0
 #define wxUSE_DATETIME      0
 
 #define wxUSE_TIMER         0


@@ -668,6 +672,26 @@
  */
 #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.
  */


@@ -732,6 +756,10 @@
  * Define if you have pthread_cleanup_push/pop()
  */
 #undef wxHAVE_PTHREAD_CLEANUP
  * Define if you have pthread_cleanup_push/pop()
  */
 #undef wxHAVE_PTHREAD_CLEANUP

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

 
 /* compatibility */
 /*
 
 /* compatibility */
 /*


@@ -890,6 +918,12 @@
  * 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() */
+#undef HAVE_VSSCANF
+
+/* Define if you have vsscanf() declaration in the header */
+#undef HAVE_VSSCANF_DECL
+

 /* Define if you have usleep() */
 #undef HAVE_USLEEP
 
 /* Define if you have usleep() */
 #undef HAVE_USLEEP
 


@@ -1106,6 +1140,9 @@
 /* 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
    ------------------------------------------------------------------------- */