Remove support for Digital Mars compiler.

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

build/bakefiles/Bakefiles.bkgen

@@ -3,22 +3,9 @@
 <bakefile-gen xmlns="http://www.bakefile.org/schema/bakefile-gen">
 
     <!--
-    Formats listed here are not generated by default. To enable them, either
+    The formats below are disabled because wxWidgets doesn't support these
-    remove them from the <disable-formats> directive below or create
+    compilers any longer (although bakefile still does).
-    Bakefiles.local.bkgen file in this directory and add <enable-formats>
-    into it:
-         <?xml version="1.0" ?>
-         <bakefile-gen xmlns="http://www.bakefile.org/schema/bakefile-gen">
-             <enable-formats>dmars</enable-formats>
-         </bakefile-gen>
-
-    Reasons why these formats are disabled (and so not in CVS):
-
-    dmars, dmars_smake, msevc4prj - These are generated at release time and
-                we don't want to clutter the source tree with these files.
-    msvc6prj,watcom - wxWidgets doesn't build with these compilers any longer.
     -->
-
     <disable-formats>dmars,dmars_smake,msevc4prj,msvc6prj,watcom</disable-formats>
 
 

build/bakefiles/wxpresets/bakefile_quickstart.txt

@@ -111,11 +111,8 @@ would like to build, separated by commas. Valid values are:
 
     autoconf      GNU autoconf Makefile.in files
     borland       Borland C/C++ makefiles
-    dmars         Digital Mars makefiles
-    dmars_smake   Digital Mars makefiles for SMAKE
     gnu           GNU toolchain makefiles (Unix)
     mingw         MinGW makefiles (mingw32-make)
-    msevc4prj     MS eMbedded Visual C++ 4 project files
     msvc          MS Visual C++ nmake makefiles
 
 TIP: autoconf Project Type

build/bakefiles/wxpresets/presets/wx.bkl

@@ -159,13 +159,6 @@
     <!--    comments for more info.                                 -->
 
 
-    <!-- Presets for limited dmars make.exe format: -->
-    <if cond="FORMAT=='dmars'">
-        <set var="WX_UNICODE">1</set>
-        <set var="WX_DEBUG">1</set>
-        <set var="WX_SHARED">0</set>
-    </if>
-
     <!-- 'gnu' format needs to redefine the following options later in wx_unix.bkl -->
     <if cond="FORMAT=='gnu'">
         <set var="WX_UNICODE"/>

build/script/rebuild-makefiles.sh

@@ -57,7 +57,6 @@ package_makefiles()
     do_package zip gnu       makefile.unx 
     do_package tar gnu       makefile.unx 
     do_package zip mingw     makefile.gcc config.gcc
-    do_package zip dmars     makefile.dmc config.dmc makefile.dms config.dms
     do_package zip msvc      makefile.vc config.vc
     do_package zip msvc6prj  '*.dsp' '*.dsw'
     do_package zip msvc7-8prj  '*.vcproj' '*.sln'    

distrib/scripts/Bakefiles.release.bkgen

@@ -1,7 +0,0 @@
-<?xml version="1.0" ?>
-<bakefile-gen>
-  <include file="../../build/bakefiles/Bakefiles.bkgen"/>
-  <!-- add extra formats to release -->
-  <enable-formats>gnu,dmars,dmars_smake,msevc4prj</enable-formats>
-</bakefile-gen>
-

distrib/scripts/pre-flight.sh

@@ -49,7 +49,7 @@ if [ $rebake = "yes" ]; then
   ## better to not use unix2dos on the wxWidgets tree so we don't get the conflicts
   ##fix this -B gave an option not recognised  error (sf bug 1537221)...
   rm .ba*
-  bakefile_gen -d ../../distrib/scripts/Bakefiles.release.bkgen
+  bakefile_gen
 fi
 
 # Now generate the mega tarball with everything. We will push this to our build machines.

docs/doxygen/mainpages/const_cpp.h

