compilation fix for VC6 (closes 1025093)

[wxWidgets.git] / setup.h_vms

diff --git a/setup.h_vms b/setup.h_vms
index 6755b09b6287caf9eae8530764fe24e495904bea..d31a73ce396e67b73acc8a01524d1b1725bc5e58 100644 (file)
--- a/setup.h_vms
+++ b/setup.h_vms
@@ -16,6 +16,8 @@
 #pragma interface
 #endif
 
 #pragma interface
 #endif
 

+#include <wx/vms_x_fix.h>
+

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


@@ -30,14 +32,14 @@
 /* fill in with the string wxGetOsDescription() will return */
 #define WXWIN_OS_DESCRIPTION "OpenVMS"
 
 /* fill in with the string wxGetOsDescription() will return */
 #define WXWIN_OS_DESCRIPTION "OpenVMS"
 

-/* Define to `int' if <sys/types.h> doesn't define.  */
-#undef gid_t
+/* the installation location prefix from configure */
+#undef wxINSTALL_PREFIX

 
 

-/* Define if you don't have vprintf but do have _doprnt.  */
-#undef HAVE_DOPRNT
+/* Define this to get extra features from GNU libc. */
+#undef _GNU_SOURCE

 
 

-/* Define if you have the vprintf function.  */
-#define HAVE_VPRINTF
+/* Define to `int' if <sys/types.h> doesn't define.  */
+#undef gid_t

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


@@ -61,17 +63,22 @@
    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 if the X Window System is missing or not being used.  */
-#undef X_DISPLAY_MISSING
+/* Define this if you want to use GPE features */
+/* #undef __WXGPE__ */

 
 

-/* Define if lex declares yytext as a char * by default, not a char[].  */
-#undef YYTEXT_POINTER
+/* 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 this if your version of GTK+ is greater than 1.2 */

-#undef __WXGTK12__
+#define __WXGTK12__ 1
+
+/* Define this if your version of GTK+ is greater than 1.2.7 */
+#define __WXGTK127__ 1

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

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

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


@@ -79,44 +86,140 @@
 #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 __OSF__
-#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__
+
+/* MS-DOS with DJGPP */
+#undef __DOS__

 
 /* Stupid hack; __WINDOWS__ clashes with wx/defs.h */
 #ifndef __WINDOWS__
 #undef __WINDOWS__
 #endif
 
 
 /* Stupid hack; __WINDOWS__ clashes with wx/defs.h */
 #ifndef __WINDOWS__
 #undef __WINDOWS__
 #endif
 

+#ifndef __WIN95__

 #undef __WIN95__
 #undef __WIN95__

+#endif
+#ifndef __WIN32__

 #undef __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__)
+#define wxUSE_NATIVE_STATUSBAR 1
+#define wxUSE_OWNER_DRAWN 1
+#endif
+
+#if defined(__WXPM__)
+#define wxUSE_OWNER_DRAWN 1
+#endif

 
 

-/* enable rich edit not on VMS (Win32 Only) */
+/* enable rich edit under Win32 */
+#if defined(__WIN95__) && !defined(__WINE__) && !defined(__GNUWIN32_OLD__)
+#define wxUSE_RICHEDIT 1
+#else

 #define wxUSE_RICHEDIT 0
 #define wxUSE_RICHEDIT 0

+#endif

 
 /*
  * Supports bool type
  */
 #define HAVE_BOOL
 
 
 /*
  * Supports bool type
  */
 #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 compliant std::string::compare
+ */
+#undef HAVE_STD_STRING_COMPARE
+/*
+ * Define if your compiler has <hash_map>
+ */
+#undef HAVE_HASH_MAP
+/*
+ * Define if your compiler has <ext/hash_map>
+ */
+#undef HAVE_EXT_HASH_MAP
+/*
+ * Define if your compiler has std::hash_map/hash_set
+ */
+#undef HAVE_STD_HASH_MAP
+/*
+ * Define if your compiler has __gnu_cxx::hash_map/hash_set
+ */
+#undef HAVE_GNU_CXX_HASH_MAP
+
+/*
+ * use STL for containers and wxString
+ */
+#define wxUSE_STL 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
  */


@@ -133,11 +236,21 @@
  * Use libtiff
  */
 #define wxUSE_LIBTIFF 1
  * Use libtiff
  */
 #define wxUSE_LIBTIFF 1

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

 /*
  * Use iODBC
  */
 /*
  * Use iODBC
  */

