Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove support for Digital Mars compiler.

Browse Source 
This compilers is not being developed any longer since many years, drop
support for it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76547 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2014-05-16 13:01:23 +00:00
parent 49b8d79c87
commit 15f255cebb
45 changed files with 34 additions and 354 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/android/setup.h
View File

@@ -1292,8 +1292,7 @@
// list of libraries used to link your application (although this is done
// implicitly for Microsoft Visual C++ users).
//
// Default is 1 unless the compiler is known to ship without the necessary
// headers (Digital Mars) or the platform doesn't support OpenGL (Windows CE).
// Default is 1.
//
// Recommended setting: 1 if you intend to use OpenGL, can be safely set to 0
// otherwise.

2
include/wx/build.h
View File

@@ -66,8 +66,6 @@
#define __WX_BO_COMPILER ",Intel C++"
#elif defined(__BORLANDC__)
#define __WX_BO_COMPILER ",Borland C++"
#elif defined(__DIGITALMARS__)
#define __WX_BO_COMPILER ",DigitalMars"
#else
#define __WX_BO_COMPILER
#endif

2
include/wx/chartype.h
View File

@@ -91,8 +91,6 @@
#elif defined(__BORLANDC__) && (__BORLANDC__ >= 0x520)
#define wxHAVE_TCHAR_SUPPORT
#include <ctype.h>
#elif defined(__DMC__)
#define wxHAVE_TCHAR_SUPPORT
#elif defined(__MINGW32__) && wxCHECK_W32API_VERSION( 1, 0 )
#define wxHAVE_TCHAR_SUPPORT
#include <stddef.h>

8
include/wx/compiler.h
View File

@@ -55,18 +55,10 @@
#elif defined(__BCPLUSPLUS__) && !defined(__BORLANDC__)
# define __BORLANDC__
#elif defined(__SC__)
# define __SYMANTECC__
#elif defined(__SUNPRO_CC)
# ifndef __SUNCC__
# define __SUNCC__ __SUNPRO_CC
# endif /* Sun CC */
#elif defined(__SC__)
# ifdef __DMC__
# define __DIGITALMARS__
# else
# define __SYMANTEC__
# endif
#endif /* compiler */
/*

5
include/wx/confbase.h
View File

@@ -53,8 +53,7 @@ class WXDLLIMPEXP_FWD_BASE wxArrayString;
// symbol if the template functions are available
#if (!defined(__VISUALC__) || __VISUALC__ > 1200) && \
!defined( __VMS ) && \
!(defined(__HP_aCC) && defined(__hppa)) && \
!defined (__DMC__)
!(defined(__HP_aCC) && defined(__hppa))
#define wxHAS_CONFIG_TEMPLATE_RW
#endif
@@ -306,7 +305,7 @@ public:
{ return DoWriteDouble(key, value); }
// Causes ambiguities in under OpenVMS
#if !defined( __VMS ) && !defined (__DMC__)
#if !defined( __VMS )
// for other types, use wxToString()
template <typename T>
bool Write(const wxString& key, T const& value)

9
include/wx/cpp.h
View File

@@ -101,14 +101,7 @@
NULL for the compilers which don't support the latter.
*/
#ifndef __WXFUNCTION__
/* TODO: add more compilers supporting __FUNCTION__ */
#if defined(__DMC__)
/*
__FUNCTION__ happens to be not defined within class members
http://www.digitalmars.com/drn-bin/wwwnews?c%2B%2B.beta/485
*/
#define __WXFUNCTION__ (NULL)
#elif defined(__GNUC__) || \
#if defined(__GNUC__) || \
defined(__VISUALC__) || \
defined(__FUNCTION__)
#define __WXFUNCTION__ __FUNCTION__

6
include/wx/defs.h
View File

@@ -241,8 +241,6 @@ typedef short int WXTYPE;
#elif defined(__BORLANDC__) && (__BORLANDC__ >= 0x0520)
/* BC++ 4.52 doesn't support explicit, CBuilder 1 does */
#define HAVE_EXPLICIT
#elif defined(__DIGITALMARS__)
#define HAVE_EXPLICIT
#endif
#endif /* !HAVE_EXPLICIT */
@@ -1115,10 +1113,6 @@ typedef wxUint32 wxDword;
#define wxLongLong_t __int64
#define wxLongLongSuffix i64
#define wxLongLongFmtSpec "L"
#elif defined(__DIGITALMARS__)
#define wxLongLong_t __int64
#define wxLongLongSuffix LL
#define wxLongLongFmtSpec "ll"
#elif defined(__MINGW32__)
#define wxLongLong_t long long
#define wxLongLongSuffix ll

