removed support for Salford compiler (which was almost certainly broken anyhow) ...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50960 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/distrib/msw/msw_minimal.rsp b/distrib/msw/msw_minimal.rsp
index 7ec7be5b2fa7739281852a35dc207f5fe76693db..23b6e6d51a6685a84c3bfbd4d82dfc54552de9d0 100644 (file)
--- 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 c2714cb7ad95ab9bf03c641f1ac958fd3378663b..5b1dcb24697f333e192de0ab104dc7f8d64df674 100644 (file)
--- 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 abe2500e52085f9c2e1ddeabd8e92617352352c6..3c5ad727164d9df6a9165d378d22fd6795f28ad4 100644 (file)
--- 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 46dfd1bda2cffa17561a68ef3be87419382bdc51..d54eb6ff8e342145e6405dce7656063838320b30 100644 (file)
--- 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 a36505eb1c970cbde7bc665071de151606c07dd3..6ce76ebbc62014c7ccabbb301fa85838fbd84e6e 100644 (file)
--- 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 <direct.h>
     #include <dos.h>
     #include <io.h>
@@ -85,11 +85,6 @@
     #include <dir.h>
 #endif
 
-#ifdef __SALFORDC__
-    #include <dir.h>
-    #include <unix.h>
-#endif
-
 #ifndef __WXPALMOS5__
 #ifndef __WXWINCE__
     #include  <fcntl.h>       // O_RDONLY &c

diff --git a/include/wx/list.h b/include/wx/list.h
index a76ad27d29acd8b860d954c9246ed53ebb0b3de3..df7eed1cb76cd9babecde1f2334fa0627d4ee230 100644 (file)
--- 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 7c4bf74d87aa025bde302d8118bca41c60ec80ed..8312c04a85778b8fb48a94f54ec2b46e8cc9346f 100644 (file)
--- 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 ca195b2806655e94b4d3f06c1d881ce077287e4b..f69584b83680cf151d6e87ffd78dd2f8ce1abfbe 100644 (file)
--- 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 (file)
index 9fb2003..0000000
--- 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 (file)
index 45beba2..0000000
--- 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 (file)
index 207941a..0000000
--- 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 (file)
index 3e0483c..0000000
--- 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 (file)
index 9bdc37a..0000000
--- 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 (file)
index d525163..0000000
--- 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 (file)
index 8a8e642..0000000
--- 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 (file)
index 0309cff..0000000
--- 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 (file)
index 7dd9a0b..0000000
--- 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 (file)
index db66020..0000000
--- 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 (file)
index fa4aff8..0000000
--- 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 (file)
index 90b1e0a..0000000
--- 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 (file)
index 986e12e..0000000
--- 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 (file)
index 4b26e72..0000000
--- 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 (file)
index 0dfd1d8..0000000
--- 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 (file)
index 216b087..0000000
--- 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 (file)
index 6d7d6db..0000000
--- 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 (file)
index 19615d2..0000000
--- 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 680f9dfb4e502567392d41ce7d6bab53ced5c3d2..abcf92a78c7956ca8fbb217f5da744de638341a2 100644 (file)
--- 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 <unix.h>
-#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 ff95ab1374f59983ec82e7f99fd179eb37d6c5bf..66718fc518fb63bd974134aeeb4b9c4e4669527f 100644 (file)
--- a/src/common/imagbmp.cpp
+++ b/src/common/imagbmp.cpp
@@ -38,12 +38,6 @@
 // For memcpy
 #include <string.h>
 
-#ifdef __SALFORDC__
-#ifdef FAR
-#undef FAR
-#endif
-#endif
-
 //-----------------------------------------------------------------------------
 // wxBMPHandler
 //-----------------------------------------------------------------------------

diff --git a/src/common/imagjpeg.cpp b/src/common/imagjpeg.cpp
index d045596065270a56b7da4401918e00eb83abd49c..f279fed885a5631f2b4e31444ca88faaa6a13158 100644 (file)
--- a/src/common/imagjpeg.cpp
+++ b/src/common/imagjpeg.cpp
@@ -57,10 +57,6 @@ typedef boolean wxjpeg_boolean;
 // For JPEG library error handling
 #include <setjmp.h>
 
-#ifdef __SALFORDC__
-#undef FAR
-#endif
-
 // ----------------------------------------------------------------------------
 // types
 // ----------------------------------------------------------------------------

diff --git a/src/common/imagpng.cpp b/src/common/imagpng.cpp
index bb081b809a5e532d0679a7854c43bdb5e7163e33..0a5c3c48268593baf7f720cce683ec7987aa31e2 100644 (file)
--- 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 <string.h>
 
-#ifdef __SALFORDC__
-#ifdef FAR
-#undef FAR
-#endif
-#endif
-
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------

diff --git a/src/common/memory.cpp b/src/common/memory.cpp
index 9bf20f536b4b61fe20d6b3701950b4b8b83bf495..ae3b6383b52620a8538455ec86648aa873f0e7bd 100644 (file)
--- 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 <memory.h>
 #endif
 

