remove the implementation of the conversion operators (forgot to do it in the initial...

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index c7a3321653f12268cdc661acdfdaacec3d72eb05..560c32a3e58df4de77185983a15333fffb00523f 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -196,8 +196,6 @@
 
 #define wxUSE_THREADS 0
 
-#define wxUSE_WEAKREF 0
-
 #define wxUSE_STREAMS       0
 
 #if defined(__DMC__) || defined(__WATCOMC__) \
@@ -309,6 +307,8 @@
 
 #define wxUSE_AUI       0
 
+#define wxUSE_PROPGRID  0
+
 #define wxUSE_STC 0
 
 
@@ -609,31 +609,11 @@
 #define wxUSE_CRASHREPORT 0
 /* --- end MSW options --- */
 
-/*
- * Supports bool type
- */
-#undef HAVE_BOOL
-
 /*
  * Define if your compiler supports the explicit keyword
  */
 #undef HAVE_EXPLICIT
 
-/*
- * Define if your compiler supports const_cast<>()
- */
-#undef HAVE_CONST_CAST
-
-/*
- * Define if your compiler supports reinterpret_cast<>()
- */
-#undef HAVE_REINTERPRET_CAST
-
-/*
- * Define if your compiler supports static_cast<>()
- */
-#undef HAVE_STATIC_CAST
-
 /*
  * Define if your compiler has C99 va_copy
  */
@@ -674,6 +654,26 @@
  */
 #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.
  */
@@ -738,6 +738,10 @@
  * Define if you have pthread_cleanup_push/pop()
  */
 #undef wxHAVE_PTHREAD_CLEANUP
+/*
+ * Define if compiler has __thread keyword.
+ */
+#undef HAVE___THREAD_KEYWORD
 
 /* compatibility */
 /*
@@ -896,6 +900,12 @@
  * 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