-#define wxUSE_ODBC 0
+#define wxUSE_ODBC 1
+#define wxUSE_BUILTIN_IODBC 0

 #define wxODBC_FWD_ONLY_CURSORS 1
 #define wxODBC_FWD_ONLY_CURSORS 1

+#define wxODBC_BACKWARD_COMPATABILITY 0
+/*
+ * Use freetype
+ */
+#define wxUSE_FREETYPE 1

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


@@ -154,7 +267,7 @@
  * Use OpenGL
  */
 #define wxUSE_OPENGL 1
  * Use OpenGL
  */
 #define wxUSE_OPENGL 1

-
+#define wxUSE_GLCANVAS 1

 /*
  * Use GUI
  */
 /*
  * Use GUI
  */


@@ -164,6 +277,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
+
+/*
+ * Use wxSingleInstanceChecker class
+ */
+#define wxUSE_SNGLINST_CHECKER 1
+

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


@@ -174,11 +300,70 @@
  */
 #define wxUSE_VALIDATORS 1
 
  */
 #define wxUSE_VALIDATORS 1
 

+/*
+ * Use wxControl
+ */
+#define wxUSE_CONTROLS 1
+
+/*
+ * Use wxPopupWindow (useful in wxUniv only for now)
+ */
+#ifdef __WXMOTIF__
+#define wxUSE_POPUPWIN 0
+#else
+#define wxUSE_POPUPWIN 1
+#endif
+
+/*
+   Use wxTipWindow
+*/
+#define wxUSE_TIPWINDOW 1
+

 /*
  * Use accelerators
  */
 #define wxUSE_ACCEL 1
 
 /*
  * Use accelerators
  */
 #define wxUSE_ACCEL 1
 

+/*
+ * Use wxCalendarCtrl
+ */
+#define wxUSE_CALENDARCTRL 1
+
+/*
+ * Use wxFileDialog
+ */
+#define wxUSE_FILEDLG 1
+
+/*
+ * Use wxFindReplaceDialog
+ */
+#define wxUSE_FINDREPLDLG 0
+
+/*
+ * Use wxFontDialog
+ */
+#define wxUSE_FONTDLG 1
+
+/*
+ * Use wxMimeTypesManager and related classes
+ */
+#define wxUSE_MIMETYPE 1
+
+/*
+ * Use wxSystemOptions
+ */
+#define wxUSE_SYSTEM_OPTIONS 1
+
+/*
+ * Use wxMessageDialog (and wxMessageBox)
+ */
+#define wxUSE_MSGDLG 1
+
+/*
+ * Use wxNumberEntryDialog
+ */
+#define wxUSE_NUMBERDLG 1
+

 /*
  * Use wxTextEntryDialog
  */
 /*
  * Use wxTextEntryDialog
  */


@@ -194,11 +379,41 @@
  */
 #define wxUSE_PROGRESSDLG 1
 
  */
 #define wxUSE_PROGRESSDLG 1
 

+/*
+ * Use chooser dialog
+ */
+#define wxUSE_CHOICEDLG 1
+
+/*
+ * Use colour picker dialog
+ */
+#define wxUSE_COLOURDLG 1
+

 /*
  * Use directory chooser dialog
  */
 #define wxUSE_DIRDLG 1
 
 /*
  * Use directory chooser dialog
  */
 #define wxUSE_DIRDLG 1
 

+/*
+ * Use wxDragImage class
+ */
+#define wxUSE_DRAGIMAGE 1
+
+/*
+ * Use property sheet classes
+ */
+#define wxUSE_PROPSHEET 1
+
+/*
+ * Use wxWizard
+ */
+#define wxUSE_WIZARDDLG 1
+
+/*
+ * Use splash screen
+ */
+#define wxUSE_SPLASH 1
+

 /*
  * Joystick support (Linux/GTK only)
  */
 /*
  * Joystick support (Linux/GTK only)
  */


@@ -208,6 +423,10 @@
  * Use this control
  */
 #define wxUSE_CARET 1
  * Use this control
  */
 #define wxUSE_CARET 1

+/*
+ * Use this control
+ */
+#define wxUSE_BUTTON 1

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


@@ -228,6 +447,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
  */


@@ -237,12 +461,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
 /*


@@ -253,10 +477,19 @@
  * Use this control
  */
 #define wxUSE_LISTCTRL 1
  * Use this control
  */
 #define wxUSE_LISTCTRL 1

