Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50960 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-12-31 10:05:00 +00:00
parent f396e5a7ca
commit f172cb8200
43 changed files with 37 additions and 528 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
distrib/msw/msw_minimal.rsp
View File

@@ -195,10 +195,6 @@ src/makelib.vc
src/makeg95.env src/makeg95.env
src/makeprog.g95 src/makeprog.g95
src/makelib.g95 src/makelib.g95
src/makesl.env
src/makeprog.sl
src/makelib.sl
src/salford.lnk
src/maketwin.env src/maketwin.env
src/makefile.bcc src/makefile.bcc
src/makefile.vc src/makefile.vc

4
distrib/scripts/manifests/msw_minimal.rsp
View File

@@ -193,10 +193,6 @@ src/makelib.vc
src/makeg95.env src/makeg95.env
src/makeprog.g95 src/makeprog.g95
src/makelib.g95 src/makelib.g95
src/makesl.env
src/makeprog.sl
src/makelib.sl
src/salford.lnk
src/maketwin.env src/maketwin.env
src/makefile.bcc src/makefile.bcc
src/makefile.vc src/makefile.vc

9
include/wx/defs.h
View File

@@ -103,15 +103,6 @@
#endif /* VC++ 8 */ #endif /* VC++ 8 */
#endif /* __VISUALC__ */ #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 */ /* suppress some Borland C++ warnings */
#ifdef __BORLANDC__ #ifdef __BORLANDC__
# pragma warn -inl /* Functions containing reserved words and certain constructs are not expanded inline */ # pragma warn -inl /* Functions containing reserved words and certain constructs are not expanded inline */

3
include/wx/dirdlg.h
View File

@@ -96,8 +96,7 @@ protected:
#if defined(__WXUNIVERSAL__) #if defined(__WXUNIVERSAL__)
#include "wx/generic/dirdlgg.h" #include "wx/generic/dirdlgg.h"
#define wxDirDialog wxGenericDirDialog #define wxDirDialog wxGenericDirDialog
#elif defined(__WXMSW__) && (defined(__SALFORDC__) || \ #elif defined(__WXMSW__) && (!wxUSE_OLE || \
!wxUSE_OLE || \
(defined (__GNUWIN32__) && !wxUSE_NORLANDER_HEADERS)) (defined (__GNUWIN32__) && !wxUSE_NORLANDER_HEADERS))
#include "wx/generic/dirdlgg.h" #include "wx/generic/dirdlgg.h"
#define wxDirDialog wxGenericDirDialog #define wxDirDialog wxGenericDirDialog

7
include/wx/filefn.h
View File

@@ -60,7 +60,7 @@
#endif #endif
#if defined(__WINDOWS__) && !defined(__WXMICROWIN__) #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 <direct.h>
#include <dos.h> #include <dos.h>
#include <io.h> #include <io.h>
@@ -85,11 +85,6 @@
#include <dir.h> #include <dir.h>
#endif #endif
#ifdef __SALFORDC__
#include <dir.h>
#include <unix.h>
#endif
#ifndef __WXPALMOS5__ #ifndef __WXPALMOS5__
#ifndef __WXWINCE__ #ifndef __WXWINCE__
#include <fcntl.h> // O_RDONLY &c #include <fcntl.h> // O_RDONLY &c

4
include/wx/list.h
View File

@@ -548,10 +548,6 @@ protected:
void *data, void *data,
const wxListKey& key = wxDefaultListKey) = 0; const wxListKey& key = wxDefaultListKey) = 0;
// Can't access these from derived classes otherwise (bug in Salford C++?)
#ifdef __SALFORDC__
public:
#endif
// ctors // ctors
// from an array // from an array

2
include/wx/string.h
View File