5
include/wx/filefn.h
View File

@@ -60,7 +60,7 @@
// constants
// ----------------------------------------------------------------------------
#if defined(__VISUALC__) || defined(__DIGITALMARS__)
#if defined(__VISUALC__)
typedef int mode_t;
#endif
@@ -174,7 +174,6 @@ enum wxPosixPermissions
defined(__MINGW64__) || \
(defined(__MINGW32__) && !defined(__WINE__) && \
wxCHECK_W32API_VERSION(0, 5)) || \
defined(__DMC__) || \
defined(__BORLANDC__) \
)
@@ -251,7 +250,7 @@ enum wxPosixPermissions
// to avoid using them as they're not present in earlier versions and
// always using the native functions spelling is easier than testing for
// the versions
#if defined(__BORLANDC__) || defined(__DMC__) || defined(__MINGW64__)
#if defined(__BORLANDC__) || defined(__MINGW64__)
#define wxPOSIX_IDENT(func) ::func
#else // by default assume MSVC-compatible names
#define wxPOSIX_IDENT(func) _ ## func

2
include/wx/filename.h
View File

@@ -597,10 +597,8 @@ public:
// deprecated methods, don't use any more
// --------------------------------------
#ifndef __DIGITALMARS__
wxString GetPath( bool withSep, wxPathFormat format = wxPATH_NATIVE ) const
{ return GetPath(withSep ? wxPATH_GET_SEPARATOR : 0, format); }
#endif
wxString GetPathWithSep(wxPathFormat format = wxPATH_NATIVE ) const
{ return GetPath(wxPATH_GET_VOLUME | wxPATH_GET_SEPARATOR, format); }

3
include/wx/gtk/setup0.h
View File

@@ -1293,8 +1293,7 @@
// list of libraries used to link your application (although this is done
// implicitly for Microsoft Visual C++ users).
//
// Default is 1 unless the compiler is known to ship without the necessary
// headers (Digital Mars) or the platform doesn't support OpenGL (Windows CE).
// Default is 1.
//
// Recommended setting: 1 if you intend to use OpenGL, can be safely set to 0
// otherwise.

3
include/wx/motif/setup0.h
View File

@@ -1293,8 +1293,7 @@
// list of libraries used to link your application (although this is done
// implicitly for Microsoft Visual C++ users).
//
// Default is 1 unless the compiler is known to ship without the necessary
// headers (Digital Mars) or the platform doesn't support OpenGL (Windows CE).
// Default is 1.
//
// Recommended setting: 1 if you intend to use OpenGL, can be safely set to 0
// otherwise.

13
include/wx/msw/chkconf.h
View File