+/*
+ * Use wxPlot class
+ */
+ #define wxUSE_PLOT 1
+/*
+ * Use wxMenuBar, wxMenuItem and wxMenu
+ */
+#define wxUSE_MENUS 1

 /*
  * Use this control
  */
 #define wxUSE_NOTEBOOK 1
 /*
  * Use this control
  */
 #define wxUSE_NOTEBOOK 1

+#define wxUSE_LISTBOOK 1

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


@@ -301,10 +534,18 @@
  * Use this control
  */
 #define wxUSE_STATLINE 1
  * Use this control
  */
 #define wxUSE_STATLINE 1

+/*
+ * Use this control
+ */
+#define wxUSE_STATTEXT 1

 /*
  * Use this control
  */
 #define wxUSE_STATUSBAR 1
 /*
  * Use this control
  */
 #define wxUSE_STATUSBAR 1

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

 /*
  * Use Tab dialog class - obsolete, use wxNotebook instead
  */
 /*
  * Use Tab dialog class - obsolete, use wxNotebook instead
  */


@@ -312,7 +553,12 @@
 /* compatibility */
 #define wxUSE_TABDIALOG wxUSE_TAB_DIALOG
 /*
 /* compatibility */
 #define wxUSE_TABDIALOG wxUSE_TAB_DIALOG
 /*

- * Use this control
+ * Use wxTextCtrl
+ */
+#define wxUSE_TEXTCTRL 1
+
+/*
+ * Use wxToollBar

  */
 #define wxUSE_TOOLBAR 1
 
  */
 #define wxUSE_TOOLBAR 1
 


@@ -322,16 +568,9 @@
 #define wxUSE_TOOLBAR_NATIVE 1
 
 /*
 #define wxUSE_TOOLBAR_NATIVE 1
 
 /*

- * Use generic wxToolBar instead of/together with the native one?
+ * Use wxTreeLayout class

  */
  */

-#define wxUSE_TOOLBAR_SIMPLE 1
-
-#if defined(__WXWINE__) || defined(__GNUWIN32__) || defined(__WXPM__)
-#define wxUSE_OWNER_DRAWN 1 
-  #if wxUSE_TOOLBAR
-    #define wxUSE_BUTTONBAR 1
-  #endif
-#endif
+#define wxUSE_TREELAYOUT 1

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


@@ -343,18 +582,63 @@
  */
 #define wxUSE_LONGLONG 1
 
  */
 #define wxUSE_LONGLONG 1
 

+/*
+ * Use geometry classes
+ */
+#define wxUSE_GEOMETRY 1
+
+/*
+ * Use wxCmdLineParser class
+ */
+#define wxUSE_CMDLINE_PARSER 1
+/*
+ * Use wxDateTime
+ */
+#define wxUSE_DATETIME 1

 /*
  * 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
+ */
+#define wxUSE_TEXTBUFFER 1

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

+
+#define wxUSE_EXCEPTIONS 0
+

 /*
  * Use log classes and logging functions
  */
 #define wxUSE_LOG 1
 /*
  * Use log classes and logging functions
  */
 #define wxUSE_LOG 1

+/*
+ * Use log window
+ */
+#define wxUSE_LOGWINDOW 1
+/*
+ * Use standard GUI logger
+ */
+#define wxUSE_LOGGUI 1
+/*
+ * Use old log dialog instead of new wxLogGui
+ */
+#define wxUSE_LOG_DIALOG 0
+/*
+ * Use wxStopWatch
+ */
+#define wxUSE_STOPWATCH 1

 /*
  * Use time and date classes
  */
 /*
  * Use time and date classes
  */


@@ -362,23 +646,30 @@
 /*
  * Use wave class
  */
 /*
  * Use wave class
  */

-#define wxUSE_WAVE 1
+#define wxUSE_SOUND 1

 /*
  * Use config system
  */
 #define wxUSE_CONFIG 1
 /*
  * Use config system
  */
 #define wxUSE_CONFIG 1

+/*
+ * Use font mapping/conversion classes
+ */
+#define wxUSE_FONTMAP 1

 /*
  * Use intl system
  */
 #define wxUSE_INTL 1
 /*
 /*
  * Use intl system
  */
 #define wxUSE_INTL 1
 /*

- * Use streams
+ * Use wxProtocol and related classes

  */
  */

-#define wxUSE_STREAMS 1
+#define wxUSE_PROTOCOL 1
+#define wxUSE_PROTOCOL_FILE 1
+#define wxUSE_PROTOCOL_FTP 1
+#define wxUSE_PROTOCOL_HTTP 1

 /*
 /*

- * Use class serialization
+ * Use streams

  */
  */

