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

29
src/generic/dirctrlg.cpp
View File

@@ -204,24 +204,7 @@ size_t wxGetAvailableDrives(wxArrayString &paths, wxArrayString &names, wxArrayI
// wxIsDriveAvailable
// ----------------------------------------------------------------------------
#if defined(__DOS__)
bool wxIsDriveAvailable(const wxString& dirName)
{
if ( dirName.length() == 3 && dirName[1u] == wxT(':') )
{
wxString dirNameLower(dirName.Lower());
// VS: always return true for removable media, since Win95 doesn't
// like it when MS-DOS app accesses empty floppy drive
return (dirNameLower[0u] == wxT('a') ||
dirNameLower[0u] == wxT('b') ||
wxDirExists(dirNameLower));
}
else
return true;
}
#elif defined(__WINDOWS__)
#if defined(__WINDOWS__)
int setdrive(int drive)
{
@@ -444,7 +427,7 @@ bool wxGenericDirCtrl::Create(wxWindow *parent,
wxString rootName;
#if defined(__WINDOWS__) || defined(__DOS__)
#if defined(__WINDOWS__)
rootName = _("Computer");
#else
rootName = _("Sections");
@@ -702,7 +685,7 @@ void wxGenericDirCtrl::PopulateNode(wxTreeItemId parentId)
wxString dirName(data->m_path);
#if defined(__WINDOWS__) || defined(__DOS__)
#if defined(__WINDOWS__)
// Check if this is a root directory and if so,
// whether the drive is available.
if (!wxIsDriveAvailable(dirName))
@@ -716,7 +699,7 @@ void wxGenericDirCtrl::PopulateNode(wxTreeItemId parentId)
// This may take a longish time. Go to busy cursor
wxBusyCursor busy;
#if defined(__WINDOWS__) || defined(__DOS__)
#if defined(__WINDOWS__)
if (dirName.Last() == ':')
dirName += wxString(wxFILE_SEP_PATH);
#endif
@@ -866,7 +849,7 @@ wxTreeItemId wxGenericDirCtrl::FindChild(wxTreeItemId parentId, const wxString&
path2 += wxString(wxFILE_SEP_PATH);
// In MSW case is not significant
#if defined(__WINDOWS__) || defined(__DOS__)
#if defined(__WINDOWS__)
path2.MakeLower();
#endif
@@ -883,7 +866,7 @@ wxTreeItemId wxGenericDirCtrl::FindChild(wxTreeItemId parentId, const wxString&
childPath += wxString(wxFILE_SEP_PATH);
// In MSW case is not significant
#if defined(__WINDOWS__) || defined(__DOS__)
#if defined(__WINDOWS__)
childPath.MakeLower();
#endif