Change wxDIALOG_NO_PARENT to avoid clash with wxICON_EXCLAMATION.

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index 0fc38e74c7c4b5c7aafb8cc4ae5c27b84b045efd..fc43f2c17b2ce75238a0935f1e9bd0e72aef2fcc 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -53,9 +53,6 @@
    byte first (like Motorola and SPARC, unlike Intel and VAX).  */
 #undef WORDS_BIGENDIAN
 
-/* Define this if your version of GTK+ is greater than 1.2 */
-#undef __WXGTK12__
-
 /* Define this if your version of GTK+ is greater than 1.2.7 */
 #undef __WXGTK127__
 
@@ -68,6 +65,9 @@
 /* Define this if your version of GTK+ is greater than 2.10 */
 #undef __WXGTK210__
 
+/* Define this if your version of GTK+ is greater than 2.18 */
+#undef __WXGTK218__
+
 /* Define this if you want to use GPE features */
 #undef __WXGPE__
 
@@ -94,6 +94,7 @@
 #undef __NETBSD__
 #undef __OPENBSD__
 #undef __OSF__
+#undef __QNX__
 #undef __SGI__
 #undef __SOLARIS__
 #undef __SUN__
@@ -185,8 +186,6 @@
 
 #define wxUSE_EXTENDED_RTTI 0
 
-#define wxUSE_STL 0
-
 #define wxUSE_LOG 0
 
 #define wxUSE_LOGWINDOW 0
@@ -201,6 +200,12 @@
 
 #define wxUSE_STREAMS       0
 
+#define wxUSE_PRINTF_POS_PARAMS      0
+
+
+
+#define wxUSE_STL 0
+
 #if defined(__DMC__) || defined(__WATCOMC__) \
         || (defined(_MSC_VER) && _MSC_VER < 1200)
     #define wxUSE_STD_DEFAULT  0
@@ -208,11 +213,16 @@
     #define wxUSE_STD_DEFAULT  0
 #endif
 
+#define wxUSE_STD_CONTAINERS 0
+
 #define wxUSE_STD_IOSTREAM  wxUSE_STD_DEFAULT
 
 #define wxUSE_STD_STRING  wxUSE_STD_DEFAULT
 
-#define wxUSE_PRINTF_POS_PARAMS      0
+#define wxUSE_STD_STRING_CONV_IN_WXSTRING wxUSE_STL
+
+#define wxUSE_IOSTREAMH     0
+
 
 
 #define wxUSE_LONGLONG      0
@@ -242,6 +252,8 @@
 
 #define wxUSE_STOPWATCH     0
 
+#define wxUSE_FSWATCHER     0
+
 #define wxUSE_CONFIG        0
 
 #define wxUSE_CONFIG_NATIVE   0
@@ -316,19 +328,47 @@
 
 #define wxUSE_STC 0
 
+#define wxUSE_WEBVIEW 0
+
+#define wxUSE_WEBVIEW_WEBKIT 0
+
+#define wxUSE_WEBVIEW_IE     0
+
+
+
+#ifdef _MSC_VER
+#   if _MSC_VER >= 1310
+
 
-#ifndef wxUSE_GRAPHICS_CONTEXT
 #define wxUSE_GRAPHICS_CONTEXT 0
+#   else
+
+
+#       define wxUSE_GRAPHICS_CONTEXT 0
+#   endif
+#else
+
+
+
+
+
+#   define wxUSE_GRAPHICS_CONTEXT 0
 #endif
 
+#define wxUSE_CAIRO 0
+
+
 
 #define wxUSE_CONTROLS     0
 
+#define wxUSE_MARKUP       0
+
 #define wxUSE_POPUPWIN     0
 
 #define wxUSE_TIPWINDOW    0
 
 #define wxUSE_ANIMATIONCTRL 0
+#define wxUSE_BANNERWINDOW  0
 #define wxUSE_BUTTON        0
 #define wxUSE_BMPBUTTON     0
 #define wxUSE_CALENDARCTRL  0
@@ -338,6 +378,7 @@
 #define wxUSE_COLLPANE      0
 #define wxUSE_COLOURPICKERCTRL 0
 #define wxUSE_COMBOBOX      0
+#define wxUSE_COMMANDLINKBUTTON 0
 #define wxUSE_DATAVIEWCTRL  0
 #define wxUSE_DATEPICKCTRL  0
 #define wxUSE_DIRPICKERCTRL 0
@@ -352,6 +393,7 @@
 #define wxUSE_LISTCTRL      0
 #define wxUSE_RADIOBOX      0
 #define wxUSE_RADIOBTN      0
+#define wxUSE_RICHMSGDLG    0
 #define wxUSE_SCROLLBAR     0
 #define wxUSE_SEARCHCTRL    0
 #define wxUSE_SLIDER        0
@@ -364,6 +406,7 @@
 #define wxUSE_TEXTCTRL      0
 #define wxUSE_TOGGLEBTN     0
 #define wxUSE_TREECTRL      0
+#define wxUSE_TREELISTCTRL  0
 
 #define wxUSE_STATUSBAR    0
 
@@ -399,6 +442,10 @@
 
 #define wxUSE_ACCEL 0
 
+#define wxUSE_ARTPROVIDER_STD 0
+
+#define wxUSE_ARTPROVIDER_TANGO 0
+
 #define wxUSE_HOTKEY 0
 
 #define wxUSE_CARET         0
@@ -409,6 +456,8 @@
 
 #define wxUSE_IMAGLIST      0
 
+#define wxUSE_INFOBAR       0
+
 #define wxUSE_MENUS         0
 
 #define wxUSE_NOTIFICATION_MESSAGE 0
@@ -461,6 +510,8 @@
 
 #define wxUSE_ABOUTDLG 0
 
+#define wxUSE_FILE_HISTORY 0
+
 
 #define wxUSE_METAFILE              0
 #define wxUSE_ENH_METAFILE          0
@@ -514,6 +565,8 @@
 #define wxUSE_MOUSEWHEEL        0
 
 
+#define wxUSE_UIACTIONSIMULATOR 0
+
 
 #define wxUSE_POSTSCRIPT  0
 
@@ -521,10 +574,7 @@
 
 #define wxUSE_SVG 0
 
-
-#define REMOVE_UNUSED_ARG   0
-
-#define wxUSE_IOSTREAMH     0
+#define wxUSE_DC_TRANSFORM_MATRIX 0
 
 
 
@@ -690,6 +740,16 @@
  */
 #undef HAVE_TR1_UNORDERED_SET
 
+/*
+ * Define if your compiler has <tr1/type_traits>
+ */
+#undef HAVE_TR1_TYPE_TRAITS
+
+/*
+ * Define if your compiler has <type_traits>
+ */
+#undef HAVE_TYPE_TRAITS
+
 /*
  * Define if the compiler supports simple visibility declarations.
  */
@@ -938,6 +998,9 @@
 /* Define if you have wcsdup function  */
 #undef HAVE_WCSDUP
 
+/* Define if you have wcsftime() function  */
+#undef HAVE_WCSFTIME
+
 /* Define if you have strnlen() function */
 #undef HAVE_STRNLEN
 
@@ -1154,6 +1217,12 @@
 /* Define if locale_t is available */
 #undef HAVE_LOCALE_T
 
+/* Define if you have inotify_xxx() functions. */
+#undef wxHAS_INOTIFY
+
+/* Define if you have kqueu_xxx() functions. */
+#undef wxHAS_KQUEUE
+
 /* -------------------------------------------------------------------------
    Win32 adjustments section
    ------------------------------------------------------------------------- */