correction for compilation with -cpp-precomp option

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index 6b51e00caad3496a61bb7ed0ffe0440103f9d7cc..b490d225cd1f6989a09e7dab6697d204de6aa95a 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -1,17 +1,26 @@
-
-/* This define (__WX_SETUP_H__) is used both to insure setup.h is included 
+/* 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__
 #define __WX_SETUP_H__
 
 #ifdef __GNUG__
  * only once and to indicate that we are building using configure. */
 #ifndef __WX_SETUP_H__
 #define __WX_SETUP_H__
 
 #ifdef __GNUG__

-    #pragma interface
+#pragma interface

 #endif
 
 #endif
 

+/* never undefine inline or const keywords for C++ compilation */
+#ifndef __cplusplus

 
 /* Define to empty if the keyword does not work.  */
 #undef const
 
 
 /* Define to empty if the keyword does not work.  */
 #undef const
 

+/* Define as __inline if that's what the C compiler calls it.  */
+#undef inline
+
+#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
 


@@ -21,9 +30,6 @@
 /* Define if you have the vprintf function.  */
 #undef HAVE_VPRINTF
 
 /* Define if you have the vprintf function.  */
 #undef HAVE_VPRINTF
 

-/* Define as __inline if that's what the C compiler calls it.  */
-#undef inline
-

 /* Define to `int' if <sys/types.h> doesn't define.  */
 #undef mode_t
 
 /* Define to `int' if <sys/types.h> doesn't define.  */
 #undef mode_t
 


@@ -52,8 +58,15 @@
 /* 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.2.7 */
+#undef __WXGTK127__
+
+/* Define this if your version of GTK+ is greater than 1.3 */
+#undef __WXGTK20__
+

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


@@ -73,6 +86,7 @@
 #undef __OSF__
 #undef __BSD__
 #undef __FREEBSD__
 #undef __OSF__
 #undef __BSD__
 #undef __FREEBSD__

+#undef __NETBSD__

 #undef __VMS__
 #undef __ULTRIX__
 #undef __DATA_GENERAL__
 #undef __VMS__
 #undef __ULTRIX__
 #undef __DATA_GENERAL__


@@ -90,6 +104,18 @@
 #undef STRICT
 #undef WINVER
 
 #undef STRICT
 #undef WINVER
 

+/* enable native status bar under Win32 */
+#ifdef __WIN95__
+#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
  */


@@ -107,10 +133,20 @@
  * 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
+#define wxODBC_BACKWARD_COMPATABILITY 0
+/*
+ * Use freetype
+ */
+#define wxUSE_FREETYPE 0

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


@@ -127,6 +163,7 @@
  * Use OpenGL
  */
 #define wxUSE_OPENGL 0
  * Use OpenGL
  */
 #define wxUSE_OPENGL 0

+#define wxUSE_GLCANVAS 0

 
 /*
  * Use GUI
 
 /*
  * Use GUI


@@ -137,6 +174,16 @@
  */
 #define wxUSE_NOGUI 0
 
  */
 #define wxUSE_NOGUI 0
 

+/*
+ * Catch fatal program exceptions
+ */
+#define wxUSE_ON_FATAL_EXCEPTION 0
+
+/*
+ * Use wxSingleInstanceChecker class
+ */
+#define wxUSE_SNGLINST_CHECKER 0
+

 /*
  * Use constraints mechanism
  */
 /*
  * Use constraints mechanism
  */


@@ -254,6 +301,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
  */


@@ -274,19 +325,35 @@
  * Use this control
  */
 #define wxUSE_STATUSBAR 0
  * Use this control
  */
 #define wxUSE_STATUSBAR 0

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

 /*
  * Use Tab dialog class - obsolete, use wxNotebook instead
  */
 #define wxUSE_TAB_DIALOG 0
 /* compatibility */
 #define wxUSE_TABDIALOG wxUSE_TAB_DIALOG
 /*
  * Use Tab dialog class - obsolete, use wxNotebook instead
  */
 #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 defined(__WXWINE__) || defined(__GNUWIN32__)
-#define wxUSE_OWNER_DRAWN 1 
+/*
+ * 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__) || defined(__WXPM__)
+#define wxUSE_OWNER_DRAWN 1

   #if wxUSE_TOOLBAR
     #define wxUSE_BUTTONBAR 1
   #endif
   #if wxUSE_TOOLBAR
     #define wxUSE_BUTTONBAR 1
   #endif


@@ -302,14 +369,21 @@
  */
 #define wxUSE_LONGLONG 0
 
  */
 #define wxUSE_LONGLONG 0
 

+/*
+ * Use geometry classes
+ */
+#define wxUSE_GEOMETRY 0
+

 /*
  * Use wxFile class
  */
 #define wxUSE_FILE 0
 /*
  * Use wxFile class
  */
 #define wxUSE_FILE 0

+

 /*
  * Use wxTextFile class
  */
 #define wxUSE_TEXTFILE 0
 /*
  * Use wxTextFile class
  */
 #define wxUSE_TEXTFILE 0

+

 /*
  * Use log classes and logging functions
  */
 /*
  * Use log classes and logging functions
  */


