fixed wxGetKeyState to get current status of non-togle keys, and to

[wxWidgets.git] / setup.h_vms

diff --git a/setup.h_vms b/setup.h_vms
index 5ef08f67418b3eb7f44e6a150633ab00afc2a57c..23bd824e110e14c410ffc2f6dbcac6274a40db65 100644 (file)
--- a/setup.h_vms
+++ b/setup.h_vms
@@ -35,6 +35,9 @@
 /* the installation location prefix from configure */
 #undef wxINSTALL_PREFIX
 
 /* the installation location prefix from configure */
 #undef wxINSTALL_PREFIX
 

+/* Define this to get extra features from GNU libc. */
+#undef _GNU_SOURCE
+

 /* 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
 


@@ -60,6 +63,13 @@
    byte first (like Motorola and SPARC, unlike Intel and VAX).  */
 #undef WORDS_BIGENDIAN
 
    byte first (like Motorola and SPARC, unlike Intel and VAX).  */
 #undef WORDS_BIGENDIAN
 

+/* Define this if you want to use GPE features */
+/* #undef __WXGPE__ */
+
+/* Define this if your version of Motif is greater than 2.0 */
+/* #undef __WXMOTIF20__ */
+
+#ifdef __WXGTK__

 /* Define this if your version of GTK+ is greater than 1.2 */
 #define __WXGTK12__ 1
 
 /* Define this if your version of GTK+ is greater than 1.2 */
 #define __WXGTK12__ 1
 


@@ -67,7 +77,8 @@
 #define __WXGTK127__ 1
 
 /* Define this if your version of GTK+ is greater than 1.3 */
 #define __WXGTK127__ 1
 
 /* Define this if your version of GTK+ is greater than 1.3 */

-#undef __WXGTK20__
+/* #undef __WXGTK20__ */
+#endif

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


@@ -75,27 +86,32 @@
 #define wxUSE_UNIX 1
 
 #define __UNIX__
 #define wxUSE_UNIX 1
 
 #define __UNIX__

+
+#undef __AIX__
+#undef __BSD__
+#undef __DARWIN__
+#undef __EMX__
+#undef __FREEBSD__
+#undef __HPUX__

 #undef __LINUX__
 #undef __LINUX__

+#undef __NETBSD__
+#undef __OPENBSD__
+#undef __OSF__

 #undef __SGI__
 #undef __SGI__

-#undef __HPUX__
-#undef __SYSV__
-#undef __SVR4__
-#undef __AIX__
-#undef __SUN__

 #undef __SOLARIS__
 #undef __SOLARIS__

+#undef __SUN__

 #undef __SUNOS__
 #undef __SUNOS__

-#define __ALPHA__
-#undef __IA64__
-#undef __OSF__
-#undef __DARWIN__
-#undef __NETBSD__
-#undef __BSD__
-#undef __FREEBSD__
-#define __VMS__
+#undef __SVR4__
+#undef __SYSV__

 #undef __ULTRIX__
 #undef __ULTRIX__

-#undef __DATA_GENERAL__
-#undef __EMX__
-#undef _GNU_SOURCE
+#undef __UNIXWARE__
+#define __VMS__
+
+#undef __IA64__
+#define __ALPHA__
+
+/* NanoX (with wxX11) */
+#define wxUSE_NANOX 0

 
 /* PowerPC Darwin & Mac OS X */
 #undef __POWERPC__
 
 /* PowerPC Darwin & Mac OS X */
 #undef __POWERPC__


@@ -108,13 +124,21 @@
 #undef __WINDOWS__
 #endif
 
 #undef __WINDOWS__
 #endif
 

+#ifndef __WIN95__

 #undef __WIN95__
 #undef __WIN95__

+#endif

 #ifndef __WIN32__
 #undef __WIN32__
 #endif
 #ifndef __WIN32__
 #undef __WIN32__
 #endif

+#ifndef __GNUWIN32__

 #undef __GNUWIN32__
 #undef __GNUWIN32__

+#endif
+#ifndef STRICT

 #undef STRICT
 #undef STRICT

