image handlers moved to separate headers (imagbmp.h etc.) This change is backward...

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index b20808e78553ecc9c8f727dcdbb79e50d0b223e4..0a68bd4e6553ed74f299c9d1924016cd2d682594 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
 
@@ -131,6 +133,7 @@
  * Use iODBC
  */
 #define wxUSE_ODBC 0
+#define wxODBC_FWD_ONLY_CURSORS 1
 /*
  * Use Threads
  */
@@ -274,6 +277,10 @@
  * Use this control
  */
 #define wxUSE_SPINBTN 0
+/*
+ * Use this control
+ */
+#define wxUSE_SPINCTRL 0
 /*
  * Use this control
  */
@@ -300,11 +307,23 @@
 #define wxUSE_TAB_DIALOG 0
 /* compatibility */
 #define wxUSE_TABDIALOG wxUSE_TAB_DIALOG
+
 /*
- * Use this control
+ * Use wxToollBar
  */
 #define wxUSE_TOOLBAR 0
 
+/*
+ * If 1, use the native toolbar, otherwise use the generic version
+ * (wxToolBarSimple) which may also be use together with the native one.
+ */
+#define wxUSE_TOOLBAR_NATIVE 0
+
+/*
+ * Use generic wxToolBar instead of/together with the native one?
+ */
+#define wxUSE_TOOLBAR_SIMPLE 0
+
 #if defined(__WXWINE__) || defined(__GNUWIN32__)
 #define wxUSE_OWNER_DRAWN 1 
   #if wxUSE_TOOLBAR
@@ -593,6 +612,9 @@
  */
 #define CONST_COMPATIBILITY 0
 
+/* define with the name of timezone variable */
+#undef WX_TIMEZONE
+
 /* The type of 3rd argument to getsockname() - usually size_t or int */
 #undef SOCKLEN_T
 
@@ -624,14 +646,17 @@
 /* Define if you have pthread_cancel */
 #undef HAVE_PTHREAD_CANCEL
 
+/* Define if you have shl_load() */
+#undef HAVE_SHL_LOAD
+
 /* Define if you have all functions to set thread priority */
 #undef HAVE_THREAD_PRIORITY_FUNCTIONS
 
 /* Define if you can specify exit functions to a thread */
 #undef HAVE_THREAD_CLEANUP_FUNCTIONS
 
-/* Define if you have shl_load() */
-#undef HAVE_SHL_LOAD
+/* Define if you have timegm() function */
+#undef HAVE_TIMEGM
 
 /* Define if you have vsnprintf() */
 #undef HAVE_VSNPRINTF
@@ -684,6 +709,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
 
@@ -720,4 +748,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__ */