@@ -234,19 +234,6 @@
#endif /* __BORLANDC__ */
/* DMC++ doesn't have definitions for date picker control, so use generic control
*/
#ifdef __DMC__
# if wxUSE_DATEPICKCTRL
# undef wxUSE_DATEPICKCTRL_GENERIC
# undef wxUSE_DATEPICKCTRL
# endif
# define wxUSE_DATEPICKCTRL 0
# define wxUSE_DATEPICKCTRL_GENERIC 1
#endif
/*
un/redefine the options which we can't compile (after checking that they're
defined

168
include/wx/msw/missing.h
View File

@@ -315,173 +315,7 @@ typedef struct wxtagNMLVCUSTOMDRAW_ {
#endif
/*
* The following are required for BC++ 5.5 (none at present.)
*/
/*
* The following are specifically required for Digital Mars C++
*/
#ifdef __DMC__
#ifndef VER_NT_WORKSTATION
typedef struct _OSVERSIONINFOEX {
DWORD dwOSVersionInfoSize;
DWORD dwMajorVersion;
DWORD dwMinorVersion;
DWORD dwBuildNumber;
DWORD dwPlatformId;
TCHAR szCSDVersion[ 128 ];
WORD wServicePackMajor;
WORD wServicePackMinor;
WORD wSuiteMask;
BYTE wProductType;
BYTE wReserved;
} OSVERSIONINFOEX;
#endif // !defined(VER_NT_WORKSTATION)
#ifndef _TrackMouseEvent
#define _TrackMouseEvent TrackMouseEvent
#endif
#ifndef LVM_SETEXTENDEDLISTVIEWSTYLE
#define LVM_SETEXTENDEDLISTVIEWSTYLE (0x1000 + 54)
#endif
#ifndef LVM_GETSUBITEMRECT
#define LVM_GETSUBITEMRECT (0x1000 + 56)
#endif
#ifndef LVCF_IMAGE
#define LVCF_IMAGE 0x0010
#endif
#ifndef Header_GetItemRect
#define Header_GetItemRect(w,i,r) \
(BOOL)SendMessage((w),HDM_GETITEMRECT,(WPARAM)(i),(LPARAM)(r))
#endif
#ifndef HDM_GETITEMRECT
#define HDM_GETITEMRECT (HDM_FIRST+7)
#endif
#ifndef ListView_GetHeader
#define ListView_GetHeader(w) (HWND)SendMessage((w),LVM_GETHEADER,0,0)
#endif
#ifndef ListView_GetSubItemRect
#define ListView_GetSubItemRect(w, i, s, c, p) (HWND)SendMessage(w,LVM_GETSUBITEMRECT,i, ((p) ? ((((LPRECT)(p))->top = s), (((LPRECT)(p))->left = c), (LPARAM)(p)) : (LPARAM)(LPRECT)NULL))
#endif
#ifndef LVM_GETHEADER
#define LVM_GETHEADER (LVM_FIRST+31)
#endif
#ifndef HDLAYOUT
#define HDLAYOUT HD_LAYOUT
#endif
#ifndef HDITEM
#define HDITEM HD_ITEM
#endif
#ifndef NMHEADER
#define NMHEADER HD_NOTIFY
#endif
#ifndef HDS_DRAGDROP
#define HDS_DRAGDROP 0x0040
#endif
#ifndef HDS_FULLDRAG
#define HDS_FULLDRAG 0x0080
#endif
#ifndef HDN_BEGINDRAG
#define HDN_BEGINDRAG (HDN_FIRST - 11)
#endif
#ifndef HDN_ENDDRAG
#define HDN_ENDDRAG (HDN_FIRST - 10)
#endif
#ifndef LVSICF_NOSCROLL
#define LVSICF_NOINVALIDATEALL 0x0001
#define LVSICF_NOSCROLL 0x0002
#endif
#ifndef CP_SYMBOL
#define CP_SYMBOL 42
#endif
// ----------------------------------------------------------------------------
// wxDisplay
// ----------------------------------------------------------------------------
// The windows headers with Digital Mars lack some typedefs.
// typedef them as my_XXX and then #define to rename to XXX in case
// a newer version of Digital Mars fixes the headers
// (or up to date PSDK is in use with older version)
// also we use any required definition (MONITOR_DEFAULTTONULL) to recognize
// whether whole missing block needs to be included
#ifndef MONITOR_DEFAULTTONULL
#define HMONITOR_DECLARED
DECLARE_HANDLE(HMONITOR);
typedef BOOL(CALLBACK* my_MONITORENUMPROC)(HMONITOR,HDC,LPRECT,LPARAM);
#define MONITORENUMPROC my_MONITORENUMPROC
typedef struct my_tagMONITORINFO {
DWORD cbSize;
RECT rcMonitor;
RECT rcWork;
DWORD dwFlags;
} my_MONITORINFO,*my_LPMONITORINFO;
#define MONITORINFO my_MONITORINFO
#define LPMONITORINFO my_LPMONITORINFO
typedef struct my_MONITORINFOEX : public my_tagMONITORINFO
{
TCHAR szDevice[CCHDEVICENAME];
} my_MONITORINFOEX, *my_LPMONITORINFOEX;
#define MONITORINFOEX my_MONITORINFOEX
#define LPMONITORINFOEX my_LPMONITORINFOEX
#ifndef MONITOR_DEFAULTTONULL
#define MONITOR_DEFAULTTONULL 0
#endif // MONITOR_DEFAULTTONULL
#ifndef MONITORINFOF_PRIMARY
#define MONITORINFOF_PRIMARY 1
#endif // MONITORINFOF_PRIMARY
#ifndef DDENUM_ATTACHEDSECONDARYDEVICES
#define DDENUM_ATTACHEDSECONDARYDEVICES 1
#endif
#endif // MONITOR_DEFAULTTONULL
// ----------------------------------------------------------------------------
// Tree control
// ----------------------------------------------------------------------------
#ifndef TVIS_FOCUSED
#define TVIS_FOCUSED 0x0001
#endif
#ifndef TVS_CHECKBOXES
#define TVS_CHECKBOXES 0x0100
#endif
#ifndef TVITEM
#define TVITEM TV_ITEM
#endif
#endif
// DMC++
/*
* The following are specifically required for MinGW (none at present)
* The following are specifically required for MinGW.
*/
#if defined (__MINGW32__)

1
include/wx/msw/private.h
View File