@@ -133,8 +133,6 @@ inline int Stricmp(const char *psz1, const char *psz2)
return _stricmp(psz1, psz2); return _stricmp(psz1, psz2);
#elif defined(__SC__) #elif defined(__SC__)
return _stricmp(psz1, psz2); return _stricmp(psz1, psz2);
#elif defined(__SALFORDC__)
return stricmp(psz1, psz2);
#elif defined(__BORLANDC__) #elif defined(__BORLANDC__)
return stricmp(psz1, psz2); return stricmp(psz1, psz2);
#elif defined(__WATCOMC__) #elif defined(__WATCOMC__)

2
include/wx/wxcrtbase.h
View File

@@ -229,7 +229,7 @@ WXDLLIMPEXP_BASE void *calloc( size_t num, size_t size );
* versions */ * versions */
#if !defined(wxCRT_StricmpA) #if !defined(wxCRT_StricmpA)
#if defined(__BORLANDC__) || defined(__WATCOMC__) || \ #if defined(__BORLANDC__) || defined(__WATCOMC__) || \
defined(__SALFORDC__) || defined(__VISAGECPP__) || \ defined(__VISAGECPP__) || \
defined(__EMX__) || defined(__DJGPP__) defined(__EMX__) || defined(__DJGPP__)
#define wxCRT_StricmpA stricmp #define wxCRT_StricmpA stricmp
#define wxCRT_StrnicmpA strnicmp #define wxCRT_StrnicmpA strnicmp

14
samples/calendar/makefile.sl
View File

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

14
samples/dragimag/makefile.sl
View File

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

18
samples/erase/makefile.sl
View File

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

14
samples/event/makefile.sl
View File

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

14
samples/exec/makefile.sl
View File

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

14
samples/grid/makefile.sl
View File

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

14
samples/joytest/makefile.sl
View File

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

18
samples/mdi/makefile.sl
View File

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

18
samples/minimal/makefile.sl
View File

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

14
samples/notebook/makefile.sl
View File

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

14
samples/sashtest/makefile.sl
View File

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

14
samples/shaped/makefile.sl
View File

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

14
samples/splitter/makefile.sl
View File

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

14
samples/statbar/makefile.sl
View File

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

14
samples/thread/makefile.sl
View File

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

14
samples/toolbar/makefile.sl
View File

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

14
samples/typetest/makefile.sl
View File

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

14
samples/wizard/makefile.sl
View File

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