@@ -146,7 +146,7 @@ compiler used.
 @itemdef{__BORLANDC__, Borland C++. The value of the macro corresponds
                         to the compiler version: 500 is 5.0.}
 @itemdef{__DJGPP__, DJGPP}
-@itemdef{__DIGITALMARS__, Digital Mars}
+@itemdef{__DIGITALMARS__, Digital Mars (not used any more).}
 @itemdef{__EVC4__, Embedded Visual C++ 4 (can be only used for building wxWinCE)}
 @itemdef{__GNUG__, Gnu C++ on any platform, see also wxCHECK_GCC_VERSION}
 @itemdef{__GNUWIN32__, Gnu-Win32 compiler, see also wxCHECK_W32API_VERSION}
@@ -156,7 +156,7 @@ compiler used.
 @itemdef{__MINGW64__, MinGW-w64 in 64 bit builds}
 @itemdef{__MINGW64_TOOLCHAIN__, MinGW-w64 in either 32 or 64 bit builds}
 @itemdef{__SUNCC__, Sun CC, see also wxCHECK_SUNCC_VERSION}
-@itemdef{__SYMANTECC__, Symantec C++}
+@itemdef{__SYMANTECC__, Symantec C++ (not used any more).}
 @itemdef{__VISAGECPP__, IBM Visual Age (OS/2) (not used any more).}
 @itemdef{__VISUALC__, Microsoft Visual C++, see also ::wxCHECK_VISUALC_VERSION.
                     The value of this macro corresponds to the compiler version:

docs/doxygen/mainpages/devtips.h

@@ -44,10 +44,9 @@ The file @c "wx/wxprec.h" includes @c "wx/wx.h". Although this incantation may
 seem quirky, it is in fact the end result of a lot of experimentation, and
 several Windows compilers to use precompilation which is largely automatic for
 compilers with necessary support. Currently it is used for Visual C++
-(including embedded Visual C++), Borland C++, Digital Mars C++
+(including embedded Visual C++), Borland C++ and newer versions of GCC. Some
-and newer versions of GCC. Some compilers might need extra work from the
+compilers might need extra work from the application developer to set the build
-application developer to set the build environment up as necessary for the
+environment up as necessary for the support.
-support.
 
 
 

include/wx/android/setup.h

@@ -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
+// Default is 1.
-// headers (Digital Mars) or the platform doesn't support OpenGL (Windows CE).
 //
 // Recommended setting: 1 if you intend to use OpenGL, can be safely set to 0
 // otherwise.

include/wx/build.h

@@ -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

include/wx/chartype.h

@@ -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>

include/wx/compiler.h

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

include/wx/confbase.h

@@ -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(__HP_aCC) && defined(__hppa))
-    !defined (__DMC__)
     #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)

include/wx/cpp.h

@@ -101,14 +101,7 @@
     NULL for the compilers which don't support the latter.
  */
 #ifndef __WXFUNCTION__
-    /* TODO: add more compilers supporting __FUNCTION__ */
+    #if defined(__GNUC__) || \
-    #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__) || \
           defined(__VISUALC__) || \
           defined(__FUNCTION__)
         #define __WXFUNCTION__ __FUNCTION__

include/wx/defs.h

@@ -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

include/wx/filefn.h

@@ -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

include/wx/filename.h

@@ -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); }
 

include/wx/gtk/setup0.h

@@ -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
+// Default is 1.
-// headers (Digital Mars) or the platform doesn't support OpenGL (Windows CE).
 //
 // Recommended setting: 1 if you intend to use OpenGL, can be safely set to 0
 // otherwise.

include/wx/motif/setup0.h

@@ -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
+// Default is 1.
-// headers (Digital Mars) or the platform doesn't support OpenGL (Windows CE).
 //
 // Recommended setting: 1 if you intend to use OpenGL, can be safely set to 0
 // otherwise.

include/wx/msw/chkconf.h

@@ -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

include/wx/msw/missing.h