+#endif
+#ifndef WINVER

 #undef WINVER
 #undef WINVER

+#endif

 
 /* enable native status bar under Win32 */
 #if defined(__WIN95__) && !defined(__WXUNIVERSAL__)
 
 /* enable native status bar under Win32 */
 #if defined(__WIN95__) && !defined(__WXUNIVERSAL__)


@@ -127,7 +151,7 @@
 #endif
 
 /* enable rich edit under Win32 */
 #endif
 
 /* enable rich edit under Win32 */

-#if defined(__WIN95__) && !defined(__TWIN32__) && !defined(__GNUWIN32_OLD__)
+#if defined(__WIN95__) && !defined(__WINE__) && !defined(__GNUWIN32_OLD__)

 #define wxUSE_RICHEDIT 1
 #else
 #define wxUSE_RICHEDIT 0
 #define wxUSE_RICHEDIT 1
 #else
 #define wxUSE_RICHEDIT 0


@@ -138,10 +162,48 @@
  */
 #define HAVE_BOOL
 
  */
 #define HAVE_BOOL
 

+/*
+ * Define if your compiler supports the explicit keyword
+ */
+#define HAVE_EXPLICIT 1
+
+/*
+ * Define if your compiler supports const_cast<>()
+ */
+#define HAVE_CONST_CAST 1
+
+/*
+ * Define if your compiler supports const_cast<>()
+ */
+#define HAVE_STATIC_CAST 1
+
+/*
+ * Define if your compiler has std::wstring
+ */
+/* #unfine HAVE_STD_WSTRING */
+/*
+ * Define if your compiler has compilant std::string::compare
+ */
+/* #undef HAVE_STD_STRING_COMPARE */
+
+/*
+ * use STL for containers and wxString
+ */
+#define wxUSE_STL 0

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

+/*
+ * The built-in regex supports advanced REs in additional to POSIX's basic
+ * and extended. Your system regex probably won't support this, and in this
+ * case WX_NO_REGEX_ADVANCED should be defined.
+ */
+#undef WX_NO_REGEX_ADVANCED
+/*
+ * Use XML support
+ */
+#define wxUSE_XML 1

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


@@ -158,10 +220,15 @@
  * Use libtiff
  */
 #define wxUSE_LIBTIFF 1
  * Use libtiff
  */
 #define wxUSE_LIBTIFF 1

+/*
+ * Use SDL for audio (Unix)
+ */
+#define wxUSE_LIBSDL 0

 /*
  * Use iODBC
  */
 #define wxUSE_ODBC 1
 /*
  * Use iODBC
  */
 #define wxUSE_ODBC 1

+#define wxUSE_BUILTIN_IODBC 0

 #define wxODBC_FWD_ONLY_CURSORS 1
 #define wxODBC_BACKWARD_COMPATABILITY 0
 /*
 #define wxODBC_FWD_ONLY_CURSORS 1
 #define wxODBC_BACKWARD_COMPATABILITY 0
 /*


@@ -194,11 +261,19 @@
  */
 #define wxUSE_NOGUI 0
 
  */
 #define wxUSE_NOGUI 0
 

+#define wxUSE_BASE 1
+#define __WXBASE__ 1
+

 /*
  * Catch fatal program exceptions
  */
 #define wxUSE_ON_FATAL_EXCEPTION 0
 
 /*
  * Catch fatal program exceptions
  */
 #define wxUSE_ON_FATAL_EXCEPTION 0
 

+/*
+ * Use wxSingleInstanceChecker class
+ */
+#define wxUSE_SNGLINST_CHECKER 1
+

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


@@ -356,6 +431,11 @@
  * Use this control
  */
 #define wxUSE_CHOICE 1
  * Use this control
  */
 #define wxUSE_CHOICE 1

+/*
+ * Use wxDisplay class
+ */
+#define wxUSE_DISPLAY 1
+

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


