wxMGL compilation fixes

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index 9863f95400564e96005e316912b52490c1943576..016bbb0d303cf2c0c6ef5bf8fddb4d3336b49798 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -120,6 +120,10 @@
  */
 #undef HAVE_BOOL
 
  */
 #undef HAVE_BOOL
 

+/*
+ * Use regex support
+ */
+#define wxUSE_REGEX 0

 /*
  * Use zlib
  */
 /*
  * Use zlib
  */


@@ -446,6 +450,11 @@
   #endif
 #endif
 
   #endif
 #endif
 

+/*
+ * Use wxTreeLayout class
+ */
+#define wxUSE_TREELAYOUT 0
+

 /*
  * Use this control
  */
 /*
  * Use this control
  */


@@ -494,6 +503,10 @@
  * Use standard GUI logger
  */
 #define wxUSE_LOGGUI 0
  * Use standard GUI logger
  */
 #define wxUSE_LOGGUI 0

+/*
+ * Use old log dialog instead of new wxLogGui
+ */
+#define wxUSE_LOG_DIALOG 1

 /*
  * Use wxStopWatch
  */
 /*
  * Use wxStopWatch
  */


@@ -614,6 +627,10 @@
  * Use dnd
  */
 #define wxUSE_DRAG_AND_DROP 0
  * Use dnd
  */
 #define wxUSE_DRAG_AND_DROP 0

+/*
+ * Use OLE (MSW only)
+ */
+#define wxUSE_OLE 0

 /*
  * Use spline
  */
 /*
  * Use spline
  */


@@ -649,9 +666,18 @@
 #define wxUSE_WX_RESOURCES wxUSE_RESOURCES
 
 /*
 #define wxUSE_WX_RESOURCES wxUSE_RESOURCES
 
 /*

- * Use wxWindows help facility (needs wxUSE_IPC 1)
+ * Use wxWindows help facility

  */
 #define wxUSE_HELP 0
  */
 #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
  */
 /*
  * Use iostream.h rather than iostream
  */


@@ -977,6 +1003,9 @@
 /* Define if you have the <langinfo.h> header file.  */
 #undef HAVE_LANGINFO_H
 
 /* 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
 
 /* Define this if you are using gtk and gdk contains support for X11R6 XIM */
 #undef HAVE_XIM