From 87baba95b859c35046e72aa365a06d0b6ce2bc1d Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 23 Sep 2015 00:54:20 +0200 Subject: [PATCH] Remove last traces of Symantec compiler support Delete a couple of leftover __SYMANTEC__ checks. --- include/wx/filefn.h | 2 -- include/wx/wxcrtbase.h | 2 +- src/msw/dc.cpp | 5 ----- 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/include/wx/filefn.h b/include/wx/filefn.h index 57d4c25b29..eb2a693d6c 100644 --- a/include/wx/filefn.h +++ b/include/wx/filefn.h @@ -64,8 +64,6 @@ #if defined(__VISUALC__) typedef _off_t off_t; -#elif defined(__SYMANTEC__) - typedef long off_t; #endif enum wxSeekMode diff --git a/include/wx/wxcrtbase.h b/include/wx/wxcrtbase.h index 910d48928a..72e777f4f7 100644 --- a/include/wx/wxcrtbase.h +++ b/include/wx/wxcrtbase.h @@ -231,7 +231,7 @@ extern unsigned long android_wcstoul(const wchar_t *nptr, wchar_t **endptr, int #if defined(__BORLANDC__) || defined(__DJGPP__) #define wxCRT_StricmpA stricmp #define wxCRT_StrnicmpA strnicmp -#elif defined(__SYMANTEC__) || defined(__VISUALC__) +#elif defined(__VISUALC__) #define wxCRT_StricmpA _stricmp #define wxCRT_StrnicmpA _strnicmp #elif defined(__UNIX__) || (defined(__GNUWIN32__) && !defined(__WX_STRICT_ANSI_GCC__)) diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp index 73e8226c36..648b2dba99 100644 --- a/src/msw/dc.cpp +++ b/src/msw/dc.cpp @@ -812,10 +812,6 @@ void wxMSWDCImpl::DoDrawArc(wxCoord x1, wxCoord y1, void wxMSWDCImpl::DoDrawCheckMark(wxCoord x1, wxCoord y1, wxCoord width, wxCoord height) { - // cases when we don't have DrawFrameControl() -#if defined(__SYMANTEC__) - return wxDCBase::DoDrawCheckMark(x1, y1, width, height); -#else // normal case wxCoord x2 = x1 + width, y2 = y1 + height; @@ -829,7 +825,6 @@ void wxMSWDCImpl::DoDrawCheckMark(wxCoord x1, wxCoord y1, CalcBoundingBox(x1, y1); CalcBoundingBox(x2, y2); -#endif // Normal } void wxMSWDCImpl::DoDrawPoint(wxCoord x, wxCoord y)