@@ -372,20 +446,15 @@
 #define wxUSE_POSTSCRIPT 0
 
 /*
 #define wxUSE_POSTSCRIPT 0
 
 /*

- * Compile wxString with some Unicode support?
+ * Compile wxString with some Unicode (wide character) support?

  */
 #define wxUSE_WCHAR_T 0
 
 /*
  */
 #define wxUSE_WCHAR_T 0
 
 /*

- * Compile wxString in wide character (Unicode) mode?
+ * Compile wxWindows in Unicode mode (Win32 only for now)?

  */
 #define wxUSE_UNICODE 0
 
  */
 #define wxUSE_UNICODE 0
 

-/*
- * Compile wxString with (limited) multibyte char support?
- */
-#define wxUSE_MULTIBYTE 0
-

 /*
  * Work around a bug in GNU libc 5.x wcstombs() implementation.
  *
 /*
  * Work around a bug in GNU libc 5.x wcstombs() implementation.
  *


@@ -395,13 +464,6 @@
  */
 #define wxUSE_WCSRTOMBS 0
 
  */
 #define wxUSE_WCSRTOMBS 0
 

-/*
- * On some platforms overloading on size_t/int doesn't work, yet we'd like
- * to define both size_t and int version of wxString::operator[] because it
- * should really be size_t, but a lot of old, broken code uses int indices.
- */
-#define wxUSE_SIZE_T_STRING_OPERATOR 0
-

 /*
  * Use the new experimental implementation of wxString::Printf()?
  *
 /*
  * Use the new experimental implementation of wxString::Printf()?
  *


@@ -475,13 +537,6 @@
  * Use Apple Ieee-double converter
  */
 #define wxUSE_APPLE_IEEE 0
  * Use Apple Ieee-double converter
  */
 #define wxUSE_APPLE_IEEE 0

-/*
- * Compatibility with 1.66 API.
- * Level 0: no backward compatibility, all new features
- * Level 1: wxDC, OnSize (etc.) compatibility, but
- * some new features such as event tables
- */
-#define WXWIN_COMPATIBILITY 0

 /*
  * Compatibility with 2.0 API.
  */
 /*
  * Compatibility with 2.0 API.
  */


@@ -528,6 +583,7 @@
  * Support for metafiles
  */
 #define wxUSE_METAFILE 0
  * Support for metafiles
  */
 #define wxUSE_METAFILE 0

+#define wxUSE_ENH_METAFILE 0

 
 /*
  * wxMiniFrame
 
 /*
  * wxMiniFrame


@@ -542,6 +598,7 @@
 /*
  * (virtual) filesystems code
  */
 /*
  * (virtual) filesystems code
  */

+#define wxUSE_FILESYSTEM 0

 #define wxUSE_FS_INET 0
 #define wxUSE_FS_ZIP 0
 
 #define wxUSE_FS_INET 0
 #define wxUSE_FS_ZIP 0
 


@@ -549,13 +606,18 @@
  * A class that shows info window when app is busy
  * (works exactly like wxBusyCursor)
  */
  * A class that shows info window when app is busy
  * (works exactly like wxBusyCursor)
  */

-#define wxUSE_BUSYINFO 0 
+#define wxUSE_BUSYINFO 0

 
 /*
  * Zip stream for accessing files stored inside .zip archives
  */
 #define wxUSE_ZIPSTREAM 0
 
 
 /*
  * Zip stream for accessing files stored inside .zip archives
  */
 #define wxUSE_ZIPSTREAM 0
 

+/*
+ * wxImage support
+ */
+#define wxUSE_IMAGE 0
+

 /*
  * GIF image format support
  */
 /*
  * GIF image format support
  */


@@ -570,7 +632,12 @@
  * PNM image format support
  */
 #define wxUSE_PNM 0
  * PNM image format support
  */
 #define wxUSE_PNM 0

- 
+
+/*
+ * XPM image format support
+ */
+#define wxUSE_XPM 0
+

 /*
  * Disable this if your compiler can't cope
  * with omission of prototype parameters.
 /*
  * Disable this if your compiler can't cope
  * with omission of prototype parameters.


@@ -587,29 +654,75 @@
  */
 #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
 

+/* The signal handler prototype */
+#undef wxTYPE_SA_HANDLER
+
+/* gettimeofday() usually takes 2 arguments, but some really old systems might
+ * have only one, in which case define WX_GETTIMEOFDAY_NO_TZ */
+#undef WX_GETTIMEOFDAY_NO_TZ
+
+/* struct tm doesn't always have the tm_gmtoff field, define this if it does */
+#undef WX_GMTOFF_IN_TM
+
+/* iconv()'s 2nd argument is char ** and not const char ** */
+#undef WX_ICONV_TAKES_CHAR
+
+/* Define if you have pw_gecos field in struct passwd */
+#undef HAVE_PW_GECOS
+

 /* Define if you have dlopen() */
 #undef HAVE_DLOPEN
 
 /* Define if you have dlopen() */
 #undef HAVE_DLOPEN
 

