restored the default value of wxObjectEventFunctor wxNewEventFunctor and explain...

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index e7defed624a2eceb1014f567e652f419c6ad6898..ddc48e735aef05ad3c6b551ca89f0964f1fd160c 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -152,6 +152,8 @@
 
 #define WXWIN_COMPATIBILITY_2_8 0
 
+#define wxEVENTS_COMPATIBILITY_2_8 0
+
 #define wxDIALOG_UNIT_COMPATIBILITY   0
 
 
@@ -198,15 +200,17 @@
 
 #define wxUSE_STREAMS       0
 
-#define wxUSE_STD_IOSTREAM  0
-
 #if defined(__DMC__) || defined(__WATCOMC__) \
         || (defined(_MSC_VER) && _MSC_VER < 1200)
-    #define wxUSE_STD_STRING  0
+    #define wxUSE_STD_DEFAULT  0
 #else
-    #define wxUSE_STD_STRING  0
+    #define wxUSE_STD_DEFAULT  0
 #endif
 
+#define wxUSE_STD_IOSTREAM  wxUSE_STD_DEFAULT
+
+#define wxUSE_STD_STRING  wxUSE_STD_DEFAULT
+
 #define wxUSE_PRINTF_POS_PARAMS      0
 
 
@@ -229,6 +233,8 @@
 
 #define wxUSE_INTL          0
 
+#define wxUSE_XLOCALE       0
+
 #define wxUSE_DATETIME      0
 
 #define wxUSE_TIMER         0
@@ -303,6 +309,8 @@
 
 #define wxUSE_AUI       0
 
+#define wxUSE_PROPGRID  0
+
 #define wxUSE_STC 0
 
 
@@ -335,6 +343,7 @@
 #define wxUSE_FILEPICKERCTRL 0
 #define wxUSE_FONTPICKERCTRL 0
 #define wxUSE_GAUGE         0
+#define wxUSE_HEADERCTRL    0
 #define wxUSE_HYPERLINKCTRL 0
 #define wxUSE_LISTBOX       0
 #define wxUSE_LISTCTRL      0
@@ -370,8 +379,6 @@
 
 #define wxUSE_TOOLBOOK 0
 
-#define wxUSE_TAB_DIALOG    0
-
 #define wxUSE_TASKBARICON 0
 
 #define wxUSE_GRID         0
@@ -384,6 +391,8 @@
 
 #define wxUSE_BITMAPCOMBOBOX 0
 
+#define wxUSE_REARRANGECTRL 0
+
 
 #define wxUSE_ACCEL 0
 
@@ -409,7 +418,11 @@
 
 #define wxUSE_VALIDATORS 0
 
-#define wxUSE_AUTOID_MANAGEMENT defined(__WXMSW__)
+#ifdef __WXMSW__
+#define wxUSE_AUTOID_MANAGEMENT 0
+#else
+#define wxUSE_AUTOID_MANAGEMENT 0
+#endif
 
 
 #define wxUSE_COMMON_DIALOGS 0
@@ -599,31 +612,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
  */
@@ -664,6 +657,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.
  */
@@ -728,6 +741,10 @@
  * Define if you have pthread_cleanup_push/pop()
  */
 #undef wxHAVE_PTHREAD_CLEANUP
+/*
+ * Define if compiler has __thread keyword.
+ */
+#undef HAVE___THREAD_KEYWORD
 
 /* compatibility */
 /*
@@ -886,6 +903,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
 
@@ -1066,6 +1089,9 @@
 /* Define this if you have _vsnwprintf */
 #undef HAVE__VSNWPRINTF
 
+/* vswscanf() */
+#undef HAVE_VSWSCANF
+
 /* Define if fseeko and ftello are available.  */
 #undef HAVE_FSEEKO
 
@@ -1099,6 +1125,9 @@
 /* Define if getgrgid_r is available. */
 #undef HAVE_GETGRGID_R
 
+/* Define if locale_t is available */
+#undef HAVE_LOCALE_T
+
 /* -------------------------------------------------------------------------
    Win32 adjustments section
    ------------------------------------------------------------------------- */