From dbbd41ae33856d6c9dfe6c2bf19151b1ac0a18eb Mon Sep 17 00:00:00 2001 From: Jouk Jansen Date: Thu, 3 Mar 2005 12:52:43 +0000 Subject: [PATCH] Committing in . OpenVMS compile support updates Modified Files: wxWidgets/setup.h_vms wxWidgets/src/common/descrip.mms wxWidgets/src/common/string.cpp ---------------------------------------------------------------------- git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32576 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- setup.h_vms | 16 +++------------- src/common/descrip.mms | 2 +- src/common/string.cpp | 4 ++-- 3 files changed, 6 insertions(+), 16 deletions(-) diff --git a/setup.h_vms b/setup.h_vms index 11e8240f11..46efdfd62e 100644 --- a/setup.h_vms +++ b/setup.h_vms @@ -170,12 +170,7 @@ #define wxUSE_DEBUG_NEW_ALWAYS 0 -#if defined(_MSC_VER) || \ - (defined(__BORLANDC__) && __BORLANDC__ >= 0x0550) - #define wxUSE_ON_FATAL_EXCEPTION 0 -#else - #define wxUSE_ON_FATAL_EXCEPTION 0 -#endif +#define wxUSE_ON_FATAL_EXCEPTION 0 #define wxUSE_STACKWALKER 0 @@ -337,11 +332,7 @@ #define wxUSE_STATUSBAR 1 -#if defined(__WXMSW__) || defined(__WXMAC__) #define wxUSE_NATIVE_STATUSBAR 0 -#else -#define wxUSE_NATIVE_STATUSBAR 0 -#endif #define wxUSE_TOOLBAR 1 #define wxUSE_TOOLBAR_NATIVE 1 @@ -483,9 +474,6 @@ #define wxUSE_AFM_FOR_POSTSCRIPT 1 -#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1 - - #define wxUSE_ODBC 1 #define wxODBC_FWD_ONLY_CURSORS 1 @@ -1020,6 +1008,8 @@ with wx/msw/setup.h */ #define wxUSE_XPM_IN_MSW wxUSE_XPM +#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1 + #endif /* __WIN32__ */ /* --------------------------------------------------------* diff --git a/src/common/descrip.mms b/src/common/descrip.mms index 7a95337183..b64ef6d63a 100644 --- a/src/common/descrip.mms +++ b/src/common/descrip.mms @@ -176,7 +176,7 @@ OBJECTS2=utilscmn.obj,\ zipstrm.obj,\ zstream.obj -OBJECTS_MOTIF=gaugecmn.obj +OBJECTS_MOTIF=gaugecmn.obj,radiocmn.obj OBJECTS_X11=accesscmn.obj,dndcmn.obj,dpycmn.obj,dseldlg.obj,\ dynload.obj,effects.obj,fddlgcmn.obj,fs_mem.obj,gaugecmn.obj,\ diff --git a/src/common/string.cpp b/src/common/string.cpp index 764e1ff3b8..c95d6729e8 100644 --- a/src/common/string.cpp +++ b/src/common/string.cpp @@ -1842,8 +1842,8 @@ int wxString::PrintfV(const wxChar* pszFormat, va_list argptr) // also, it may return an errno may be something like EILSEQ, // in which case we need to break out if ( (len >= 0 && len <= size) - // No EOVERFLOW on Windows nor Palm 6.0 -#if !defined(__WXMSW__) && !defined(__WXPALMOS__) + // No EOVERFLOW on Windows nor Palm 6.0 nor OpenVMS +#if !defined(__WXMSW__) && !defined(__WXPALMOS__) && !defined( __VMS ) || errno != EOVERFLOW #endif ) -- 2.45.2