Various tweaks, fixes, and additions

[wxWidgets.git] / setup.h_vms

diff --git a/setup.h_vms b/setup.h_vms
index 0c4d7e852f40c889bca01fd5926e91071060f3db..56aa2d91c3400c3fda81dd56a210e83e7d693a31 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
 


@@ -68,10 +70,13 @@
 #undef YYTEXT_POINTER
 
 /* Define this if your version of GTK+ is greater than 1.2 */
 #undef YYTEXT_POINTER
 
 /* 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__

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


@@ -109,8 +114,17 @@
 #undef STRICT
 #undef WINVER
 
 #undef STRICT
 #undef WINVER
 

-/* enable rich edit not on VMS (Win32 Only) */
+/* 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
 #define wxUSE_RICHEDIT 0

+#endif

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


@@ -138,6 +152,11 @@
  */
 #define wxUSE_ODBC 0
 #define wxODBC_FWD_ONLY_CURSORS 1
  */
 #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
  */


@@ -164,6 +183,11 @@
  */
 #define wxUSE_NOGUI 0
 
  */
 #define wxUSE_NOGUI 0
 

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

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


@@ -174,11 +198,51 @@
  */
 #define wxUSE_VALIDATORS 1
 
  */
 #define wxUSE_VALIDATORS 1
 

+/*
+ * Use wxControl
+ */
+#define wxUSE_CONTROLS 1
+
+/*
+ * Use wxPopupWindow (useful in wxUniv only for now)
+ */
+#define wxUSE_POPUPWIN 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 wxFontDialog
+ */
+#define wxUSE_FONTDLG 1
+
+/*
+ * Use wxMimeTypesManager and related classes
+ */
+#define wxUSE_MIMETYPE 1
+
+/*
+ * Use wxMessageDialog (and wxMessageBox)
+ */
+#define wxUSE_MSGDLG 1
+
+/*
+ * Use wxNumberEntryDialog
+ */
+#define wxUSE_NUMBERDLG 1
+

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


@@ -194,11 +258,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 +302,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
  */


@@ -257,6 +355,10 @@
  * Use wxPlot class
  */
  #define wxUSE_PLOT 1
  * Use wxPlot class
  */
  #define wxUSE_PLOT 1

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

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


@@ -305,10 +407,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
  */


@@ -316,7 +426,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
 


@@ -347,6 +462,24 @@
  */
 #define wxUSE_LONGLONG 1
 
  */
 #define wxUSE_LONGLONG 1
 

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

 /*
  * Use wxFile class
  */
 /*
  * Use wxFile class
  */


@@ -359,6 +492,22 @@
  * 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 1
+/*
+ * Use wxStopWatch
+ */
+#define wxUSE_STOPWATCH 1

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


@@ -371,6 +520,10 @@
  * 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
  */
 /*
  * Use intl system
  */


@@ -390,7 +543,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.


@@ -401,6 +554,11 @@
  */
 #define wxUSE_DYNLIB_CLASS 1
 
  */
 #define wxUSE_DYNLIB_CLASS 1
 

+/*
+ * Use wxTimer
+ */
+#define wxUSE_TIMER 1
+

 /*
  * Use font metric files in GetTextExtent for wxPostScriptDC
  * Use consistent PostScript fonts for AFM and printing (!)
 /*
  * Use font metric files in GetTextExtent for wxPostScriptDC
  * Use consistent PostScript fonts for AFM and printing (!)


@@ -426,11 +584,6 @@
  */
 #define wxUSE_UNICODE 0
 
  */
 #define wxUSE_UNICODE 0
 

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

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


@@ -459,14 +612,26 @@
  * Use clipboard
  */
 #define wxUSE_CLIPBOARD 1
  * Use clipboard
  */
 #define wxUSE_CLIPBOARD 1

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

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

-#define wxUSE_TOOLTIPS 0
+#define wxUSE_TOOLTIPS 1

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


@@ -505,6 +670,11 @@
  * Use wxWindows help facility (needs wxUSE_IPC 1)
  */
 #define wxUSE_HELP 1
  * Use wxWindows help facility (needs wxUSE_IPC 1)
  */
 #define wxUSE_HELP 1

+/*
+ * Use built-in HTML-based help controller
+ */
+#define wxUSE_WXHTML_HELP 1
+

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


@@ -513,10 +683,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.0 API.
  */

-#define WXWIN_COMPATIBILITY_2 1
+#define WXWIN_COMPATIBILITY_2 0
+/*
+ * Compatibility with 2.2 API
+ */
+#define WXWIN_COMPATIBILITY_2_2 1

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


@@ -588,6 +763,11 @@
  */
 #define wxUSE_ZIPSTREAM 1
 
  */
 #define wxUSE_ZIPSTREAM 1
 

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

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


@@ -603,6 +783,11 @@
  */
 #define wxUSE_PNM 1
  
  */
 #define wxUSE_PNM 1
  

+/*
+ * XPM image format support
+ */
+#define wxUSE_XPM 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.


@@ -633,8 +818,14 @@
  * present */
 #define WX_GMTOFF_IN_TM
 
  * present */
 #define WX_GMTOFF_IN_TM
 

+/* iconv()'s 2nd argument is char ** and not const char ** */
+#define WX_ICONV_TAKES_CHAR 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


@@ -654,6 +845,18 @@
 /* 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
 


@@ -684,6 +887,9 @@
 /* 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
 


@@ -699,8 +905,17 @@
 /* The number of bytes in a short.  */
 #define SIZEOF_SHORT 2
 
 /* The number of bytes in a short.  */
 #define SIZEOF_SHORT 2
 

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


@@ -721,7 +936,7 @@
 #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 HAVE_UNAME
 
 /* Define if you have the uname function.  */
 #define HAVE_UNAME


@@ -759,7 +974,24 @@
 /* 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 <iconv.h> header file.  */
+#define HAVE_ICONV_H 1
+
+/* 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
+
+/*
+ * Use MS HTML Help controller (win32)
+ */
+#define wxUSE_MS_HTML_HELP 0
+

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

+/* now check the settings self consistency */
+#include "wx/chkconf.h"
+

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