reverted my previous change to WINVER - it is already defined elsewhere

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index 6b0a7c489dfc93d041c6d22fbef26cf98b962482..016bbb0d303cf2c0c6ef5bf8fddb4d3336b49798 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -91,7 +91,6 @@
 #undef __ULTRIX__
 #undef __DATA_GENERAL__
 #undef __EMX__
-#undef _GNU_SOURCE
 
 /* Stupid hack; __WINDOWS__ clashes with wx/defs.h */
 #ifndef __WINDOWS__
@@ -121,6 +120,10 @@
  */
 #undef HAVE_BOOL
 
+/*
+ * Use regex support
+ */
+#define wxUSE_REGEX 0
 /*
  * Use zlib
  */
@@ -269,6 +272,11 @@
  */
 #define wxUSE_DIRDLG 0
 
+/*
+ * Use wxDragImage class
+ */
+#define wxUSE_DRAGIMAGE 0
+
 /*
  * Use property sheet classes
  */
@@ -442,6 +450,11 @@
   #endif
 #endif
 
+/*
+ * Use wxTreeLayout class
+ */
+#define wxUSE_TREELAYOUT 0
+
 /*
  * Use this control
  */
@@ -490,6 +503,10 @@
  * Use standard GUI logger
  */
 #define wxUSE_LOGGUI 0
+/*
+ * Use old log dialog instead of new wxLogGui
+ */
+#define wxUSE_LOG_DIALOG 1
 /*
  * Use wxStopWatch
  */
@@ -610,6 +627,10 @@
  * Use dnd
  */
 #define wxUSE_DRAG_AND_DROP 0
+/*
+ * Use OLE (MSW only)
+ */
+#define wxUSE_OLE 0
 /*
  * Use spline
  */
@@ -645,9 +666,18 @@
 #define wxUSE_WX_RESOURCES wxUSE_RESOURCES
 
 /*
- * Use wxWindows help facility (needs wxUSE_IPC 1)
+ * Use wxWindows help facility
  */
 #define wxUSE_HELP 0
+/*
+ * Use built-in HTML-based help controller
+ */
+#define wxUSE_WXHTML_HELP 0
+/*
+ * Use MS HTML Help controller (win32)
+ */
+#define wxUSE_MS_HTML_HELP 0
+
 /*
  * Use iostream.h rather than iostream
  */
@@ -659,7 +689,11 @@
 /*
  * Compatibility with 2.0 API.
  */
-#define WXWIN_COMPATIBILITY_2 1
+#define WXWIN_COMPATIBILITY_2 0
+/*
+ * Compatibility with 2.2 API
+ */
+#define WXWIN_COMPATIBILITY_2_2 0
 /*
  * Enables debugging: memory tracing, assert, etc., contains debug level
  */
@@ -969,6 +1003,9 @@
 /* Define if you have the <langinfo.h> header file.  */
 #undef HAVE_LANGINFO_H
 
+/* Define if you have the <w32api.h> header file (mingw,cygwin).  */
+#undef HAVE_W32API_H
+
 /* Define this if you are using gtk and gdk contains support for X11R6 XIM */
 #undef HAVE_XIM