Visualage C++ V4.0 updates

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index 06f21b865ec6fd131c8379480dd94dceee087c5b..932c30459c2ba9bdade4b9cd20c222bf06a1c276 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -1,4 +1,3 @@
-
 /* This define (__WX_SETUP_H__) is used both to insure setup.h is included
  * only once and to indicate that we are building using configure. */
 #ifndef __WX_SETUP_H__
@@ -19,6 +18,9 @@
 
 #endif /* __cplusplus */
 
+/* fill in with the string wxGetOsDescription() will return */
+#undef WXWIN_OS_DESCRIPTION
+
 /* Define to `int' if <sys/types.h> doesn't define.  */
 #undef gid_t
 
@@ -275,6 +277,10 @@
  * Use this control
  */
 #define wxUSE_SPINBTN 0
+/*
+ * Use this control
+ */
+#define wxUSE_SPINCTRL 0
 /*
  * Use this control
  */
@@ -301,6 +307,12 @@
 #define wxUSE_TAB_DIALOG 0
 /* compatibility */
 #define wxUSE_TABDIALOG wxUSE_TAB_DIALOG
+
+/*
+ * Use generic wxToolBar instead of the native one?
+ */
+#define wxUSE_TOOLBAR_SIMPLE 0
+
 /*
  * Use this control
  */
@@ -688,6 +700,9 @@
 /* Define if you have strtok_r function. */
 #undef HAVE_STRTOK_R
 
+/* Define if you have thr_setconcurrency function */
+#undef HaVE_THR_SETCONCURRENCY
+
 /* Define if you have the uname function.  */
 #undef HAVE_UNAME
 
@@ -724,4 +739,7 @@
 /* Define if you have the <wcstr.h> header file.  */
 #undef HAVE_WCSTR_H
 
+/* Define this if you are using gtk and gdk contains support for X11R6 XIM */
+#undef HAVE_XIM
+
 #endif /* __WX_SETUP_H__ */