@@ -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 MinGW.
-  */
-
- /*
-  * 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)
   */
 
 #if defined (__MINGW32__)

include/wx/msw/private.h

@@ -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))

include/wx/msw/setup0.h

@@ -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
+// Default is 1.
-// headers (Digital Mars) or the platform doesn't support OpenGL (Windows CE).
 //
 // Recommended setting: 1 if you intend to use OpenGL, can be safely set to 0
 // otherwise.

include/wx/msw/wince/setup.h

@@ -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
+// Default is 1.
-// headers (Digital Mars) or the platform doesn't support OpenGL (Windows CE).
 //
 // Recommended setting: 1 if you intend to use OpenGL, can be safely set to 0
 // otherwise.

include/wx/osx/setup0.h

@@ -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
+// Default is 1.
-// headers (Digital Mars) or the platform doesn't support OpenGL (Windows CE).
 //
 // Recommended setting: 1 if you intend to use OpenGL, can be safely set to 0
 // otherwise.

include/wx/platform.h

@@ -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

include/wx/setup_inc.h

@@ -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
+// Default is 1.
-// headers (Digital Mars) or the platform doesn't support OpenGL (Windows CE).
 //
 // Recommended setting: 1 if you intend to use OpenGL, can be safely set to 0
 // otherwise.

include/wx/strconv.h

@@ -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;

include/wx/univ/setup0.h

@@ -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
+// Default is 1.
-// headers (Digital Mars) or the platform doesn't support OpenGL (Windows CE).
 //
 // Recommended setting: 1 if you intend to use OpenGL, can be safely set to 0
 // otherwise.

include/wx/wxcrt.h

@@ -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
+// For non-configure builds assume vsscanf is available, if not Visual C
-#if !defined (__VISUALC__) && !defined (__DMC__)
+#if !defined (__VISUALC__)
     #define HAVE_VSSCANF 1
 #endif
 #endif

include/wx/wxprec.h

@@ -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__)   || \
+#if defined(__VISUALC__) || defined(__BORLANDC__)
-    defined(__DMC__)       || \
-    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__)

src/common/appbase.cpp

@@ -660,11 +660,6 @@ void wxAppConsoleBase::OnUnhandledException()
 bool wxAppConsoleBase::OnExceptionInMainLoop()
 {
     throw;
-
-    // some compilers are too stupid to know that we never return after throw
-#if defined(__DMC__) || (defined(_MSC_VER) && _MSC_VER < 1200)
-    return false;
-#endif
 }
 
 #endif // wxUSE_EXCEPTIONS

src/common/datetimefmt.cpp

