Do nothing in wxMemoryDC::SelectObject() if the bitmap is already selected.

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index 84a3c6086ab08fd36d66e308cff05c8ac352d116..b975213e2a05681670f8f905774533f27acafec6 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -97,6 +97,7 @@
 #undef __NETBSD__
 #undef __OPENBSD__
 #undef __OSF__
+#undef __QNX__
 #undef __SGI__
 #undef __SOLARIS__
 #undef __SUN__
@@ -245,6 +246,8 @@
 
 #define wxUSE_STOPWATCH     0
 
+#define wxUSE_FSWATCHER     0
+
 #define wxUSE_CONFIG        0
 
 #define wxUSE_CONFIG_NATIVE   0
@@ -320,8 +323,24 @@
 #define wxUSE_STC 0
 
 
-#ifndef wxUSE_GRAPHICS_CONTEXT
+
+#ifdef _MSC_VER
+#   if _MSC_VER >= 1310
+
+
 #define wxUSE_GRAPHICS_CONTEXT 0
+#   else
+
+
+#       define wxUSE_GRAPHICS_CONTEXT 0
+#   endif
+#else
+
+
+
+
+
+#   define wxUSE_GRAPHICS_CONTEXT 0
 #endif
 
 
@@ -341,6 +360,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
@@ -355,6 +375,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
@@ -466,6 +487,8 @@
 
 #define wxUSE_ABOUTDLG 0
 
+#define wxUSE_FILE_HISTORY 0
+
 
 #define wxUSE_METAFILE              0
 #define wxUSE_ENH_METAFILE          0
@@ -519,6 +542,8 @@
 #define wxUSE_MOUSEWHEEL        0
 
 
+#define wxUSE_UIACTIONSIMULATOR 0
+
 
 #define wxUSE_POSTSCRIPT  0
 
@@ -695,6 +720,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.
  */
@@ -1159,6 +1194,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
    ------------------------------------------------------------------------- */