@@ -365,12 +445,12 @@
  */
 #define wxUSE_GRID 1
 /*
  */
 #define wxUSE_GRID 1
 /*

- * Use this control
+ * Use the new prototype wxGrid classes
+ * (wxUSE_GRID must also be defined)

  */
 #define wxUSE_NEW_GRID 1
 /*
  */
 #define wxUSE_NEW_GRID 1
 /*

- * Use the new prototype wxGrid classes
- * (wxUSE_GRID must also be defined)
+ * Use wxImageList class

  */
 #define wxUSE_IMAGLIST 1
 /*
  */
 #define wxUSE_IMAGLIST 1
 /*


@@ -393,6 +473,7 @@
  * Use this control
  */
 #define wxUSE_NOTEBOOK 1
  * Use this control
  */
 #define wxUSE_NOTEBOOK 1

+#define wxUSE_LISTBOOK 1

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


@@ -470,17 +551,6 @@
  */
 #define wxUSE_TOOLBAR_NATIVE 1
 
  */
 #define wxUSE_TOOLBAR_NATIVE 1
 

-/*
- * Use generic wxToolBar instead of/together with the native one?
- */
-#define wxUSE_TOOLBAR_SIMPLE 1
-
-#if defined(__WXWINE__) || defined(__GNUWIN32__) || defined(__WXPM__)
-  #if wxUSE_TOOLBAR
-    #define wxUSE_BUTTONBAR 1
-  #endif
-#endif
-

 /*
  * Use wxTreeLayout class
  */
 /*
  * Use wxTreeLayout class
  */


@@ -501,11 +571,6 @@
  */
 #define wxUSE_GEOMETRY 1
 
  */
 #define wxUSE_GEOMETRY 1
 

-/*
- * Use wxFFile class
- */
-#define wxUSE_FFILE 1
- 

 /*
  * Use wxCmdLineParser class
  */
 /*
  * Use wxCmdLineParser class
  */


@@ -518,6 +583,15 @@
  * Use wxFile class
  */
 #define wxUSE_FILE 1
  * Use wxFile class
  */
 #define wxUSE_FILE 1

+/*
+ * Use wxFFile class
+ */
+#define wxUSE_FFILE 1
+/*
+ * Use wxFSVolume class
+ */
+#define wxUSE_FSVOLUME 1
+

 /*
  * Use wxTextBuffer class
  */
 /*
  * Use wxTextBuffer class
  */


@@ -526,6 +600,9 @@
  * Use wxTextFile class
  */
 #define wxUSE_TEXTFILE 1
  * Use wxTextFile class
  */
 #define wxUSE_TEXTFILE 1

+
+#define wxUSE_EXCEPTIONS 0
+

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


@@ -553,7 +630,7 @@
 /*
  * Use wave class
  */
 /*
  * Use wave class
  */

-#define wxUSE_WAVE 1
+#define wxUSE_SOUND 1

 /*
  * Use config system
  */
 /*
  * Use config system
  */


@@ -620,12 +697,12 @@
 #define wxUSE_POSTSCRIPT 1
 
 /*
 #define wxUSE_POSTSCRIPT 1
 
 /*

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

  */
  */

-#define wxUSE_WCHAR_T 0
+#define wxUSE_WCHAR_T 1

 
 /*
 
 /*

- * Compile wxString in wide character (Unicode) mode?
+ * Compile wxWindows in Unicode mode?

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


@@ -634,6 +711,27 @@
  */
 #define wxUSE_UNICODE_MSLU 0
 
  */
 #define wxUSE_UNICODE_MSLU 0
 

+/*
+ * Set to 1 to compile MS Windows XP theme engine support
+ */
+/* #define wxUSE_UXTHEME 1 */
+
+/*
+ *  Set to 1 to auto-adapt to MS Windows XP themes where possible
+ * (notably, wxNotebook pages)
+ */
+/* #define wxUSE_UXTHEME_AUTO 1*/
+
+/*
+ *  Set to 1 to use mousewheel events on Windows
+ */
+/* #undef wxUSE_MOUSEWHEEL */
+
+/*
+ * Hotkey support (Windows)
+ */
+/* #define wxUSE_HOTKEY 1 */
+

 /*
  * Use wxURL class
  */
 /*
  * Use wxURL class
  */