-#define wxUSE_SERIAL 1
+#define wxUSE_STREAMS 1

 /*
  * Use sockets
  */
 /*
  * Use sockets
  */


@@ -386,7 +677,7 @@
 /*
  * Use dialup manager
  */
 /*
  * Use dialup manager
  */

-#define wxUSE_DIALUP_MANAGER 0
+#define wxUSE_DIALUP_MANAGER 1

 /*
  * Use standard C++ streams if 1. If 0, use wxWin
  * streams implementation.
 /*
  * Use standard C++ streams if 1. If 0, use wxWin
  * streams implementation.


@@ -396,6 +687,15 @@
  * wxLibrary class
  */
 #define wxUSE_DYNLIB_CLASS 1
  * wxLibrary class
  */
 #define wxUSE_DYNLIB_CLASS 1

+/*
+ * Use wxObjectLoader
+ */
+#define wxUSE_DYNAMIC_LOADER 0
+
+/*
+ * Use wxTimer
+ */
+#define wxUSE_TIMER 1

 
 /*
  * Use font metric files in GetTextExtent for wxPostScriptDC
 
 /*
  * Use font metric files in GetTextExtent for wxPostScriptDC


@@ -413,19 +713,45 @@
 #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
 
 /*

- * Compile wxString with (limited) multibyte char support?
+ * Use MS Layer for Unicode on Win9X (Win32 only)?
+ */
+#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_MULTIBYTE 1
+/* #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
+ */
+#define wxUSE_URL 1

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


@@ -455,23 +781,39 @@
  * Use clipboard
  */
 #define wxUSE_CLIPBOARD 1
  * Use clipboard
  */
 #define wxUSE_CLIPBOARD 1

+/*
+ * Use wxDataObject
+*/
+#define wxUSE_DATAOBJ 1

 /*
  * Use tooltips
  */
 /*
  * Use tooltips
  */

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

 #define wxUSE_TOOLTIPS 0
 #define wxUSE_TOOLTIPS 0

+#else
+#define wxUSE_TOOLTIPS 1
+#endif

 /*
  * Use dnd
  */
 /*
  * Use dnd
  */

+#ifdef __WXGTK__
+#define wxUSE_DRAG_AND_DROP 1
+#else

 #define wxUSE_DRAG_AND_DROP 0
 #define wxUSE_DRAG_AND_DROP 0

+#endif
+/*
+ * Use OLE (MSW only)
+*/
+#define wxUSE_OLE 0

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


@@ -498,9 +840,22 @@
 #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
  */
 #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
  */


@@ -509,10 +864,15 @@
  * Use Apple Ieee-double converter
  */
 #define wxUSE_APPLE_IEEE 0
  * Use Apple Ieee-double converter
  */
 #define wxUSE_APPLE_IEEE 0

+

 /*
 /*

- * Compatibility with 2.0 API.
+ * Compatibility with 2.2 API

  */
  */

-#define WXWIN_COMPATIBILITY_2 1
+#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
  */


@@ -555,6 +915,7 @@
  * Support for metafiles
  */
 #define wxUSE_METAFILE 1
  * Support for metafiles
  */
 #define wxUSE_METAFILE 1

+#define wxUSE_ENH_METAFILE 1

 
 /*
  * wxMiniFrame
 
 /*
  * wxMiniFrame


@@ -566,6 +927,11 @@
  */
 #define wxUSE_HTML 1
 
  */
 #define wxUSE_HTML 1
 

+/*
+ * wxWebKitCtrl
+ */
+#define wxUSE_WEBKIT 1
+

 /*
  * (virtual) filesystems code
  */
 /*
  * (virtual) filesystems code
  */


@@ -584,6 +950,16 @@
  */
 #define wxUSE_ZIPSTREAM 1
 
  */
 #define wxUSE_ZIPSTREAM 1
 

+/*
+ * wxPalette class
+ */
+#define wxUSE_PALETTE 1
+
+/*
+ * wxImage support
+ */
+#define wxUSE_IMAGE 1
+

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


@@ -594,11 +970,31 @@
  */
 #define wxUSE_PCX 1
 
  */
 #define wxUSE_PCX 1
 

+/*
+ * IFF image format support
+ */
+#define wxUSE_IFF 1
+

 /*
  * PNM image format support
  */
 #define wxUSE_PNM 1
  
 /*
  * PNM image format support
  */
 #define wxUSE_PNM 1
  