64
src/common/file.cpp
View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: file.cpp // Name: src/common/file.cpp
// Purpose: wxFile - encapsulates low-level "file descriptor" // Purpose: wxFile - encapsulates low-level "file descriptor"
// wxTempFile // wxTempFile
// Author: Vadim Zeitlin // Author: Vadim Zeitlin
@@ -26,28 +26,26 @@
// standard // standard
#if defined(__WXMSW__) && !defined(__GNUWIN32__) && !defined(__WXMICROWIN__) && !defined(__WXWINCE__) #if defined(__WXMSW__) && !defined(__GNUWIN32__) && !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
#ifndef __SALFORDC__ #define WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN #define NOSERVICE
#define NOSERVICE #define NOIME
#define NOIME #define NOATOM
#define NOATOM #define NOGDI
#define NOGDI #define NOGDICAPMASKS
#define NOGDICAPMASKS #define NOMETAFILE
#define NOMETAFILE #define NOMINMAX
#define NOMINMAX #define NOMSG
#define NOMSG #define NOOPENFILE
#define NOOPENFILE #define NORASTEROPS
#define NORASTEROPS #define NOSCROLL
#define NOSCROLL #define NOSOUND
#define NOSOUND #define NOSYSMETRICS
#define NOSYSMETRICS #define NOTEXTMETRIC
#define NOTEXTMETRIC #define NOWH
#define NOWH #define NOCOMM
#define NOCOMM #define NOKANJI
#define NOKANJI #define NOCRYPT
#define NOCRYPT #define NOMCX
#define NOMCX
#endif
#elif defined(__WXMSW__) && defined(__WXWINCE__) #elif defined(__WXMSW__) && defined(__WXWINCE__)
#include "wx/msw/missing.h" #include "wx/msw/missing.h"
@@ -99,18 +97,6 @@
}; };
#endif // W_OK #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 // wxWidgets
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/string.h" #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 // otherwise we only create the new file and fail if it already exists
int fd = wxOpen( fileName, int fd = wxOpen( fileName,
O_BINARY | O_WRONLY | O_CREAT | O_BINARY | O_WRONLY | O_CREAT |
(bOverwrite ? O_TRUNC : O_EXCL) (bOverwrite ? O_TRUNC : O_EXCL),
ACCESS(accessMode) ); accessMode );
if ( fd == -1 ) if ( fd == -1 )
{ {
wxLogSysError(_("can't create file '%s'"), fileName); 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; accessMode &= wxS_IRUSR | wxS_IWUSR;
#endif // __WINDOWS__ #endif // __WINDOWS__
int fd = wxOpen( fileName, flags ACCESS(accessMode)); int fd = wxOpen( fileName, flags, accessMode);
if ( fd == -1 ) if ( fd == -1 )
{ {
@@ -435,7 +421,7 @@ bool wxFile::Eof() const
wxFileOffset iRc; 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 // @@ this doesn't work, of course, on unseekable file descriptors
wxFileOffset ofsCur = Tell(), wxFileOffset ofsCur = Tell(),
ofsMax = Length(); ofsMax = Length();

6
src/common/imagbmp.cpp
View File

@@ -38,12 +38,6 @@
// For memcpy // For memcpy
#include <string.h> #include <string.h>
#ifdef __SALFORDC__
#ifdef FAR
#undef FAR
#endif
#endif
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// wxBMPHandler // wxBMPHandler
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

4
src/common/imagjpeg.cpp
View File

@@ -57,10 +57,6 @@ typedef boolean wxjpeg_boolean;
// For JPEG library error handling // For JPEG library error handling
#include <setjmp.h> #include <setjmp.h>
#ifdef __SALFORDC__
#undef FAR
#endif
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// types // types
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

8
src/common/imagpng.cpp
View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: src/common/imagepng.cpp // Name: src/common/imagpng.cpp
// Purpose: wxImage PNG handler // Purpose: wxImage PNG handler
// Author: Robert Roebling // Author: Robert Roebling
// RCS-ID: $Id$ // RCS-ID: $Id$
@@ -42,12 +42,6 @@
// For memcpy // For memcpy
#include <string.h> #include <string.h>
#ifdef __SALFORDC__
#ifdef FAR
#undef FAR
#endif
#endif
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// constants // constants
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

2
src/common/memory.cpp
View File

@@ -39,7 +39,7 @@
#include "wx/ioswrap.h" #include "wx/ioswrap.h"
#if !defined(__WATCOMC__) && !(defined(__VMS__) && ( __VMS_VER < 70000000 ) )\ #if !defined(__WATCOMC__) && !(defined(__VMS__) && ( __VMS_VER < 70000000 ) )\
&& !defined( __MWERKS__ ) && !defined(__SALFORDC__) && !defined( __MWERKS__ )
#include <memory.h> #include <memory.h>
#endif #endif

2
src/common/sckaddr.cpp
View File

@@ -27,7 +27,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <ctype.h> #include <ctype.h>
#if !defined(__MWERKS__) && !defined(__SALFORDC__) #if !defined(__MWERKS__)
#include <memory.h> #include <memory.h>
#endif #endif
#endif // !WX_PRECOMP #endif // !WX_PRECOMP

4
src/common/strconv.cpp
View File

@@ -44,10 +44,6 @@
#define wxHAVE_WIN32_MB2WC #define wxHAVE_WIN32_MB2WC
#endif #endif
#ifdef __SALFORDC__
#include <clib.h>
#endif
#ifdef HAVE_ICONV #ifdef HAVE_ICONV
#include <iconv.h> #include <iconv.h>
#include "wx/thread.h" #include "wx/thread.h"

4
src/common/string.cpp
View File

@@ -35,10 +35,6 @@
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#ifdef __SALFORDC__
#include <clib.h>
#endif
#include "wx/hashmap.h" #include "wx/hashmap.h"
// string handling functions used by wxString: // string handling functions used by wxString:

4
src/common/stringimpl.cpp
View File

@@ -42,10 +42,6 @@
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#ifdef __SALFORDC__
#include <clib.h>
#endif
// allocating extra space for each string consumes more memory but speeds up // allocating extra space for each string consumes more memory but speeds up
// the concatenation operations (nLen is the current string's length) // the concatenation operations (nLen is the current string's length)
// NB: EXTRA_ALLOC must be >= 0! // NB: EXTRA_ALLOC must be >= 0!

4
src/common/valtext.cpp
View File

@@ -33,10 +33,6 @@
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#ifdef __SALFORDC__
#include <clib.h>
#endif
IMPLEMENT_DYNAMIC_CLASS(wxTextValidator, wxValidator) IMPLEMENT_DYNAMIC_CLASS(wxTextValidator, wxValidator)
BEGIN_EVENT_TABLE(wxTextValidator, wxValidator) BEGIN_EVENT_TABLE(wxTextValidator, wxValidator)

2
src/msw/app.cpp
View File

@@ -61,7 +61,7 @@
// OLE is used for drag-and-drop, clipboard, OLE Automation..., but some // OLE is used for drag-and-drop, clipboard, OLE Automation..., but some
// compilers don't support it (missing headers, libs, ...) // 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 #undef wxUSE_OLE
#define wxUSE_OLE 0 #define wxUSE_OLE 0

2
src/msw/dib.cpp
View File

@@ -45,7 +45,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#if !defined(__MWERKS__) && !defined(__SALFORDC__) #if !defined(__MWERKS__)
#include <memory.h> #include <memory.h>
#endif #endif

2
src/msw/printwin.cpp
View File

@@ -180,7 +180,7 @@ bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt
wxWindow *win = CreateAbortWindow(parent, printout); wxWindow *win = CreateAbortWindow(parent, printout);
wxYield(); wxYield();
#if defined(__WATCOMC__) || defined(__BORLANDC__) || defined(__GNUWIN32__) || defined(__SALFORDC__) || !defined(__WIN32__) #if defined(__WATCOMC__) || defined(__BORLANDC__) || defined(__GNUWIN32__) || !defined(__WIN32__)
#ifdef STRICT #ifdef STRICT
::SetAbortProc((HDC) impl->GetHDC(), (ABORTPROC) m_lpAbortProc); ::SetAbortProc((HDC) impl->GetHDC(), (ABORTPROC) m_lpAbortProc);
#else #else

152
src/msw/salford.lnk
View File

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

2
src/msw/utils.cpp
View File

@@ -55,7 +55,7 @@
#include <winsock.h> #include <winsock.h>
#endif #endif
#if !defined(__GNUWIN32__) && !defined(__SALFORDC__) && !defined(__WXMICROWIN__) && !defined(__WXWINCE__) #if !defined(__GNUWIN32__) && !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
#include <direct.h> #include <direct.h>
#ifndef __MWERKS__ #ifndef __MWERKS__

2
src/msw/utilsexc.cpp
View File

@@ -44,7 +44,7 @@
#include <ctype.h> #include <ctype.h>
#if !defined(__GNUWIN32__) && !defined(__SALFORDC__) && !defined(__WXMICROWIN__) && !defined(__WXWINCE__) #if !defined(__GNUWIN32__) && !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
#include <direct.h> #include <direct.h>
#ifndef __MWERKS__ #ifndef __MWERKS__
#include <dos.h> #include <dos.h>

2
src/msw/wince/tbarwce.cpp
View File

@@ -42,7 +42,7 @@
#include "wx/control.h" #include "wx/control.h"
#endif #endif
#if !defined(__GNUWIN32__) && !defined(__SALFORDC__) #if !defined(__GNUWIN32__)
#include "malloc.h" #include "malloc.h"
#endif #endif