@@ -674,7 +772,7 @@
 /*
  * Use tooltips
  */
 /*
  * Use tooltips
  */

-#ifdef __WXMOTIF__
+#if defined (__WXMOTIF__) || defined( __WXX11__ )

 #define wxUSE_TOOLTIPS 0
 #else
 #define wxUSE_TOOLTIPS 1
 #define wxUSE_TOOLTIPS 0
 #else
 #define wxUSE_TOOLTIPS 1


@@ -695,11 +793,11 @@
  * Use spline
  */
 #define wxUSE_SPLINES 1
  * Use spline
  */
 #define wxUSE_SPLINES 1

+

 /*
 /*

- * Use wxLibrary class
+ * Use MDI.

  */
  */

-#define wxUSE_DYNLIB_CLASS 1
-
+#define wxUSE_MDI 1

 /*
  * Use the mdi architecture
  */
 /*
  * Use the mdi architecture
  */


@@ -726,13 +824,21 @@
 #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 1
 /*
  * Use built-in HTML-based help controller
  */
 #define wxUSE_WXHTML_HELP 1
  */
 #define wxUSE_HELP 1
 /*
  * Use built-in HTML-based help controller
  */
 #define wxUSE_WXHTML_HELP 1

+/*
+ * Use MS HTML Help controller (win32)
+ */
+#define wxUSE_MS_HTML_HELP 0
+/*
+ * Use MS HTML Help via libmspack (Unix)
+ */
+#define wxUSE_LIBMSPACK 1

 
 /*
  * Use iostream.h rather than iostream
 
 /*
  * Use iostream.h rather than iostream


@@ -743,14 +849,14 @@
  */
 #define wxUSE_APPLE_IEEE 0
 
  */
 #define wxUSE_APPLE_IEEE 0
 

-/*
- * Compatibility with 2.0 API.
- */
-#define WXWIN_COMPATIBILITY_2 0

 /*
  * Compatibility with 2.2 API
  */
 #define WXWIN_COMPATIBILITY_2_2 1
 /*
  * Compatibility with 2.2 API
  */
 #define WXWIN_COMPATIBILITY_2_2 1

+/*
+ * Compatibility with 2.4 API
+ */
+#define WXWIN_COMPATIBILITY_2_4 1

 /*
  * Enables debugging: memory tracing, assert, etc., contains debug level
  */
 /*
  * Enables debugging: memory tracing, assert, etc., contains debug level
  */


@@ -793,6 +899,7 @@
  * Support for metafiles
  */
 #define wxUSE_METAFILE 1
  * Support for metafiles
  */
 #define wxUSE_METAFILE 1

+#define wxUSE_ENH_METAFILE 1

 
 /*
  * wxMiniFrame
 
 /*
  * wxMiniFrame


@@ -858,10 +965,15 @@
 #define wxUSE_XPM 1
 
 /*
 #define wxUSE_XPM 1
 
 /*

- * MS Icons and Cursors format support
+ * MS ICO (and CUR,ANI derivatives) image format support (on any platform)

  */
 #define wxUSE_ICO_CUR 1
 
  */
 #define wxUSE_ICO_CUR 1
 

+/* 
+ * Set to 1 if for dynamically loadable plugins support 
+ */
+#define wxUSE_PLUGINS 1
+

 /*
  * 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.


@@ -884,14 +996,22 @@
 /* The type of 3rd argument to getsockname() - usually size_t or int */
 #define SOCKLEN_T size_t
 
 /* The type of 3rd argument to getsockname() - usually size_t or int */
 #define SOCKLEN_T size_t
 

+/* The type of statvfs(2) argument */
+#undef WX_STATFS_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
 
 /* 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 is
- * present */
+/* struct tm doesn't always have the tm_gmtoff field, define this if it does */

 #define WX_GMTOFF_IN_TM
 
 #define WX_GMTOFF_IN_TM
 

+/* Define if you have poll(2) function */
+#define HAVE_POLL 1
+

 /* Define if you have pw_gecos field in struct passwd */
 #undef HAVE_PW_GECOS
 
 /* Define if you have pw_gecos field in struct passwd */
 #undef HAVE_PW_GECOS
 