@@ -178,7 +178,6 @@ extern LONG APIENTRY _EXPORT
#define wxGetOSFHandle(fd) ((HANDLE)get_osfhandle(fd))
#elif defined(__VISUALC__) \
|| defined(__BORLANDC__) \
|| defined(__DMC__) \
|| defined(__MINGW32__)
#define wxGetOSFHandle(fd) ((HANDLE)_get_osfhandle(fd))
#define wxOpenOSFHandle(h, flags) (_open_osfhandle(wxPtrToUInt(h), flags))

3
include/wx/msw/setup0.h
View File

@@ -1293,8 +1293,7 @@
// list of libraries used to link your application (although this is done
// implicitly for Microsoft Visual C++ users).
//
// Default is 1 unless the compiler is known to ship without the necessary
// headers (Digital Mars) or the platform doesn't support OpenGL (Windows CE).
// Default is 1.
//
// Recommended setting: 1 if you intend to use OpenGL, can be safely set to 0
// otherwise.

3
include/wx/msw/wince/setup.h
View File

@@ -1293,8 +1293,7 @@
// list of libraries used to link your application (although this is done
// implicitly for Microsoft Visual C++ users).
//
// Default is 1 unless the compiler is known to ship without the necessary
// headers (Digital Mars) or the platform doesn't support OpenGL (Windows CE).
// Default is 1.
//
// Recommended setting: 1 if you intend to use OpenGL, can be safely set to 0
// otherwise.

3
include/wx/osx/setup0.h
View File

@@ -1294,8 +1294,7 @@
// list of libraries used to link your application (although this is done
// implicitly for Microsoft Visual C++ users).
//
// Default is 1 unless the compiler is known to ship without the necessary
// headers (Digital Mars) or the platform doesn't support OpenGL (Windows CE).
// Default is 1.
//
// Recommended setting: 1 if you intend to use OpenGL, can be safely set to 0
// otherwise.

3
include/wx/platform.h
View File

@@ -571,9 +571,6 @@
#if defined(_MSC_VER) && (_MSC_VER >= 1310)
# undef wxUSE_IOSTREAMH
# define wxUSE_IOSTREAMH 0
#elif defined(__DMC__)
# undef wxUSE_IOSTREAMH
# define wxUSE_IOSTREAMH 1
#elif defined(__MINGW32__)
# undef wxUSE_IOSTREAMH
# define wxUSE_IOSTREAMH 0

3
include/wx/setup_inc.h
View File

@@ -1289,8 +1289,7 @@
// list of libraries used to link your application (although this is done
// implicitly for Microsoft Visual C++ users).
//
// Default is 1 unless the compiler is known to ship without the necessary
// headers (Digital Mars) or the platform doesn't support OpenGL (Windows CE).
// Default is 1.
//
// Recommended setting: 1 if you intend to use OpenGL, can be safely set to 0
// otherwise.

4
include/wx/strconv.h
View File

@@ -16,10 +16,6 @@
#include "wx/chartype.h"
#include "wx/buffer.h"
#ifdef __DIGITALMARS__
#include "typeinfo.h"
#endif
#include <stdlib.h>
class WXDLLIMPEXP_FWD_BASE wxString;

3
include/wx/univ/setup0.h
View File

@@ -1292,8 +1292,7 @@
// list of libraries used to link your application (although this is done
// implicitly for Microsoft Visual C++ users).
//
// Default is 1 unless the compiler is known to ship without the necessary
// headers (Digital Mars) or the platform doesn't support OpenGL (Windows CE).
// Default is 1.
//
// Recommended setting: 1 if you intend to use OpenGL, can be safely set to 0
// otherwise.

4
include/wx/wxcrt.h
View File

@@ -16,8 +16,8 @@
#include "wx/string.h"
#ifndef __WX_SETUP_H__
// For non-configure builds assume vsscanf is available, if not Visual C or DMC
#if !defined (__VISUALC__) && !defined (__DMC__)
// For non-configure builds assume vsscanf is available, if not Visual C
#if !defined (__VISUALC__)
#define HAVE_VSSCANF 1
#endif
#endif

6
include/wx/wxprec.h
View File

@@ -13,11 +13,7 @@
// check if to use precompiled headers: do it for most Windows compilers unless
// explicitly disabled by defining NOPCH
#if defined(__VISUALC__) || \
defined(__DMC__) || \
defined(__BORLANDC__)
#if defined(__VISUALC__) || defined(__BORLANDC__)
// If user did not request NOCPH and we're not building using configure
// then assume user wants precompiled headers.
#if !defined(NOPCH) && !defined(__WX_SETUP_H__)