+/*
+ * XPM image format support
+ */
+#define wxUSE_XPM 1
+
+/*
+ * MS ICO (and CUR,ANI derivatives) image format support (on any platform)
+ */
+#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.


@@ -621,16 +1017,27 @@
 /* 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 dlopen() */
 /* Define if you have dlopen() */

-#define HAVE_DLOPEN
+#define HAVE_DLOPEN 1

 
 /* Define if you have gettimeofday() */
 #define HAVE_GETTIMEOFDAY
 
 /* Define if you have gettimeofday() */
 #define HAVE_GETTIMEOFDAY


@@ -638,6 +1045,9 @@
 /* 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
 


@@ -647,12 +1057,36 @@
 /* Define if you have sched_yield */
 #undef HAVE_SCHED_YIELD
 
 /* 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
 

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

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


@@ -668,11 +1102,14 @@
 /* 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 if you have usleep() */

-#define HAVE_USLEEP
+#define HAVE_USLEEP 1

 
 /* Define if you have wcslen function  */
 
 /* Define if you have wcslen function  */

-#define HAVE_WCSLEN
+#define HAVE_WCSLEN 1

 
 /* define if you have vsscanf function */
 #undef HAVE_VSSCANF
 
 /* define if you have vsscanf function */
 #undef HAVE_VSSCANF


@@ -680,11 +1117,14 @@
 /* The number of bytes in a char.  */
 #define SIZEOF_CHAR 1
 
 /* The number of bytes in a char.  */
 #define SIZEOF_CHAR 1
 

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

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


@@ -695,21 +1135,51 @@
 /* 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 long. */
+#undef wxSIZE_T_IS_ULONG
+

 /* Define if you have the dlopen function.  */
 /* Define if you have the dlopen function.  */

-#define HAVE_DLOPEN
+#define HAVE_DLOPEN 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 if you have the gethostname function.  */

-#define HAVE_GETHOSTNAME
+#define HAVE_GETHOSTNAME 1

 
 /* Define if you have the inet_addr function.  */
 
 /* Define if you have the inet_addr function.  */

-#define HAVE_INET_ADDR
+#define HAVE_INET_ADDR 1

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


@@ -717,20 +1187,20 @@
 #undef HAVE_STRTOK_R
 
 /* Define if you have thr_setconcurrency function */
 #undef HAVE_STRTOK_R
 
 /* Define if you have thr_setconcurrency function */

-#undef HaVE_THR_SETCONCURRENCY
+#undef HAVE_THR_SETCONCURRENCY

 
 /* Define if you have the uname function.  */
 
 /* Define if you have the uname function.  */

-#define HAVE_UNAME
+#define HAVE_UNAME 1

 
 /* Define if you have the usleep function.  */
 
 /* Define if you have the usleep function.  */

-#define HAVE_USLEEP
-
-/* Define if you have the vfork function.  */
-#define HAVE_VFORK
+#define HAVE_USLEEP 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
 


@@ -743,19 +1213,110 @@
 /* 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
-

 /* Define if you have the <unistd.h> header file.  */
 /* Define if you have the <unistd.h> header file.  */

-#define HAVE_UNISTD_H
+#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 if you have the <wchar.h> header file.  */

-#define HAVE_WCHAR_H
+#define HAVE_WCHAR_H 1

 
 /* 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 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 as "const" if the declaration of iconv() needs const.  */
+#undef ICONV_CONST
+
+/* Define if you have the <langinfo.h> header file.  */
+#define HAVE_LANGINFO_H 1
+
+/* Define if you have the <w32api.h> header file (mingw,cygwin).  */
+#undef HAVE_W32API_H
+
+/* 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 this if you have wputc() */
+#define HAVE_WPUTC 1
+
+/* Define this if you have wputchar() */
+#define HAVE_WPUTCHAR 1
+
+/* Define this if you have putws() */
+#define HAVE_PUTWS 1
+
+/* Define this if you have fputws() */
+#define HAVE_FPUTWS 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.
+ */
+
+#include "wx/chkconf.h"
+
+/*
+    define some constants identifying wxWindows version in more details t
+    just the version number
+*/
+
+/* wxLogChain class available */
+#define wxHAS_LOG_CHAIN 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
+
+/* Define this if you have type SPBCDATA */
+#undef HAVE_SPBCDATA
+
+/* Define if you have pango_font_family_is_monospace() (Pango >= 1.3.3) */
+#undef HAVE_PANGO_FONT_FAMILY_IS_MONOSPACE
+

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