@@ -904,21 +1024,24 @@
 /* Define if you have ftime() */
 #define HAVE_FTIME
 
 /* Define if you have ftime() */
 #define HAVE_FTIME
 

+/* Define if you have support for large (64 bit size) files */
+#undef HAVE_LARGEFILE_SUPPORT
+

 /* Define if you have localtime() */
 #define HAVE_LOCALTIME
 
 /* Define if you have localtime() */
 #define HAVE_LOCALTIME
 

-/* Define if you have the mktemp function.  */
-#define HAVE_MKTEMP 1
-
-/* Define if you have the mkstemp function.  */
-#define HAVE_MKSTEMP 1
-

 /* 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 */
 #define HAVE_PTHREAD_CANCEL 1
 
 /* Define if you have pthread_cancel */
 #define HAVE_PTHREAD_CANCEL 1
 


@@ -940,6 +1063,9 @@
 /* define if you have statfs function */
 #undef HAVE_STATFS
 
 /* define if you have statfs function */
 #undef HAVE_STATFS
 

+/* define if you have statvfs function */
+#undef HAVE_STATVFS
+

 /* Define if you have strptime() */
 #define HAVE_STRPTIME 1
  
 /* Define if you have strptime() */
 #define HAVE_STRPTIME 1
  


@@ -955,6 +1081,9 @@
 /* Define if you have vsnprintf() */
 #undef HAVE_VSNPRINTF
 
 /* Define if you have vsnprintf() */
 #undef HAVE_VSNPRINTF
 

+/* Define if you have vsnprintf() declaration in the header */
+#undef HAVE_VSNPRINTF_DECL
+

 /* Define if you have usleep() */
 #define HAVE_USLEEP 1
 
 /* Define if you have usleep() */
 #define HAVE_USLEEP 1
 


@@ -973,8 +1102,8 @@
 /* The number of bytes in a int.  */
 #define SIZEOF_INT 4
 
 /* The number of bytes in a int.  */
 #define SIZEOF_INT 4
 

-/* The number of bytes in a int *.  */
-#define SIZEOF_INT_P 4
+/* The number of bytes in a pointer.  */
+#define SIZEOF_VOID_P 4

 
 /* The number of bytes in a long.  */
 #define SIZEOF_LONG 4
 
 /* The number of bytes in a long.  */
 #define SIZEOF_LONG 4


@@ -985,6 +1114,9 @@
 /* The number of bytes in a short.  */
 #define SIZEOF_SHORT 2
 
 /* The number of bytes in a short.  */
 #define SIZEOF_SHORT 2
 

+/* The number of bytes in a size_t.  */
+#define SIZEOF_SIZE_T 4
+

 /* Define if size_t on your machine is the same type as unsigned int. */
 #define wxSIZE_T_IS_UINT  1
 
 /* Define if size_t on your machine is the same type as unsigned int. */
 #define wxSIZE_T_IS_UINT  1
 


@@ -997,6 +1129,12 @@
 /* Define if you have the dlerror function.  */
 #define HAVE_DLERROR 1
 
 /* Define if you have the dlerror function.  */
 #define HAVE_DLERROR 1
 

+/* Define if you have Posix fnctl() function. */
+#define HAVE_FCNTL 1
+
+/* Define if you have BSD flock() function. */
+#undef HAVE_FLOCK
+

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


@@ -1006,9 +1144,21 @@
 /* Define if you have the inet_aton function.  */
 #undef HAVE_INET_ATON
 
 /* Define if you have the inet_aton function.  */
 #undef HAVE_INET_ATON
 

+/* Define if you have the mktemp function.  */
+#define HAVE_MKTEMP 1
+
+/* Define if you have the mkstemp function.  */
+#define HAVE_MKSTEMP 1
+

 /* 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.  */
+#define HAVE_PUTENV 1
+
+/* 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 the shl_load function.  */
 #undef HAVE_SHL_LOAD
 


@@ -1024,12 +1174,12 @@
 /* Define if you have the usleep function.  */
 #define HAVE_USLEEP 1
 
 /* Define if you have the usleep function.  */
 #define HAVE_USLEEP 1
 

