Attempt to fix Borland compilo

[wxWidgets.git] / setup.h_vms

diff --git a/setup.h_vms b/setup.h_vms
index 4aa0e67498fe47e448fd913b9e0923a3e5e9ca98..33f1126a262aef24a206b38fb190d4ea078d793c 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,10 @@
    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 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 +74,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,26 +83,29 @@
 #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 __UNIXWARE__
+#define __VMS__
+
+#undef __IA64__
+#define __ALPHA__

 
 /* NanoX (with wxX11) */
 #define wxUSE_NANOX 0
 
 /* NanoX (with wxX11) */
 #define wxUSE_NANOX 0


@@ -110,13 +121,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__)


@@ -129,7 +148,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


@@ -140,10 +159,37 @@
  */
 #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 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

+/*
+ * Use XML support
+ */
+#define wxUSE_XML 1

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


@@ -164,6 +210,7 @@
  * 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
 /*


@@ -196,6 +243,9 @@
  */
 #define wxUSE_NOGUI 0
 
  */
 #define wxUSE_NOGUI 0
 

+#define wxUSE_BASE 1
+#define __WXBASE__ 1
+

 /*
  * Catch fatal program exceptions
  */
 /*
  * Catch fatal program exceptions
  */


@@ -363,6 +413,11 @@
  * Use this control
  */
 #define wxUSE_CHOICE 1
  * Use this control
  */
 #define wxUSE_CHOICE 1

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

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


@@ -372,12 +427,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
 /*


@@ -400,6 +455,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
  */


@@ -477,17 +533,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
  */


@@ -537,6 +582,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
  */


@@ -633,7 +681,7 @@
 /*
  * Compile wxString with some Unicode (wide character) support?
  */
 /*
  * Compile wxString with some Unicode (wide character) support?
  */

-#define wxUSE_WCHAR_T 0
+#define wxUSE_WCHAR_T 1

 
 /*
  * Compile wxWindows in Unicode mode (Win32 only for now)?
 
 /*
  * Compile wxWindows in Unicode mode (Win32 only for now)?


@@ -645,6 +693,17 @@
  */
 #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*/
+

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


@@ -744,6 +803,10 @@
  * Use MS HTML Help controller (win32)
  */
 #define wxUSE_MS_HTML_HELP 0
  * 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


@@ -754,14 +817,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
  */


@@ -834,6 +897,11 @@
  */
 #define wxUSE_ZIPSTREAM 1
 
  */
 #define wxUSE_ZIPSTREAM 1
 

+/*
+ * Use gzip streams, requires wxUSE_ZLIB
+ */
+#define wxUSE_GZSTREAM 1
+

 /*
  * wxPalette class
  */
 /*
  * wxPalette class
  */


@@ -896,6 +964,9 @@
 /* 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
 
 /* The signal handler prototype */
 #undef wxTYPE_SA_HANDLER
 


@@ -906,6 +977,9 @@
 /* struct tm doesn't always have the tm_gmtoff field, define this if it does */
 #define WX_GMTOFF_IN_TM
 
 /* struct tm doesn't always have the tm_gmtoff field, define this if it does */
 #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
 


@@ -921,12 +995,6 @@
 /* Define if you have support for large (64 bit size) files */
 #undef HAVE_LARGEFILE_SUPPORT
 
 /* Define if you have support for large (64 bit size) files */
 #undef HAVE_LARGEFILE_SUPPORT
 

-/* Required by HAVE_LARGEFILE_SUPPORT on some systems */
-#undef _FILE_OFFSET_BITS
-
-/* Ditto */
-#undef _LARGE_FILES
-

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


@@ -981,6 +1049,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
 


@@ -1068,9 +1139,6 @@
 /* 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
 


@@ -1119,12 +1187,40 @@
 /* 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
 

+/* Define if you have the <esd.h> header file.  */
+/* #undef HAVE_ESD_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 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.


@@ -1143,4 +1239,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__ */