From f172cb8200f08ba1c6735a0d507991c877c0d68f Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 31 Dec 2007 10:05:00 +0000 Subject: [PATCH] removed support for Salford compiler (which was almost certainly broken anyhow) (patch 1861133) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50960 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- distrib/msw/msw_minimal.rsp | 4 - distrib/scripts/manifests/msw_minimal.rsp | 4 - include/wx/defs.h | 9 -- include/wx/dirdlg.h | 3 +- include/wx/filefn.h | 7 +- include/wx/list.h | 4 - include/wx/string.h | 2 - include/wx/wxcrtbase.h | 2 +- samples/calendar/makefile.sl | 14 -- samples/dragimag/makefile.sl | 14 -- samples/erase/makefile.sl | 18 --- samples/event/makefile.sl | 14 -- samples/exec/makefile.sl | 14 -- samples/grid/makefile.sl | 14 -- samples/joytest/makefile.sl | 14 -- samples/mdi/makefile.sl | 18 --- samples/minimal/makefile.sl | 18 --- samples/notebook/makefile.sl | 14 -- samples/sashtest/makefile.sl | 14 -- samples/shaped/makefile.sl | 14 -- samples/splitter/makefile.sl | 14 -- samples/statbar/makefile.sl | 14 -- samples/thread/makefile.sl | 14 -- samples/toolbar/makefile.sl | 14 -- samples/typetest/makefile.sl | 14 -- samples/wizard/makefile.sl | 14 -- src/common/file.cpp | 64 ++++----- src/common/imagbmp.cpp | 6 - src/common/imagjpeg.cpp | 4 - src/common/imagpng.cpp | 8 +- src/common/memory.cpp | 2 +- src/common/sckaddr.cpp | 2 +- src/common/strconv.cpp | 4 - src/common/string.cpp | 4 - src/common/stringimpl.cpp | 4 - src/common/valtext.cpp | 4 - src/msw/app.cpp | 2 +- src/msw/dib.cpp | 2 +- src/msw/printwin.cpp | 2 +- src/msw/salford.lnk | 152 ---------------------- src/msw/utils.cpp | 2 +- src/msw/utilsexc.cpp | 2 +- src/msw/wince/tbarwce.cpp | 2 +- 43 files changed, 37 insertions(+), 528 deletions(-) delete mode 100644 samples/calendar/makefile.sl delete mode 100644 samples/dragimag/makefile.sl delete mode 100644 samples/erase/makefile.sl delete mode 100644 samples/event/makefile.sl delete mode 100644 samples/exec/makefile.sl delete mode 100644 samples/grid/makefile.sl delete mode 100644 samples/joytest/makefile.sl delete mode 100644 samples/mdi/makefile.sl delete mode 100644 samples/minimal/makefile.sl delete mode 100644 samples/notebook/makefile.sl delete mode 100644 samples/sashtest/makefile.sl delete mode 100644 samples/shaped/makefile.sl delete mode 100644 samples/splitter/makefile.sl delete mode 100644 samples/statbar/makefile.sl delete mode 100644 samples/thread/makefile.sl delete mode 100644 samples/toolbar/makefile.sl delete mode 100644 samples/typetest/makefile.sl delete mode 100644 samples/wizard/makefile.sl delete mode 100644 src/msw/salford.lnk diff --git a/distrib/msw/msw_minimal.rsp b/distrib/msw/msw_minimal.rsp index 7ec7be5b2f..23b6e6d51a 100644 --- a/distrib/msw/msw_minimal.rsp +++ b/distrib/msw/msw_minimal.rsp @@ -195,10 +195,6 @@ src/makelib.vc src/makeg95.env src/makeprog.g95 src/makelib.g95 -src/makesl.env -src/makeprog.sl -src/makelib.sl -src/salford.lnk src/maketwin.env src/makefile.bcc src/makefile.vc diff --git a/distrib/scripts/manifests/msw_minimal.rsp b/distrib/scripts/manifests/msw_minimal.rsp index c2714cb7ad..5b1dcb2469 100644 --- a/distrib/scripts/manifests/msw_minimal.rsp +++ b/distrib/scripts/manifests/msw_minimal.rsp @@ -193,10 +193,6 @@ src/makelib.vc src/makeg95.env src/makeprog.g95 src/makelib.g95 -src/makesl.env -src/makeprog.sl -src/makelib.sl -src/salford.lnk src/maketwin.env src/makefile.bcc src/makefile.vc diff --git a/include/wx/defs.h b/include/wx/defs.h index abe2500e52..3c5ad72716 100644 --- a/include/wx/defs.h +++ b/include/wx/defs.h @@ -103,15 +103,6 @@ #endif /* VC++ 8 */ #endif /* __VISUALC__ */ -/* suppress some Salford C++ warnings */ -#ifdef __SALFORDC__ -# pragma suppress 353 /* Possible nested comments */ -# pragma suppress 593 /* Define not used */ -# pragma suppress 61 /* enum has no name (doesn't suppress!) */ -# pragma suppress 106 /* unnamed, unused parameter */ -# pragma suppress 571 /* Virtual function hiding */ -#endif /* __SALFORDC__ */ - /* suppress some Borland C++ warnings */ #ifdef __BORLANDC__ # pragma warn -inl /* Functions containing reserved words and certain constructs are not expanded inline */ diff --git a/include/wx/dirdlg.h b/include/wx/dirdlg.h index 46dfd1bda2..d54eb6ff8e 100644 --- a/include/wx/dirdlg.h +++ b/include/wx/dirdlg.h @@ -96,8 +96,7 @@ protected: #if defined(__WXUNIVERSAL__) #include "wx/generic/dirdlgg.h" #define wxDirDialog wxGenericDirDialog -#elif defined(__WXMSW__) && (defined(__SALFORDC__) || \ - !wxUSE_OLE || \ +#elif defined(__WXMSW__) && (!wxUSE_OLE || \ (defined (__GNUWIN32__) && !wxUSE_NORLANDER_HEADERS)) #include "wx/generic/dirdlgg.h" #define wxDirDialog wxGenericDirDialog diff --git a/include/wx/filefn.h b/include/wx/filefn.h index a36505eb1c..6ce76ebbc6 100644 --- a/include/wx/filefn.h +++ b/include/wx/filefn.h @@ -60,7 +60,7 @@ #endif #if defined(__WINDOWS__) && !defined(__WXMICROWIN__) -#if !defined( __GNUWIN32__ ) && !defined( __MWERKS__ ) && !defined(__SALFORDC__) && !defined(__WXWINCE__) && !defined(__CYGWIN__) +#if !defined( __GNUWIN32__ ) && !defined( __MWERKS__ ) && !defined(__WXWINCE__) && !defined(__CYGWIN__) #include #include #include @@ -85,11 +85,6 @@ #include #endif -#ifdef __SALFORDC__ - #include - #include -#endif - #ifndef __WXPALMOS5__ #ifndef __WXWINCE__ #include // O_RDONLY &c diff --git a/include/wx/list.h b/include/wx/list.h index a76ad27d29..df7eed1cb7 100644 --- a/include/wx/list.h +++ b/include/wx/list.h @@ -548,10 +548,6 @@ protected: void *data, const wxListKey& key = wxDefaultListKey) = 0; -// Can't access these from derived classes otherwise (bug in Salford C++?) -#ifdef __SALFORDC__ -public: -#endif // ctors // from an array diff --git a/include/wx/string.h b/include/wx/string.h index 7c4bf74d87..8312c04a85 100644 --- a/include/wx/string.h +++ b/include/wx/string.h @@ -133,8 +133,6 @@ inline int Stricmp(const char *psz1, const char *psz2) return _stricmp(psz1, psz2); #elif defined(__SC__) return _stricmp(psz1, psz2); -#elif defined(__SALFORDC__) - return stricmp(psz1, psz2); #elif defined(__BORLANDC__) return stricmp(psz1, psz2); #elif defined(__WATCOMC__) diff --git a/include/wx/wxcrtbase.h b/include/wx/wxcrtbase.h index ca195b2806..f69584b836 100644 --- a/include/wx/wxcrtbase.h +++ b/include/wx/wxcrtbase.h @@ -229,7 +229,7 @@ WXDLLIMPEXP_BASE void *calloc( size_t num, size_t size ); * versions */ #if !defined(wxCRT_StricmpA) #if defined(__BORLANDC__) || defined(__WATCOMC__) || \ - defined(__SALFORDC__) || defined(__VISAGECPP__) || \ + defined(__VISAGECPP__) || \ defined(__EMX__) || defined(__DJGPP__) #define wxCRT_StricmpA stricmp #define wxCRT_StrnicmpA strnicmp diff --git a/samples/calendar/makefile.sl b/samples/calendar/makefile.sl deleted file mode 100644 index 9fb20039da..0000000000 --- a/samples/calendar/makefile.sl +++ /dev/null @@ -1,14 +0,0 @@ -# Purpose: makefile for calendar example (Salford C++) -# Created: 2000-01-03 - -PROGRAM = calendar -OBJECTS = $(PROGRAM).obj - -include ..\..\src\makeprog.sl - -all: wx $(TARGET) - -wx: - cd $(WXDIR)\src\msw ^ mk32 -f makefile.sl all - cd $(WXDIR)\samples\calendar - diff --git a/samples/dragimag/makefile.sl b/samples/dragimag/makefile.sl deleted file mode 100644 index 45beba2c35..0000000000 --- a/samples/dragimag/makefile.sl +++ /dev/null @@ -1,14 +0,0 @@ -# Purpose: makefile for dragimag example (Salford C++) -# Created: 2000-03-15 - -PROGRAM = dragimag -OBJECTS = $(PROGRAM).obj - -include ..\..\src\makeprog.sl - -all: wx $(TARGET) - -wx: - cd $(WXDIR)\src\msw ^ mk32 -f makefile.sl all - cd $(WXDIR)\samples\dragimag - diff --git a/samples/erase/makefile.sl b/samples/erase/makefile.sl deleted file mode 100644 index 207941a5aa..0000000000 --- a/samples/erase/makefile.sl +++ /dev/null @@ -1,18 +0,0 @@ -# -# File: makefile.sl -# Author: Julian Smart -# Created: 1998 -# -# Makefile : Builds a wxWindows sample for Salford C++, WIN32 - -PROGRAM = erase -OBJECTS = $(PROGRAM).obj - -include ..\..\src\makeprog.sl - -all: wx $(TARGET) - -wx: - cd $(WXDIR)\src\msw ^ mk32 -f makefile.sl all - cd $(WXDIR)\samples\minimal - diff --git a/samples/event/makefile.sl b/samples/event/makefile.sl deleted file mode 100644 index 3e0483c189..0000000000 --- a/samples/event/makefile.sl +++ /dev/null @@ -1,14 +0,0 @@ -# Purpose: makefile for event example (Salford C++) -# Created: 2001-01-31 - -PROGRAM = event -OBJECTS = $(PROGRAM).obj - -include ..\..\src\makeprog.sl - -all: wx $(TARGET) - -wx: - cd $(WXDIR)\src\msw ^ mk32 -f makefile.sl all - cd $(WXDIR)\samples\event - diff --git a/samples/exec/makefile.sl b/samples/exec/makefile.sl deleted file mode 100644 index 9bdc37a898..0000000000 --- a/samples/exec/makefile.sl +++ /dev/null @@ -1,14 +0,0 @@ -# Purpose: makefile for exec example (Salford C++) -# Created: 2000-03-14 - -PROGRAM = exec -OBJECTS = $(PROGRAM).obj - -include ..\..\src\makeprog.sl - -all: wx $(TARGET) - -wx: - cd $(WXDIR)\src\msw ^ mk32 -f makefile.sl all - cd $(WXDIR)\samples\exec - diff --git a/samples/grid/makefile.sl b/samples/grid/makefile.sl deleted file mode 100644 index d525163635..0000000000 --- a/samples/grid/makefile.sl +++ /dev/null @@ -1,14 +0,0 @@ -# Purpose: makefile for grid example (Salford C++) -# Created: 2000-03-15 - -PROGRAM = grid -OBJECTS = $(PROGRAM).obj - -include ..\..\src\makeprog.sl - -all: wx $(TARGET) - -wx: - cd $(WXDIR)\src\msw ^ mk32 -f makefile.sl all - cd $(WXDIR)\samples\grid - diff --git a/samples/joytest/makefile.sl b/samples/joytest/makefile.sl deleted file mode 100644 index 8a8e642ade..0000000000 --- a/samples/joytest/makefile.sl +++ /dev/null @@ -1,14 +0,0 @@ -# Purpose: makefile for joytest example (Salford C++) -# Created: 2000-03-14 - -PROGRAM = joytest -OBJECTS = $(PROGRAM).obj - -include ..\..\src\makeprog.sl - -all: wx $(TARGET) - -wx: - cd $(WXDIR)\src\msw ^ mk32 -f makefile.sl all - cd $(WXDIR)\samples\joytest - diff --git a/samples/mdi/makefile.sl b/samples/mdi/makefile.sl deleted file mode 100644 index 0309cff0a8..0000000000 --- a/samples/mdi/makefile.sl +++ /dev/null @@ -1,18 +0,0 @@ -# -# File: makefile.sl -# Author: Julian Smart -# Created: 1998 -# -# Makefile : Builds a wxWindows sample for Salford C++, WIN32 - -PROGRAM = mdi -OBJECTS = $(PROGRAM).obj - -include ..\..\src\makeprog.sl - -all: wx $(TARGET) - -wx: - cd $(WXDIR)\src\msw ^ mk32 -f makefile.sl all - cd $(WXDIR)\samples\mdi - diff --git a/samples/minimal/makefile.sl b/samples/minimal/makefile.sl deleted file mode 100644 index 7dd9a0b6a6..0000000000 --- a/samples/minimal/makefile.sl +++ /dev/null @@ -1,18 +0,0 @@ -# -# File: makefile.sl -# Author: Julian Smart -# Created: 1998 -# -# Makefile : Builds a wxWindows sample for Salford C++, WIN32 - -PROGRAM = minimal -OBJECTS = $(PROGRAM).obj - -include ..\..\src\makeprog.sl - -all: wx $(TARGET) - -wx: - cd $(WXDIR)\src\msw ^ mk32 -f makefile.sl all - cd $(WXDIR)\samples\minimal - diff --git a/samples/notebook/makefile.sl b/samples/notebook/makefile.sl deleted file mode 100644 index db6602046a..0000000000 --- a/samples/notebook/makefile.sl +++ /dev/null @@ -1,14 +0,0 @@ -# Purpose: makefile for notebook example (Salford C++) -# Created: 2000-03-15 - -PROGRAM = notebook -OBJECTS = $(PROGRAM).obj - -include ..\..\src\makeprog.sl - -all: wx $(TARGET) - -wx: - cd $(WXDIR)\src\msw ^ mk32 -f makefile.sl all - cd $(WXDIR)\samples\notebook - diff --git a/samples/sashtest/makefile.sl b/samples/sashtest/makefile.sl deleted file mode 100644 index fa4aff80f0..0000000000 --- a/samples/sashtest/makefile.sl +++ /dev/null @@ -1,14 +0,0 @@ -# Purpose: makefile for sashtest example (Salford C++) -# Created: 2000-03-14 - -PROGRAM = sashtest -OBJECTS = $(PROGRAM).obj - -include ..\..\src\makeprog.sl - -all: wx $(TARGET) - -wx: - cd $(WXDIR)\src\msw ^ mk32 -f makefile.sl all - cd $(WXDIR)\samples\sashtest - diff --git a/samples/shaped/makefile.sl b/samples/shaped/makefile.sl deleted file mode 100644 index 90b1e0ae38..0000000000 --- a/samples/shaped/makefile.sl +++ /dev/null @@ -1,14 +0,0 @@ -# Purpose: makefile for shaped example (Salford C++) -# Created: 2000-01-03 - -PROGRAM = shaped -OBJECTS = $(PROGRAM).obj - -include ..\..\src\makeprog.sl - -all: wx $(TARGET) - -wx: - cd $(WXDIR)\src\msw ^ mk32 -f makefile.sl all - cd $(WXDIR)\samples\shaped - diff --git a/samples/splitter/makefile.sl b/samples/splitter/makefile.sl deleted file mode 100644 index 986e12eab9..0000000000 --- a/samples/splitter/makefile.sl +++ /dev/null @@ -1,14 +0,0 @@ -# Purpose: makefile for splitter example (Salford C++) -# Created: 2000-03-15 - -PROGRAM = splitter -OBJECTS = $(PROGRAM).obj - -include ..\..\src\makeprog.sl - -all: wx $(TARGET) - -wx: - cd $(WXDIR)\src\msw ^ mk32 -f makefile.sl all - cd $(WXDIR)\samples\splitter - diff --git a/samples/statbar/makefile.sl b/samples/statbar/makefile.sl deleted file mode 100644 index 4b26e72375..0000000000 --- a/samples/statbar/makefile.sl +++ /dev/null @@ -1,14 +0,0 @@ -# Purpose: makefile for statbar example (Salford C++) -# Created: 2000-02-04 - -PROGRAM = statbar -OBJECTS = $(PROGRAM).obj - -include ..\..\src\makeprog.sl - -all: wx $(TARGET) - -wx: - cd $(WXDIR)\src\msw ^ mk32 -f makefile.sl all - cd $(WXDIR)\samples\statbar - diff --git a/samples/thread/makefile.sl b/samples/thread/makefile.sl deleted file mode 100644 index 0dfd1d8236..0000000000 --- a/samples/thread/makefile.sl +++ /dev/null @@ -1,14 +0,0 @@ -# Purpose: makefile for thread example (Salford C++) -# Created: 2000-03-15 - -PROGRAM = thread -OBJECTS = $(PROGRAM).obj - -include ..\..\src\makeprog.sl - -all: wx $(TARGET) - -wx: - cd $(WXDIR)\src\msw ^ mk32 -f makefile.sl all - cd $(WXDIR)\samples\thread - diff --git a/samples/toolbar/makefile.sl b/samples/toolbar/makefile.sl deleted file mode 100644 index 216b087cf2..0000000000 --- a/samples/toolbar/makefile.sl +++ /dev/null @@ -1,14 +0,0 @@ -# Purpose: makefile for toolbar example (Salford C++) -# Created: 2000-03-14 - -PROGRAM = toolbar -OBJECTS = $(PROGRAM).obj - -include ..\..\src\makeprog.sl - -all: wx $(TARGET) - -wx: - cd $(WXDIR)\src\msw ^ mk32 -f makefile.sl all - cd $(WXDIR)\samples\toolbar - diff --git a/samples/typetest/makefile.sl b/samples/typetest/makefile.sl deleted file mode 100644 index 6d7d6dbdac..0000000000 --- a/samples/typetest/makefile.sl +++ /dev/null @@ -1,14 +0,0 @@ -# Purpose: makefile for typetest example (Salford C++) -# Created: 2000-03-14 - -PROGRAM = typetest -OBJECTS = $(PROGRAM).obj - -include ..\..\src\makeprog.sl - -all: wx $(TARGET) - -wx: - cd $(WXDIR)\src\msw ^ mk32 -f makefile.sl all - cd $(WXDIR)\samples\typetest - diff --git a/samples/wizard/makefile.sl b/samples/wizard/makefile.sl deleted file mode 100644 index 19615d25d5..0000000000 --- a/samples/wizard/makefile.sl +++ /dev/null @@ -1,14 +0,0 @@ -# Purpose: makefile for wizard example (Salford C++) -# Created: 2000-03-15 - -PROGRAM = wizard -OBJECTS = $(PROGRAM).obj - -include ..\..\src\makeprog.sl - -all: wx $(TARGET) - -wx: - cd $(WXDIR)\src\msw ^ mk32 -f makefile.sl all - cd $(WXDIR)\samples\wizard - diff --git a/src/common/file.cpp b/src/common/file.cpp index 680f9dfb4e..abcf92a78c 100644 --- a/src/common/file.cpp +++ b/src/common/file.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: file.cpp +// Name: src/common/file.cpp // Purpose: wxFile - encapsulates low-level "file descriptor" // wxTempFile // Author: Vadim Zeitlin @@ -26,28 +26,26 @@ // standard #if defined(__WXMSW__) && !defined(__GNUWIN32__) && !defined(__WXMICROWIN__) && !defined(__WXWINCE__) -#ifndef __SALFORDC__ - #define WIN32_LEAN_AND_MEAN - #define NOSERVICE - #define NOIME - #define NOATOM - #define NOGDI - #define NOGDICAPMASKS - #define NOMETAFILE - #define NOMINMAX - #define NOMSG - #define NOOPENFILE - #define NORASTEROPS - #define NOSCROLL - #define NOSOUND - #define NOSYSMETRICS - #define NOTEXTMETRIC - #define NOWH - #define NOCOMM - #define NOKANJI - #define NOCRYPT - #define NOMCX -#endif +#define WIN32_LEAN_AND_MEAN +#define NOSERVICE +#define NOIME +#define NOATOM +#define NOGDI +#define NOGDICAPMASKS +#define NOMETAFILE +#define NOMINMAX +#define NOMSG +#define NOOPENFILE +#define NORASTEROPS +#define NOSCROLL +#define NOSOUND +#define NOSYSMETRICS +#define NOTEXTMETRIC +#define NOWH +#define NOCOMM +#define NOKANJI +#define NOCRYPT +#define NOMCX #elif defined(__WXMSW__) && defined(__WXWINCE__) #include "wx/msw/missing.h" @@ -99,18 +97,6 @@ }; #endif // W_OK -#ifdef __SALFORDC__ - #include -#endif - -// some broken compilers don't have 3rd argument in open() and creat() -#ifdef __SALFORDC__ - #define ACCESS(access) - #define stat _stat -#else // normal compiler - #define ACCESS(access) , (access) -#endif // Salford C - // wxWidgets #ifndef WX_PRECOMP #include "wx/string.h" @@ -200,8 +186,8 @@ bool wxFile::Create(const wxString& fileName, bool bOverwrite, int accessMode) // otherwise we only create the new file and fail if it already exists int fd = wxOpen( fileName, O_BINARY | O_WRONLY | O_CREAT | - (bOverwrite ? O_TRUNC : O_EXCL) - ACCESS(accessMode) ); + (bOverwrite ? O_TRUNC : O_EXCL), + accessMode ); if ( fd == -1 ) { wxLogSysError(_("can't create file '%s'"), fileName); @@ -252,7 +238,7 @@ bool wxFile::Open(const wxString& fileName, OpenMode mode, int accessMode) accessMode &= wxS_IRUSR | wxS_IWUSR; #endif // __WINDOWS__ - int fd = wxOpen( fileName, flags ACCESS(accessMode)); + int fd = wxOpen( fileName, flags, accessMode); if ( fd == -1 ) { @@ -435,7 +421,7 @@ bool wxFile::Eof() const wxFileOffset iRc; -#if defined(__DOS__) || defined(__UNIX__) || defined(__GNUWIN32__) || defined( __MWERKS__ ) || defined(__SALFORDC__) +#if defined(__DOS__) || defined(__UNIX__) || defined(__GNUWIN32__) || defined( __MWERKS__ ) // @@ this doesn't work, of course, on unseekable file descriptors wxFileOffset ofsCur = Tell(), ofsMax = Length(); diff --git a/src/common/imagbmp.cpp b/src/common/imagbmp.cpp index ff95ab1374..66718fc518 100644 --- a/src/common/imagbmp.cpp +++ b/src/common/imagbmp.cpp @@ -38,12 +38,6 @@ // For memcpy #include -#ifdef __SALFORDC__ -#ifdef FAR -#undef FAR -#endif -#endif - //----------------------------------------------------------------------------- // wxBMPHandler //----------------------------------------------------------------------------- diff --git a/src/common/imagjpeg.cpp b/src/common/imagjpeg.cpp index d045596065..f279fed885 100644 --- a/src/common/imagjpeg.cpp +++ b/src/common/imagjpeg.cpp @@ -57,10 +57,6 @@ typedef boolean wxjpeg_boolean; // For JPEG library error handling #include -#ifdef __SALFORDC__ -#undef FAR -#endif - // ---------------------------------------------------------------------------- // types // ---------------------------------------------------------------------------- diff --git a/src/common/imagpng.cpp b/src/common/imagpng.cpp index bb081b809a..0a5c3c4826 100644 --- a/src/common/imagpng.cpp +++ b/src/common/imagpng.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: src/common/imagepng.cpp +// Name: src/common/imagpng.cpp // Purpose: wxImage PNG handler // Author: Robert Roebling // RCS-ID: $Id$ @@ -42,12 +42,6 @@ // For memcpy #include -#ifdef __SALFORDC__ -#ifdef FAR -#undef FAR -#endif -#endif - // ---------------------------------------------------------------------------- // constants // ---------------------------------------------------------------------------- diff --git a/src/common/memory.cpp b/src/common/memory.cpp index 9bf20f536b..ae3b6383b5 100644 --- a/src/common/memory.cpp +++ b/src/common/memory.cpp @@ -39,7 +39,7 @@ #include "wx/ioswrap.h" #if !defined(__WATCOMC__) && !(defined(__VMS__) && ( __VMS_VER < 70000000 ) )\ - && !defined( __MWERKS__ ) && !defined(__SALFORDC__) + && !defined( __MWERKS__ ) #include #endif diff --git a/src/common/sckaddr.cpp b/src/common/sckaddr.cpp index 0fe92695f1..dd801147b3 100644 --- a/src/common/sckaddr.cpp +++ b/src/common/sckaddr.cpp @@ -27,7 +27,7 @@ #include #include - #if !defined(__MWERKS__) && !defined(__SALFORDC__) + #if !defined(__MWERKS__) #include #endif #endif // !WX_PRECOMP diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp index 3e354f466b..eb1cc823b1 100644 --- a/src/common/strconv.cpp +++ b/src/common/strconv.cpp @@ -44,10 +44,6 @@ #define wxHAVE_WIN32_MB2WC #endif -#ifdef __SALFORDC__ - #include -#endif - #ifdef HAVE_ICONV #include #include "wx/thread.h" diff --git a/src/common/string.cpp b/src/common/string.cpp index f413b031fd..6b65824622 100644 --- a/src/common/string.cpp +++ b/src/common/string.cpp @@ -35,10 +35,6 @@ #include #include -#ifdef __SALFORDC__ - #include -#endif - #include "wx/hashmap.h" // string handling functions used by wxString: diff --git a/src/common/stringimpl.cpp b/src/common/stringimpl.cpp index c8799442c3..4c30917521 100644 --- a/src/common/stringimpl.cpp +++ b/src/common/stringimpl.cpp @@ -42,10 +42,6 @@ #include #include -#ifdef __SALFORDC__ - #include -#endif - // allocating extra space for each string consumes more memory but speeds up // the concatenation operations (nLen is the current string's length) // NB: EXTRA_ALLOC must be >= 0! diff --git a/src/common/valtext.cpp b/src/common/valtext.cpp index 8d83f839fd..8c69b0692b 100644 --- a/src/common/valtext.cpp +++ b/src/common/valtext.cpp @@ -33,10 +33,6 @@ #include #include -#ifdef __SALFORDC__ - #include -#endif - IMPLEMENT_DYNAMIC_CLASS(wxTextValidator, wxValidator) BEGIN_EVENT_TABLE(wxTextValidator, wxValidator) diff --git a/src/msw/app.cpp b/src/msw/app.cpp index ef5379e82b..36c3571ab6 100644 --- a/src/msw/app.cpp +++ b/src/msw/app.cpp @@ -61,7 +61,7 @@ // OLE is used for drag-and-drop, clipboard, OLE Automation..., but some // compilers don't support it (missing headers, libs, ...) -#if defined(__GNUWIN32_OLD__) || defined(__SYMANTEC__) || defined(__SALFORDC__) +#if defined(__GNUWIN32_OLD__) || defined(__SYMANTEC__) #undef wxUSE_OLE #define wxUSE_OLE 0 diff --git a/src/msw/dib.cpp b/src/msw/dib.cpp index 00ed0789cc..3acfa95d26 100644 --- a/src/msw/dib.cpp +++ b/src/msw/dib.cpp @@ -45,7 +45,7 @@ #include #include -#if !defined(__MWERKS__) && !defined(__SALFORDC__) +#if !defined(__MWERKS__) #include #endif diff --git a/src/msw/printwin.cpp b/src/msw/printwin.cpp index 98dae5fc75..2ccf24961c 100644 --- a/src/msw/printwin.cpp +++ b/src/msw/printwin.cpp @@ -180,7 +180,7 @@ bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt wxWindow *win = CreateAbortWindow(parent, printout); wxYield(); -#if defined(__WATCOMC__) || defined(__BORLANDC__) || defined(__GNUWIN32__) || defined(__SALFORDC__) || !defined(__WIN32__) +#if defined(__WATCOMC__) || defined(__BORLANDC__) || defined(__GNUWIN32__) || !defined(__WIN32__) #ifdef STRICT ::SetAbortProc((HDC) impl->GetHDC(), (ABORTPROC) m_lpAbortProc); #else diff --git a/src/msw/salford.lnk b/src/msw/salford.lnk deleted file mode 100644 index 5cb5cd7aea..0000000000 --- a/src/msw/salford.lnk +++ /dev/null @@ -1,152 +0,0 @@ -archive ..\..\lib\wx.lib -addobj accel.obj -addobj app.obj -addobj bitmap.obj -addobj bmpbuttn.obj -addobj brush.obj -addobj button.obj -addobj checkbox.obj -addobj checklst.obj -addobj choicdgg.obj -addobj choice.obj -addobj clipbrd.obj -addobj cmndata.obj -addobj colordlg.obj -addobj colour.obj -addobj combobox.obj -addobj config.obj -addobj control.obj -addobj curico.obj -addobj cursor.obj -addobj data.obj -addobj date.obj -addobj datstrm.obj -addobj dc.obj -addobj dcclient.obj -addobj dcmemory.obj -addobj dcprint.obj -addobj dcscreen.obj -addobj dde.obj -addobj dialog.obj -addobj dib.obj -addobj dibutils.obj -addobj dirdlgg.obj -addobj docmdi.obj -addobj docview.obj -addobj dynarray.obj -addobj dynlib.obj -addobj event.obj -addobj extended.obj -addobj file.obj -addobj fileconf.obj -addobj filedlg.obj -addobj filefn.obj -addobj font.obj -addobj fontdlg.obj -addobj frame.obj -addobj framecmn.obj -addobj gauge95.obj -addobj gdicmn.obj -addobj gdiobj.obj -addobj gridg.obj -addobj hash.obj -addobj helpbase.obj -addobj helpwin.obj -addobj http.obj -addobj icon.obj -addobj image.obj -addobj imaglist.obj -addobj iniconf.obj -addobj intl.obj -addobj ipcbase.obj -addobj joystick.obj -addobj layout.obj -addobj laywin.obj -addobj list.obj -addobj listbox.obj -addobj listctrl.obj -addobj log.obj -addobj mdi.obj -addobj memory.obj -addobj menu.obj -addobj menuitem.obj -addobj metafile.obj -addobj minifram.obj -addobj module.obj -addobj msgdlg.obj -addobj mstream.obj -addobj nativdlg.obj -addobj notebook.obj -addobj object.obj -addobj objstrm.obj -addobj ownerdrw.obj -addobj palette.obj -addobj panelg.obj -addobj pen.obj -addobj penwin.obj -addobj printdlg.obj -addobj printwin.obj -addobj prntbase.obj -addobj process.obj -addobj prop.obj -addobj propform.obj -addobj proplist.obj -addobj protocol.obj -addobj radiobox.obj -addobj radiobut.obj -addobj regconf.obj -addobj region.obj -addobj registry.obj -addobj resource.obj -addobj sashwin.obj -addobj sckaddr.obj -addobj sckfile.obj -addobj sckstrm.obj -addobj scrolbar.obj -addobj scrolwin.obj -addobj settings.obj -addobj slider95.obj -addobj slidrmsw.obj -addobj socket.obj -addobj spinbutt.obj -addobj splitter.obj -addobj statbmp.obj -addobj statbox.obj -addobj statbr95.obj -addobj stattext.obj -addobj statusbr.obj -addobj stream.obj -addobj string.obj -addobj tabctrl.obj -addobj tabg.obj -addobj taskbar.obj -addobj tbar95.obj -addobj tbarbase.obj -addobj tbarmsw.obj -addobj tbarsmpl.obj -addobj textctrl.obj -addobj textdlgg.obj -addobj textfile.obj -addobj thread.obj -addobj time.obj -addobj timer.obj -addobj timercmn.obj -addobj tokenzr.obj -addobj treectrl.obj -addobj url.obj -addobj utils.obj -addobj utilscmn.obj -addobj utilsexc.obj -addobj validate.obj -addobj valtext.obj -addobj variant.obj -addobj wave.obj -addobj wfstream.obj -addobj wincmn.obj -addobj window.obj -addobj wxchar.obj -addobj wxexpr.obj -addobj y_tab.obj -addobj zstream.obj -file - diff --git a/src/msw/utils.cpp b/src/msw/utils.cpp index fb792f42b3..4e674fcbde 100644 --- a/src/msw/utils.cpp +++ b/src/msw/utils.cpp @@ -55,7 +55,7 @@ #include #endif -#if !defined(__GNUWIN32__) && !defined(__SALFORDC__) && !defined(__WXMICROWIN__) && !defined(__WXWINCE__) +#if !defined(__GNUWIN32__) && !defined(__WXMICROWIN__) && !defined(__WXWINCE__) #include #ifndef __MWERKS__ diff --git a/src/msw/utilsexc.cpp b/src/msw/utilsexc.cpp index 703088a463..fa2c29b351 100644 --- a/src/msw/utilsexc.cpp +++ b/src/msw/utilsexc.cpp @@ -44,7 +44,7 @@ #include -#if !defined(__GNUWIN32__) && !defined(__SALFORDC__) && !defined(__WXMICROWIN__) && !defined(__WXWINCE__) +#if !defined(__GNUWIN32__) && !defined(__WXMICROWIN__) && !defined(__WXWINCE__) #include #ifndef __MWERKS__ #include diff --git a/src/msw/wince/tbarwce.cpp b/src/msw/wince/tbarwce.cpp index 15e6d13c34..ce45117cf4 100644 --- a/src/msw/wince/tbarwce.cpp +++ b/src/msw/wince/tbarwce.cpp @@ -42,7 +42,7 @@ #include "wx/control.h" #endif -#if !defined(__GNUWIN32__) && !defined(__SALFORDC__) +#if !defined(__GNUWIN32__) #include "malloc.h" #endif -- 2.45.2