-/* Define if you have the vfork function.  */
-#define HAVE_VFORK 1
-

 /* 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
 

+/* Define if you have the fnmatch() function */
+#undef HAVE_FNMATCH
+

 /* Define if you have the <fnmatch.h> header file.  */
 #undef HAVE_FNMATCH_H
 
 /* Define if you have the <fnmatch.h> header file.  */
 #undef HAVE_FNMATCH_H
 


@@ -1042,18 +1192,21 @@
 /* Define if you have the <sched.h> header file.  */
 #undef HAVE_SCHED_H
 
 /* Define if you have the <sched.h> header file.  */
 #undef HAVE_SCHED_H
 

-/* Define if you have the <strings.h> header file.  */
-#define HAVE_STRINGS_H 1
-

 /* Define if you have the <unistd.h> header file.  */
 #define HAVE_UNISTD_H 1
 
 /* Define if you have the <unistd.h> header file.  */
 #define HAVE_UNISTD_H 1
 

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

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

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

 /* Define if you have the <iconv.h> header file and iconv() symbol.  */
 #define HAVE_ICONV_H 1
 
 /* Define if you have the <iconv.h> header file and iconv() symbol.  */
 #define HAVE_ICONV_H 1
 


@@ -1066,17 +1219,49 @@
 /* Define if you have the <w32api.h> header file (mingw,cygwin).  */
 #undef HAVE_W32API_H
 
 /* Define if you have the <w32api.h> header file (mingw,cygwin).  */
 #undef HAVE_W32API_H
 

-/*
- * Use MS HTML Help controller (win32)
- */
-#define wxUSE_MS_HTML_HELP 0
+/* Define if you have the <esd.h> header file.  */
+/* #undef HAVE_ESD_H */
+
+/* Define if you have the <sys/soundcard.h> header file. */
+/* #undef HAVE_SYS_SOUNDCARD_H */

 
 /* Define if you have wcsrtombs() function */
 #define HAVE_WCSRTOMBS 1
 
 
 /* Define if you have wcsrtombs() function */
 #define HAVE_WCSRTOMBS 1
 

+/* Define this if you have fputws() and putwc() */
+#define HAVE_FPUTWC 1
+
+/* Define this if you have strcasecmp() function in <string.h> */
+#define HAVE_STRCASECMP_IN_STRING_H 1
+
+/* Define this if you have strcasecmp() function in <strings.h> */
+#undef HAVE_STRCASECMP_IN_STRINGS_H
+
+/* Define this if you have wprintf() and related functions */
+#define HAVE_WPRINTF 1
+
+/* Define this if you have vswprintf() and related functions */
+#define HAVE_VSWPRINTF 1
+
+/* Define this if you have _vsnwprintf */
+#undef HAVE__VSNWPRINTF
+

 /* 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
 

+/* ---------------------------------------------------------------------
+   Win32 adjustments section
+   ---------------------------------------------------------------------
+ */
+ 
+#ifdef __WIN32__
+
+/* we need to define wxUSE_XPM_IN_MSW for MSW compilation for compatibil
+      with wx/msw/setup.h */
+#define wxUSE_XPM_IN_MSW wxUSE_XPM
+
+#endif /* __WIN32__ */
+

 /* --------------------------------------------------------*
  *  This stuff is static, it doesn't get modified directly
  *  by configure.
 /* --------------------------------------------------------*
  *  This stuff is static, it doesn't get modified directly
  *  by configure.


@@ -1095,4 +1280,7 @@
 /* define this when wxDC::Blit() respects SetDeviceOrigin() in wxGTK */
 #define wxHAS_WORKING_GTK_DC_BLIT 1
 
 /* define this when wxDC::Blit() respects SetDeviceOrigin() in wxGTK */
 #define wxHAS_WORKING_GTK_DC_BLIT 1
 

+/* Define this is you have X11/extensions/shape.h */
+#define HAVE_XSHAPE 1
+

 #endif /* __WX_SETUP_H__ */
 #endif /* __WX_SETUP_H__ */