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

Remove remaining MSDOS support code

Browse Source 
The remaining DOS source files where already removed in
26a0a24f38. This removes the remaining __DOS__
and __DJGPP__ (the DOS gcc) code paths.

Closes https://github.com/wxWidgets/wxWidgets/pull/100
This commit is contained in:
Tobias Taschner
2015-09-23 10:00:48 +02:00
committed by Vadim Zeitlin
parent 854fce33a7
commit 2eccc1a57d
16 changed files with 33 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/common/filefn.cpp
View File

@@ -1159,7 +1159,7 @@ bool wxMkdir(const wxString& dir, int perm)
// assume mkdir() has 2 args on non Windows-OS/2 platforms and on Windows too
// for the GNU compiler
#elif (!(defined(__WINDOWS__) || defined(__DOS__))) || \
#elif (!defined(__WINDOWS__)) || \
(defined(__GNUWIN32__) && !defined(__MINGW32__)) || \
defined(__WINE__)
const wxChar *dirname = dir.c_str();
@@ -1169,14 +1169,7 @@ bool wxMkdir(const wxString& dir, int perm)
#else
if ( mkdir(wxFNCONV(dirname), perm) != 0 )
#endif
#elif defined(__DOS__)
const wxChar *dirname = dir.c_str();
#if defined(__DJGPP__)
if ( mkdir(wxFNCONV(dirname), perm) != 0 )
#else
#error "Unsupported DOS compiler!"
#endif
#else // !MSW, !DOS and !OS/2 VAC++
#else // !MSW and !OS/2 VAC++
wxUnusedVar(perm);
if ( wxMkDir(dir.fn_str()) != 0 )
#endif // !MSW/MSW
@@ -1353,16 +1346,6 @@ wxChar *wxDoGetCwd(wxChar *buf, int sz)
}
else // ok, but we might need to massage the path into the right format
{
#ifdef __DJGPP__
// VS: DJGPP is a strange mix of DOS and UNIX API and returns paths
// with / deliminers. We don't like that.
for (wxChar *ch = buf; *ch; ch++)
{
if (*ch == wxT('/'))
*ch = wxT('\\');
}
#endif // __DJGPP__
// MBN: we hope that in the case the user is compiling a GTK+/Motif app,
// he needs Unix as opposed to Win32 pathnames
#if defined( __CYGWIN__ ) && defined( __WINDOWS__ )
@@ -1404,7 +1387,7 @@ wxString wxGetCwd()
bool wxSetWorkingDirectory(const wxString& d)
{
bool success = false;
#if defined(__UNIX__) || defined(__WXMAC__) || defined(__DOS__)
#if defined(__UNIX__) || defined(__WXMAC__)
success = (chdir(wxFNSTRINGCAST d.fn_str()) == 0);
#elif defined(__WINDOWS__)