diff --git a/build/bakefiles/Bakefiles.bkgen b/build/bakefiles/Bakefiles.bkgen index 9b9ec17da5..fe4ccf8e00 100644 --- a/build/bakefiles/Bakefiles.bkgen +++ b/build/bakefiles/Bakefiles.bkgen @@ -3,22 +3,9 @@ - dmars,dmars_smake,msevc4prj,msvc6prj,watcom diff --git a/build/bakefiles/wxpresets/bakefile_quickstart.txt b/build/bakefiles/wxpresets/bakefile_quickstart.txt index 62b3d59217..fd6a6bff89 100644 --- a/build/bakefiles/wxpresets/bakefile_quickstart.txt +++ b/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 diff --git a/build/bakefiles/wxpresets/presets/wx.bkl b/build/bakefiles/wxpresets/presets/wx.bkl index 447e13897e..529212d65c 100644 --- a/build/bakefiles/wxpresets/presets/wx.bkl +++ b/build/bakefiles/wxpresets/presets/wx.bkl @@ -159,13 +159,6 @@ - - - 1 - 1 - 0 - - diff --git a/build/script/rebuild-makefiles.sh b/build/script/rebuild-makefiles.sh index 6d81e08e04..f484eaa8b9 100755 --- a/build/script/rebuild-makefiles.sh +++ b/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' diff --git a/distrib/scripts/Bakefiles.release.bkgen b/distrib/scripts/Bakefiles.release.bkgen deleted file mode 100644 index 9075b0c270..0000000000 --- a/distrib/scripts/Bakefiles.release.bkgen +++ /dev/null @@ -1,7 +0,0 @@ - - - - - gnu,dmars,dmars_smake,msevc4prj - - diff --git a/distrib/scripts/pre-flight.sh b/distrib/scripts/pre-flight.sh index 2d1145ebef..409953c432 100755 --- a/distrib/scripts/pre-flight.sh +++ b/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. diff --git a/docs/doxygen/mainpages/const_cpp.h b/docs/doxygen/mainpages/const_cpp.h index 07698eef2f..3c815edadd 100644 --- a/docs/doxygen/mainpages/const_cpp.h +++ b/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: diff --git a/docs/doxygen/mainpages/devtips.h b/docs/doxygen/mainpages/devtips.h index a20a731304..5e3871677d 100644 --- a/docs/doxygen/mainpages/devtips.h +++ b/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++ -and newer versions of GCC. Some compilers might need extra work from the -application developer to set the build environment up as necessary for the -support. +(including embedded Visual C++), Borland C++ and newer versions of GCC. Some +compilers might need extra work from the application developer to set the build +environment up as necessary for the support. diff --git a/include/wx/android/setup.h b/include/wx/android/setup.h index bc8334a293..2da90823d4 100644 --- a/include/wx/android/setup.h +++ b/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 -// 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. diff --git a/include/wx/build.h b/include/wx/build.h index d735c6c3cc..e2d3cea759 100644 --- a/include/wx/build.h +++ b/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 diff --git a/include/wx/chartype.h b/include/wx/chartype.h index 8382a98acd..6126320f82 100644 --- a/include/wx/chartype.h +++ b/include/wx/chartype.h @@ -91,8 +91,6 @@ #elif defined(__BORLANDC__) && (__BORLANDC__ >= 0x520) #define wxHAVE_TCHAR_SUPPORT #include -#elif defined(__DMC__) - #define wxHAVE_TCHAR_SUPPORT #elif defined(__MINGW32__) && wxCHECK_W32API_VERSION( 1, 0 ) #define wxHAVE_TCHAR_SUPPORT #include diff --git a/include/wx/compiler.h b/include/wx/compiler.h index 8122a57f79..655c3be740 100644 --- a/include/wx/compiler.h +++ b/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 */ /* diff --git a/include/wx/confbase.h b/include/wx/confbase.h index 5d07e864bb..da71e5a924 100644 --- a/include/wx/confbase.h +++ b/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 (__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 bool Write(const wxString& key, T const& value) diff --git a/include/wx/cpp.h b/include/wx/cpp.h index 1b645cfc14..1a786b71a8 100644 --- a/include/wx/cpp.h +++ b/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(__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__ diff --git a/include/wx/defs.h b/include/wx/defs.h index 8c6229bfec..4283960b07 100644 --- a/include/wx/defs.h +++ b/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 diff --git a/include/wx/filefn.h b/include/wx/filefn.h index 794df8078b..5c3ec059b6 100644 --- a/include/wx/filefn.h +++ b/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 diff --git a/include/wx/filename.h b/include/wx/filename.h index cd4fe420e5..78499efb76 100644 --- a/include/wx/filename.h +++ b/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); } diff --git a/include/wx/gtk/setup0.h b/include/wx/gtk/setup0.h index d30a27a08b..d79a5f83f5 100644 --- a/include/wx/gtk/setup0.h +++ b/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 -// 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. diff --git a/include/wx/motif/setup0.h b/include/wx/motif/setup0.h index 1073e1f83d..8663b44ef0 100644 --- a/include/wx/motif/setup0.h +++ b/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 -// 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. diff --git a/include/wx/msw/chkconf.h b/include/wx/msw/chkconf.h index 21e3a8e3c9..67da7d51cc 100644 --- a/include/wx/msw/chkconf.h +++ b/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 diff --git a/include/wx/msw/missing.h b/include/wx/msw/missing.h index b7d736a218..6e6d1a6707 100644 --- a/include/wx/msw/missing.h +++ b/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 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__) diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h index 3d26353d13..8467bb06a7 100644 --- a/include/wx/msw/private.h +++ b/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)) diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h index bd90acf15d..890cce534e 100644 --- a/include/wx/msw/setup0.h +++ b/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 -// 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. diff --git a/include/wx/msw/wince/setup.h b/include/wx/msw/wince/setup.h index 6c52b7ffc0..3466e299c2 100644 --- a/include/wx/msw/wince/setup.h +++ b/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 -// 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. diff --git a/include/wx/osx/setup0.h b/include/wx/osx/setup0.h index e3ca23528f..8c8486ee43 100644 --- a/include/wx/osx/setup0.h +++ b/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 -// 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. diff --git a/include/wx/platform.h b/include/wx/platform.h index 8762a9b220..2f264ad303 100644 --- a/include/wx/platform.h +++ b/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 diff --git a/include/wx/setup_inc.h b/include/wx/setup_inc.h index 3d6bc74d3f..5056f57992 100644 --- a/include/wx/setup_inc.h +++ b/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 -// 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. diff --git a/include/wx/strconv.h b/include/wx/strconv.h index 2a3c82b2e9..c9cd3ffb22 100644 --- a/include/wx/strconv.h +++ b/include/wx/strconv.h @@ -16,10 +16,6 @@ #include "wx/chartype.h" #include "wx/buffer.h" -#ifdef __DIGITALMARS__ -#include "typeinfo.h" -#endif - #include class WXDLLIMPEXP_FWD_BASE wxString; diff --git a/include/wx/univ/setup0.h b/include/wx/univ/setup0.h index 7aa61f5c00..1c3d976fa1 100644 --- a/include/wx/univ/setup0.h +++ b/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 -// 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. diff --git a/include/wx/wxcrt.h b/include/wx/wxcrt.h index d0148531cf..b8f8d65a47 100644 --- a/include/wx/wxcrt.h +++ b/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 -#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 diff --git a/include/wx/wxprec.h b/include/wx/wxprec.h index 9f60476e8c..e1fc0459cf 100644 --- a/include/wx/wxprec.h +++ b/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__) || \ - 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__) diff --git a/src/common/appbase.cpp b/src/common/appbase.cpp index 87e64bb320..7298740648 100644 --- a/src/common/appbase.cpp +++ b/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 diff --git a/src/common/datetimefmt.cpp b/src/common/datetimefmt.cpp index 6427df5aec..2e0638904b 100644 --- a/src/common/datetimefmt.cpp +++ b/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, wxDateTime_t(0), wxDateTime_t(0)); + Set(stdTimes[n].hour, 0, 0); if ( end ) *end = time.begin() + timeString.length(); diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp index 56b647dbd9..eb8b0024e5 100644 --- a/src/common/filefn.cpp +++ b/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__) diff --git a/src/common/ftp.cpp b/src/common/ftp.cpp index 0861710b25..0973522a46 100644 --- a/src/common/ftp.cpp +++ b/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('"') ) { diff --git a/src/common/imagtiff.cpp b/src/common/imagtiff.cpp index 876a989e61..e74c184a79 100644 --- a/src/common/imagtiff.cpp +++ b/src/common/imagtiff.cpp @@ -37,9 +37,6 @@ extern "C" { -#ifdef __DMC__ - #include "tif_config.h" -#endif #include "tiff.h" #include "tiffio.h" } diff --git a/src/common/regex.cpp b/src/common/regex.cpp index e76465c0a4..17f7cfccc3 100644 --- a/src/common/regex.cpp +++ b/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. -// Others also don't seem to need it. If you have an error related to -// (not) including please report details to -// wx-dev@lists.wxwindows.org -#if defined(__UNIX__) || defined(__DIGITALMARS__) +// At least FreeBSD requires this. +#if defined(__UNIX__) # include #endif diff --git a/src/common/wxcrt.cpp b/src/common/wxcrt.cpp index f02b62582b..791905f287 100644 --- a/src/common/wxcrt.cpp +++ b/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) diff --git a/src/msw/listctrl.cpp b/src/msw/listctrl.cpp index 28b39cfabf..f2cb4e3b38 100644 --- a/src/msw/listctrl.cpp +++ b/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 diff --git a/src/msw/menu.cpp b/src/msw/menu.cpp index 3101620146..0fab710424 100644 --- a/src/msw/menu.cpp +++ b/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(__DMC__) || defined(__WXWINCE__) +#if defined(__WXWINCE__) #define wxUSE_MENUITEMINFO 0 #else #define wxUSE_MENUITEMINFO 1 diff --git a/src/msw/stdpaths.cpp b/src/msw/stdpaths.cpp index 997c8d6aad..b79d87f940 100644 --- a/src/msw/stdpaths.cpp +++ b/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 diff --git a/src/msw/toolbar.cpp b/src/msw/toolbar.cpp index 77cfa12726..71ec043e76 100644 --- a/src/msw/toolbar.cpp +++ b/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 (__DIGITALMARS__) + && !( defined(__GNUWIN32__) && !wxCHECK_W32API_VERSION( 1, 0 ) ) if ( wxApp::GetComCtl32Version() >= 470 ) { DWORD dw = ::SendMessage(GetHwnd(), TB_GETBUTTONSIZE, 0, 0); diff --git a/src/richtext/richtextformatdlg.cpp b/src/richtext/richtextformatdlg.cpp index eb168122ad..4aa190aa48 100644 --- a/src/richtext/richtextformatdlg.cpp +++ b/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 -#ifndef __DMC__ - #include "richtextliststylepage.cpp" -#endif +#include "richtextliststylepage.cpp" #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 diff --git a/src/tiff/libtiff/tif_config.h b/src/tiff/libtiff/tif_config.h index 6e4ecfee31..775a34b5f2 100644 --- a/src/tiff/libtiff/tif_config.h +++ b/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 diff --git a/tests/archive/archivetest.cpp b/tests/archive/archivetest.cpp index bbbd919943..b7801275ef 100644 --- a/tests/archive/archivetest.cpp +++ b/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