diff --git a/src/common/sckaddr.cpp b/src/common/sckaddr.cpp
index 0fe92695f18cad869fdbfa2641584b2f9db47b59..dd801147b3165a2bf3ca4ecf562160b251672a74 100644 (file)
--- a/src/common/sckaddr.cpp
+++ b/src/common/sckaddr.cpp
@@ -27,7 +27,7 @@
     #include <stdlib.h>
     #include <ctype.h>
 
-    #if !defined(__MWERKS__) && !defined(__SALFORDC__)
+    #if !defined(__MWERKS__)
         #include <memory.h>
     #endif
 #endif // !WX_PRECOMP

diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp
index 3e354f466b668ab41e01c581f0bea6af1df5ac2a..eb1cc823b12a70a9c52a59d6d0512bcbceba6af6 100644 (file)
--- a/src/common/strconv.cpp
+++ b/src/common/strconv.cpp
@@ -44,10 +44,6 @@
     #define wxHAVE_WIN32_MB2WC
 #endif
 
-#ifdef __SALFORDC__
-    #include <clib.h>
-#endif
-
 #ifdef HAVE_ICONV
     #include <iconv.h>
     #include "wx/thread.h"

diff --git a/src/common/string.cpp b/src/common/string.cpp
index f413b031fd79c9c1b92e58e28794f5d40a26fe38..6b6582462259fcedddf1c7f99c4f158dc9339b26 100644 (file)
--- a/src/common/string.cpp
+++ b/src/common/string.cpp
@@ -35,10 +35,6 @@
 #include <string.h>
 #include <stdlib.h>
 
-#ifdef __SALFORDC__
-    #include <clib.h>
-#endif
-
 #include "wx/hashmap.h"
 
 // string handling functions used by wxString:

diff --git a/src/common/stringimpl.cpp b/src/common/stringimpl.cpp
index c8799442c379b82f23d5acfb7d8f75e69f0784e4..4c309175217b9b329002b98b6a11ba0979b91230 100644 (file)
--- a/src/common/stringimpl.cpp
+++ b/src/common/stringimpl.cpp
@@ -42,10 +42,6 @@
 #include <string.h>
 #include <stdlib.h>
 
-#ifdef __SALFORDC__
-    #include <clib.h>
-#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 8d83f839fdc1f3bf290410a77ea58fba58014487..8c69b0692be75eb86e2778bd72956ea8555999ee 100644 (file)
--- a/src/common/valtext.cpp
+++ b/src/common/valtext.cpp
@@ -33,10 +33,6 @@
 #include <string.h>
 #include <stdlib.h>
 
-#ifdef __SALFORDC__
-    #include <clib.h>
-#endif
-
 IMPLEMENT_DYNAMIC_CLASS(wxTextValidator, wxValidator)
 
 BEGIN_EVENT_TABLE(wxTextValidator, wxValidator)

diff --git a/src/msw/app.cpp b/src/msw/app.cpp
index ef5379e82b6e03d39e20da5fa3b8673dd571fb74..36c3571ab69f636c9d29173a05db9618246b75be 100644 (file)
--- 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 00ed0789cc480cbdb8b21b6d4a50eb74ca7dbb4c..3acfa95d2607bc07f0873e835359632ea8763ce4 100644 (file)
--- a/src/msw/dib.cpp
+++ b/src/msw/dib.cpp
@@ -45,7 +45,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#if !defined(__MWERKS__) && !defined(__SALFORDC__)
+#if !defined(__MWERKS__)
     #include <memory.h>
 #endif
 

diff --git a/src/msw/printwin.cpp b/src/msw/printwin.cpp
index 98dae5fc7506142462356ae747aeeea39984eb36..2ccf24961ca69041c4be9a9b3e181b95f2495fd7 100644 (file)
--- 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 (file)
index 5cb5cd7..0000000
--- 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 fb792f42b3bd1ebfabc12be67f7a943e68f58709..4e674fcbde6b67fbe91903d1ee328fac1ba5d87d 100644 (file)
--- a/src/msw/utils.cpp
+++ b/src/msw/utils.cpp
@@ -55,7 +55,7 @@
     #include <winsock.h>
 #endif
 
-#if !defined(__GNUWIN32__) && !defined(__SALFORDC__) && !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
+#if !defined(__GNUWIN32__) && !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
     #include <direct.h>
 
     #ifndef __MWERKS__

diff --git a/src/msw/utilsexc.cpp b/src/msw/utilsexc.cpp
index 703088a463d8b37d3c111e471f3c8e01e1913258..fa2c29b35170dcbc5d6f85742ee50cea71aa4dbd 100644 (file)
--- a/src/msw/utilsexc.cpp
+++ b/src/msw/utilsexc.cpp
@@ -44,7 +44,7 @@
 
 #include <ctype.h>
 
-#if !defined(__GNUWIN32__) && !defined(__SALFORDC__) && !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
+#if !defined(__GNUWIN32__) && !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
     #include <direct.h>
 #ifndef __MWERKS__
     #include <dos.h>

diff --git a/src/msw/wince/tbarwce.cpp b/src/msw/wince/tbarwce.cpp
index 15e6d13c34f95fdd3e04936b13e2bc6ac9489922..ce45117cf40ba03f216efab6bec83268ffbaa4d8 100644 (file)
--- 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