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

12
src/generic/filedlgg.cpp
View File

@@ -18,7 +18,7 @@
#if wxUSE_FILEDLG
// NOTE : it probably also supports MAC, untested
#if !defined(__UNIX__) && !defined(__DOS__) && !defined(__WIN32__)
#if !defined(__UNIX__) && !defined(__WIN32__)
#error wxGenericFileDialog currently only supports Unix, win32 and DOS
#endif
@@ -70,11 +70,11 @@
#include <time.h>
#if defined(__UNIX__) || defined(__DOS__)
#if defined(__UNIX__)
#include <unistd.h>
#endif
#if defined(__DOS__) || defined(__WINDOWS__)
#if defined(__WINDOWS__)
#define IsTopMostDir(dir) (dir.empty())
#else
#define IsTopMostDir(dir) (dir == wxT("/"))
@@ -103,9 +103,9 @@ wxBEGIN_EVENT_TABLE(wxGenericFileDialog,wxDialog)
EVT_FILECTRL_FILEACTIVATED(ID_FILE_CTRL, wxGenericFileDialog::OnFileActivated)
EVT_UPDATE_UI(ID_UP_DIR, wxGenericFileDialog::OnUpdateButtonsUI)
#if defined(__DOS__) || defined(__WINDOWS__)
#if defined(__WINDOWS__)
EVT_UPDATE_UI(ID_NEW_DIR, wxGenericFileDialog::OnUpdateButtonsUI)
#endif // defined(__DOS__) || defined(__WINDOWS__)
#endif // defined(__WINDOWS__)
wxEND_EVENT_TABLE()
long wxGenericFileDialog::ms_lastViewStyle = wxLC_LIST;
@@ -204,11 +204,9 @@ bool wxGenericFileDialog::Create( wxWindow *parent,
m_upDirButton = AddBitmapButton( ID_UP_DIR, wxART_GO_DIR_UP,
_("Go to parent directory"), buttonsizer );
#ifndef __DOS__ // VS: Home directory is meaningless in MS-DOS...
AddBitmapButton( ID_HOME_DIR, wxART_GO_HOME,
_("Go to home directory"), buttonsizer );
buttonsizer->Add( 20, 20 );
#endif //!__DOS__
m_newDirButton = AddBitmapButton( ID_NEW_DIR, wxART_NEW_DIR,
_("Create new directory"), buttonsizer );