1. more warnings fixes in gtk/region.cpp and common/tbarsmpl.cpp

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index 6436ddd2d17fbe01233d0faed75f91f076901ed9..0544b3e8b0eed068dc89611092f10a248a57ac09 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__
 /* 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 */
 
 
 #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
 
 /* Define to `int' if <sys/types.h> doesn't define.  */
 #undef gid_t
 


@@ -56,8 +58,12 @@
 /* Define if lex declares yytext as a char * by default, not a char[].  */
 #undef YYTEXT_POINTER
 
 /* Define if lex declares yytext as a char * by default, not a char[].  */
 #undef YYTEXT_POINTER
 

+/* Define this if your version of GTK+ is greater than 1.2 */

 #undef __WXGTK12__
 
 #undef __WXGTK12__
 

+/* Define this if your version of GTK+ is greater than 1.3 */
+#undef __WXGTK13__
+

 /*
  * Define to 1 for Unix[-like] system
  */
 /*
  * Define to 1 for Unix[-like] system
  */


@@ -99,6 +105,13 @@
 #define wxUSE_NATIVE_STATUSBAR 1
 #endif
 
 #define wxUSE_NATIVE_STATUSBAR 1
 #endif
 

+/* enable rich edit under Win32 */
+#if defined(__WIN95__) && !defined(__TWIN32__) && !defined(__GNUWIN32_OLD__)
+#define wxUSE_RICHEDIT 1
+#else
+#define wxUSE_RICHEDIT 0
+#endif
+

 /*
  * Supports bool type
  */
 /*
  * Supports bool type
  */


@@ -116,10 +129,15 @@
  * Use libjpeg
  */
 #define wxUSE_LIBJPEG 0
  * Use libjpeg
  */
 #define wxUSE_LIBJPEG 0

+/*
+ * Use libtiff
+ */
+#define wxUSE_LIBTIFF 0

 /*
  * Use iODBC
  */
 #define wxUSE_ODBC 0
 /*
  * Use iODBC
  */
 #define wxUSE_ODBC 0

+#define wxODBC_FWD_ONLY_CURSORS 1

 /*
  * Use Threads
  */
 /*
  * Use Threads
  */


@@ -263,6 +281,10 @@
  * Use this control
  */
 #define wxUSE_SPINBTN 0
  * Use this control
  */
 #define wxUSE_SPINBTN 0

+/*
+ * Use this control
+ */
+#define wxUSE_SPINCTRL 0

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


@@ -289,11 +311,23 @@
 #define wxUSE_TAB_DIALOG 0
 /* compatibility */
 #define wxUSE_TABDIALOG wxUSE_TAB_DIALOG
 #define wxUSE_TAB_DIALOG 0
 /* compatibility */
 #define wxUSE_TABDIALOG wxUSE_TAB_DIALOG

+

 /*
 /*

- * Use this control
+ * Use wxToollBar

  */
 #define wxUSE_TOOLBAR 0
 
  */
 #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
 #if defined(__WXWINE__) || defined(__GNUWIN32__)
 #define wxUSE_OWNER_DRAWN 1 
   #if wxUSE_TOOLBAR


@@ -582,6 +616,9 @@
  */
 #define CONST_COMPATIBILITY 0
 
  */
 #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
 
 /* The type of 3rd argument to getsockname() - usually size_t or int */
 #undef SOCKLEN_T
 


@@ -613,14 +650,20 @@
 /* Define if you have pthread_cancel */
 #undef HAVE_PTHREAD_CANCEL
 
 /* Define if you have pthread_cancel */
 #undef HAVE_PTHREAD_CANCEL
 

+/* Define if you have shl_load() */
+#undef HAVE_SHL_LOAD
+
+/* Define if you have strptime() */
+#undef HAVE_STRPTIME
+

 /* 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 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
 
 /* Define if you have vsnprintf() */
 #undef HAVE_VSNPRINTF


@@ -673,6 +716,9 @@
 /* Define if you have strtok_r function. */
 #undef HAVE_STRTOK_R
 
 /* 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
 
 /* Define if you have the uname function.  */
 #undef HAVE_UNAME
 


@@ -709,4 +755,7 @@
 /* Define if you have the <wcstr.h> header file.  */
 #undef HAVE_WCSTR_H
 
 /* 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__ */
 #endif /* __WX_SETUP_H__ */