@@ -2095,8 +2095,7 @@ wxDateTime::ParseTime(const wxString& time, wxString::const_iterator *end)
         const wxString timeString = wxGetTranslation(stdTimes[n].name);
         if ( timeString.CmpNoCase(wxString(time, timeString.length())) == 0 )
         {
-            // casts required by DigitalMars
+            Set(stdTimes[n].hour, 0, 0);
-            Set(stdTimes[n].hour, wxDateTime_t(0), wxDateTime_t(0));
 
             if ( end )
                 *end = time.begin() + timeString.length();

src/common/filefn.cpp

@@ -1148,7 +1148,6 @@ bool wxRemoveFile(const wxString& file)
 {
 #if defined(__VISUALC__) \
  || defined(__BORLANDC__) \
- || defined(__DMC__) \
  || defined(__GNUWIN32__)
     int res = wxRemove(file);
 #elif defined(__WXMAC__)

src/common/ftp.cpp

@@ -468,7 +468,7 @@ wxString wxFTP::Pwd()
         }
         else
         {
-            for ( ++p; (bool)*p; ++p ) // FIXME-DMARS
+            for ( ++p; *p; ++p )
             {
                 if ( *p == wxT('"') )
                 {

src/common/imagtiff.cpp

@@ -37,9 +37,6 @@
 
 extern "C"
 {
-#ifdef __DMC__
-    #include "tif_config.h"
-#endif
     #include "tiff.h"
     #include "tiffio.h"
 }

src/common/regex.cpp

@@ -35,11 +35,8 @@
     #include "wx/crt.h"
 #endif //WX_PRECOMP
 
-// FreeBSD and DMars require this, CW doesn't have nor need it.
+// At least FreeBSD requires this.
-// Others also don't seem to need it. If you have an error related to
+#if defined(__UNIX__)
-// (not) including <sys/types.h> please report details to
-// wx-dev@lists.wxwindows.org
-#if defined(__UNIX__) || defined(__DIGITALMARS__)
 #   include <sys/types.h>
 #endif
 

src/common/wxcrt.cpp

@@ -192,19 +192,6 @@ char* wxSetlocale(int category, const char *locale)
     int wxCRT_VfprintfW( FILE *stream, const wchar_t *format, va_list argptr );
 #endif
 
-#if defined(__DMC__)
-/* Digital Mars adds count to _stprintf (C99) so convert */
-int wxCRT_SprintfW (wchar_t * __RESTRICT s, const wchar_t * __RESTRICT format, ... )
-{
-    va_list arglist;
-
-    va_start( arglist, format );
-    int iLen = swprintf ( s, -1, format, arglist );
-    va_end( arglist );
-    return iLen ;
-}
-#endif //__DMC__
-
 // ----------------------------------------------------------------------------
 // implement the standard IO functions for wide char if libc doesn't have them
 // ----------------------------------------------------------------------------
@@ -648,20 +635,7 @@ int wxVsprintf(char *str, const wxString& format, va_list argptr)
 int wxVsprintf(wchar_t *str, const wxString& format, va_list argptr)
 {
 #if wxUSE_UNICODE_WCHAR
-#ifdef __DMC__
-/*
-This fails with a bug similar to
-http://www.digitalmars.com/pnews/read.php?server=news.digitalmars.com&group=c++.beta&artnum=680
-in DMC 8.49 and 8.50
-I don't see it being used in the wxWidgets sources at present (oct 2007) CE
-*/
-#pragma message ( "warning ::::: wxVsprintf(wchar_t *str, const wxString& format, va_list argptr) not yet implemented" )
-    wxFAIL_MSG( wxT("TODO") );
-
-    return -1;
-#else
     return wxCRT_VsprintfW(str, format.wc_str(), argptr);
-#endif //DMC
 #else // wxUSE_UNICODE_UTF8
     #if !wxUSE_UTF8_LOCALE_ONLY
     if ( !wxLocaleIsUtf8 )
@@ -1276,7 +1250,7 @@ wchar_t *wxFgets(wchar_t *s, int size, FILE *stream)
 // wxScanf() and friends
 // ----------------------------------------------------------------------------
 
-#ifdef HAVE_VSSCANF // __VISUALC__ and __DMC__ see wx/crt.h
+#ifdef HAVE_VSSCANF // __VISUALC__, see wx/crt.h
 int wxVsscanf(const char *str, const char *format, va_list ap)
     { return wxCRT_VsscanfA(str, format, ap); }
 int wxVsscanf(const wchar_t *str, const wchar_t *format, va_list ap)

src/msw/listctrl.cpp

@@ -57,7 +57,7 @@
 //
 #if defined(__VISUALC__) || defined(__BORLANDC__) || defined(NMLVFINDITEM)
     #define HAVE_NMLVFINDITEM 1
-#elif defined(__DMC__) || defined(NM_FINDITEM)
+#elif defined(NM_FINDITEM)
     #define HAVE_NMLVFINDITEM 1
     #define NMLVFINDITEM NM_FINDITEM
 #endif

src/msw/menu.cpp

@@ -411,8 +411,7 @@ bool wxMenu::MSWGetRadioGroupRange(int pos, int *start, int *end) const
     return m_radioData && m_radioData->GetGroupRange(pos, start, end);
 }
 
-// DMC at march 2007 didn't have e.g. MENUITEMINFO. Is it still valid?
+#if defined(__WXWINCE__)
-#if defined(__DMC__) || defined(__WXWINCE__)
 #define wxUSE_MENUITEMINFO 0
 #else
 #define wxUSE_MENUITEMINFO 1

src/msw/stdpaths.cpp

@@ -302,8 +302,6 @@ void wxStandardPaths::IgnoreAppBuildSubDirs()
     compilerPrefix = "gcc";
 #elif defined(__BORLANDC__)
     compilerPrefix = "bcc";
-#elif defined(__DIGITALMARS__)
-    compilerPrefix = "dmc";
 #else
     return;
 #endif

src/msw/toolbar.cpp

@@ -1488,8 +1488,7 @@ wxSize wxToolBar::GetToolSize() const
 {
     // TB_GETBUTTONSIZE is supported from version 4.70
 #if defined(_WIN32_IE) && (_WIN32_IE >= 0x300 ) \
-    && !( defined(__GNUWIN32__) && !wxCHECK_W32API_VERSION( 1, 0 ) ) \
+    && !( defined(__GNUWIN32__) && !wxCHECK_W32API_VERSION( 1, 0 ) )
-    && !defined (__DIGITALMARS__)
     if ( wxApp::GetComCtl32Version() >= 470 )
     {
         DWORD dw = ::SendMessage(GetHwnd(), TB_GETBUTTONSIZE, 0, 0);

src/richtext/richtextformatdlg.cpp

@@ -65,10 +65,7 @@
 #include "richtextsizepage.cpp"
 #include "richtextborderspage.cpp"
 #include "richtextbackgroundpage.cpp"
-// Digital Mars can't cope with this much code
+#include "richtextliststylepage.cpp"
-#ifndef __DMC__
-  #include "richtextliststylepage.cpp"
-#endif
 #include "richtextstylepage.cpp"
 #endif
 
@@ -363,14 +360,12 @@ wxPanel* wxRichTextFormattingDialogFactory::CreatePage(int page, wxString& title
         title = _("Bullets");
         return page;
     }
-#ifndef __DMC__
     else if (page == wxRICHTEXT_FORMAT_LIST_STYLE)
     {
         wxRichTextListStylePage* page = new wxRichTextListStylePage(dialog->GetBookCtrl(), wxID_ANY);
         title = _("List Style");
         return page;
     }
-#endif
     else if (page == wxRICHTEXT_FORMAT_SIZE)
     {
         wxRichTextSizePage* page = new wxRichTextSizePage(dialog->GetBookCtrl(), wxID_ANY);
@@ -424,11 +419,7 @@ int wxRichTextFormattingDialogFactory::GetPageId(int i) const
 /// Get the number of available page identifiers
 int wxRichTextFormattingDialogFactory::GetPageIdCount() const
 {
-#ifdef __DMC__
-    return 9;
-#else
     return 10;
-#endif
 }
 
 /// Set the sheet style, called at the start of wxRichTextFormattingDialog::Create

src/tiff/libtiff/tif_config.h

@@ -382,11 +382,6 @@
    #define lfind _lfind
 #endif
 
-#ifdef __DMC__
-#define HAVE_INT32
-typedef	long int32;
-#endif
-
 #ifdef _WIN32_WCE
 #   undef HAVE_FCNTL_H
 #   undef HAVE_SYS_TYPES_H

tests/archive/archivetest.cpp

@@ -41,9 +41,6 @@ using std::auto_ptr;
 #if defined __BORLANDC__ && __BORLANDC__ >= 0x530
 #   define WXARC_MEMBER_TEMPLATES
 #endif
-#if defined __DMC__ && __DMC__ >= 0x832
-#   define WXARC_MEMBER_TEMPLATES
-#endif
 #if defined __HP_aCC && __HP_aCC > 33300
 #   define WXARC_MEMBER_TEMPLATES
 #endif