+/* Define if you have gettimeofday() */
+#undef HAVE_GETTIMEOFDAY
+
+/* Define if you have ftime() */
+#undef HAVE_FTIME
+
+/* Define if you have localtime() */
+#undef HAVE_LOCALTIME
+

 /* Define if you have nanosleep() */
 #undef HAVE_NANOSLEEP
 
 /* Define if you have sched_yield */
 #undef HAVE_SCHED_YIELD
 
 /* Define if you have nanosleep() */
 #undef HAVE_NANOSLEEP
 
 /* Define if you have sched_yield */
 #undef HAVE_SCHED_YIELD
 

+/* Define if you have pthread_mutexattr_t and functions to work with it */
+#undef HAVE_PTHREAD_MUTEXATTR_T
+
+/* Define if you have PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP */
+#undef HAVE_PTHREAD_RECURSIVE_MUTEX_INITIALIZER
+

 /* Define if you have pthread_cancel */
 #undef HAVE_PTHREAD_CANCEL
 
 /* Define if you have pthread_cancel */
 #undef HAVE_PTHREAD_CANCEL
 

+/* Define if you have sigaction() */
+#undef HAVE_SIGACTION
+
+/* Define if you have sigemptyset() */
+#undef HAVE_SIGEMPTYSET
+
+/* 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


@@ -626,6 +739,9 @@
 /* The number of bytes in a char.  */
 #undef SIZEOF_CHAR
 
 /* The number of bytes in a char.  */
 #undef SIZEOF_CHAR
 

+/* The number of bytes in a wchar_t.  */
+#undef SIZEOF_WCHAR_T
+

 /* The number of bytes in a int.  */
 #undef SIZEOF_INT
 
 /* The number of bytes in a int.  */
 #undef SIZEOF_INT
 


@@ -641,9 +757,24 @@
 /* The number of bytes in a short.  */
 #undef SIZEOF_SHORT
 
 /* The number of bytes in a short.  */
 #undef SIZEOF_SHORT
 

+/* Define if size_t on your machine is the same type as unsigned int. */
+#undef wxSIZE_T_IS_UINT
+
+/* Define if size_t on your machine is the same type as unsigned long. */
+#undef wxSIZE_T_IS_ULONG
+

 /* Define if you have the dlopen function.  */
 #undef HAVE_DLOPEN
 
 /* Define if you have the dlopen function.  */
 #undef HAVE_DLOPEN
 

+/* Define if you have the dlerror function.  */
+#undef HAVE_DLERROR
+
+/* Define if you have Posix fnctl() function. */
+#undef HAVE_FCNTL
+
+/* Define if you have BSD flock() function. */
+#undef HAVE_FLOCK
+

 /* Define if you have the gethostname function.  */
 #undef HAVE_GETHOSTNAME
 
 /* Define if you have the gethostname function.  */
 #undef HAVE_GETHOSTNAME
 


@@ -656,12 +787,21 @@
 /* Define if you have the nanosleep function.  */
 #undef HAVE_NANOSLEEP
 
 /* Define if you have the nanosleep function.  */
 #undef HAVE_NANOSLEEP
 

+/* Define if you have the putenv function.  */
+#undef HAVE_PUTENV
+
+/* Define if you have the setenv function.  */
+#undef HAVE_SETENV
+

 /* Define if you have the shl_load function.  */
 #undef HAVE_SHL_LOAD
 
 /* Define if you have strtok_r function. */
 #undef HAVE_STRTOK_R
 
 /* Define if you have the shl_load function.  */
 #undef HAVE_SHL_LOAD
 
 /* 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
 


@@ -671,9 +811,6 @@
 /* Define if you have the vfork function.  */
 #undef HAVE_VFORK
 
 /* Define if you have the vfork function.  */
 #undef HAVE_VFORK
 

-/* Define if you have the vsnprintf function.  */
-#undef HAVE_VSNPRINTF
-

 /* Define if you have the <X11/XKBlib.h> header file.  */
 #undef HAVE_X11_XKBLIB_H
 
 /* Define if you have the <X11/XKBlib.h> header file.  */
 #undef HAVE_X11_XKBLIB_H
 


@@ -695,10 +832,25 @@
 /* Define if you have the <unistd.h> header file.  */
 #undef HAVE_UNISTD_H
 
 /* Define if you have the <unistd.h> header file.  */
 #undef HAVE_UNISTD_H
 

+/* Define if you have the <fcntl.h> header file.  */
+#undef HAVE_FCNTL_H
+

 /* Define if you have the <wchar.h> header file.  */
 #undef HAVE_WCHAR_H
 
 /* Define if you have the <wcstr.h> header file.  */
 #undef HAVE_WCSTR_H
 
 /* Define if you have the <wchar.h> header file.  */
 #undef HAVE_WCHAR_H
 
 /* Define if you have the <wcstr.h> header file.  */
 #undef HAVE_WCSTR_H
 

+/* Define if you have the <iconv.h> header file.  */
+#undef HAVE_ICONV_H
+
+/* Test for GLIBC 2.2 iconv() */
+#undef WX_ICONV_TAKES_CHAR
+
+/* Define if you have the <langinfo.h> header file.  */
+#undef HAVE_LANGINFO_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__ */