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

Enabled handling of drive letters on OS/2.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@24649 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Neis
2003-11-23 22:49:37 +00:00
parent c1f921cc70
commit 810d24ea09
1 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/generic/filedlgg.cpp
View File

@@ -28,9 +28,13 @@
#pragma hdrstop #pragma hdrstop
#endif #endif
#ifdef __EMX__
#define __OS2__
#endif
#if wxUSE_FILEDLG #if wxUSE_FILEDLG
#if !defined(__UNIX__) && !defined(__DOS__) && !defined(__WIN32__) #if !defined(__UNIX__) && !defined(__DOS__) && !defined(__WIN32__) && !defined(__OS2__)
#error wxFileDialog currently only supports Unix, win32 and DOS #error wxFileDialog currently only supports Unix, win32 and DOS
#endif #endif
@@ -419,15 +423,15 @@ int ListCompare( long data1, long data2, long WXUNUSED(data))
return wxStrcmp( fd1->GetName(), fd2->GetName() ); return wxStrcmp( fd1->GetName(), fd2->GetName() );
} }
#ifdef __UNIX__ #if defined(__UNIX__) && !defined(__OS2__)
#define IsTopMostDir(dir) (dir == wxT("/")) #define IsTopMostDir(dir) (dir == wxT("/"))
#endif #endif
#if defined(__DOS__) || defined(__WINDOWS__) #if defined(__DOS__) || defined(__WINDOWS__) || defined (__OS2__)
#define IsTopMostDir(dir) (dir.IsEmpty()) #define IsTopMostDir(dir) (dir.IsEmpty())
#endif #endif
#if defined(__DOS__) || defined(__WINDOWS__) #if defined(__DOS__) || defined(__WINDOWS__) || defined(__OS2__)
extern bool wxIsDriveAvailable(const wxString& dirName); extern bool wxIsDriveAvailable(const wxString& dirName);
#endif #endif
@@ -440,7 +444,7 @@ wxFileData::wxFileData( const wxString &name, const wxString &fname )
m_name = name; m_name = name;
m_fileName = fname; m_fileName = fname;
#if defined(__DOS__) || defined(__WINDOWS__) #if defined(__DOS__) || defined(__WINDOWS__) || defined(__OS2__)
// VS: In case the file is root directory of a volume (e.g. "C:"), // VS: In case the file is root directory of a volume (e.g. "C:"),
// we don't want it stat()ed, since the drive may not be in: // we don't want it stat()ed, since the drive may not be in:
if (name.length() == 2 && name[1u] == wxT(':')) if (name.length() == 2 && name[1u] == wxT(':'))
@@ -455,7 +459,7 @@ wxFileData::wxFileData( const wxString &name, const wxString &fname )
wxStructStat buff; wxStructStat buff;
wxStat( m_fileName, &buff ); wxStat( m_fileName, &buff );
#if defined(__UNIX__) && (!defined( __EMX__ ) && !defined(__VMS)) #if defined(__UNIX__) && (!defined( __OS2__ ) && !defined(__VMS))
struct stat lbuff; struct stat lbuff;
lstat( m_fileName.fn_str(), &lbuff ); lstat( m_fileName.fn_str(), &lbuff );
m_isLink = S_ISLNK( lbuff.st_mode ); m_isLink = S_ISLNK( lbuff.st_mode );
@@ -697,8 +701,10 @@ long wxFileCtrl::Add( wxFileData *fd, wxListItem &item )
void wxFileCtrl::UpdateFiles() void wxFileCtrl::UpdateFiles()
{ {
// don't do anything before ShowModal() call which sets m_dirName // don't do anything before ShowModal() call which sets m_dirName
#ifndef __OS2__
if ( m_dirName.empty() ) if ( m_dirName.empty() )
return; return;
#endif
wxBusyCursor bcur; // this may take a while... wxBusyCursor bcur; // this may take a while...
@@ -729,7 +735,7 @@ void wxFileCtrl::UpdateFiles()
item.m_itemId = 0; item.m_itemId = 0;
item.m_col = 0; item.m_col = 0;
#if defined(__DOS__) || defined(__WINDOWS__) #if defined(__DOS__) || defined(__WINDOWS__) || defined(__OS2__)
if ( IsTopMostDir(m_dirName) ) if ( IsTopMostDir(m_dirName) )
{ {
// Pseudo-directory with all available drives listed... // Pseudo-directory with all available drives listed...
@@ -753,7 +759,7 @@ void wxFileCtrl::UpdateFiles()
if ( !IsTopMostDir(m_dirName) ) if ( !IsTopMostDir(m_dirName) )
{ {
wxString p(wxPathOnly(m_dirName)); wxString p(wxPathOnly(m_dirName));
#ifdef __UNIX__ #if defined(__UNIX__) && !defined(__OS2__)
if (p.IsEmpty()) p = wxT("/"); if (p.IsEmpty()) p = wxT("/");
#endif #endif
fd = new wxFileData( wxT(".."), p ); fd = new wxFileData( wxT(".."), p );
@@ -762,7 +768,7 @@ void wxFileCtrl::UpdateFiles()
} }
wxString dirname(m_dirName); wxString dirname(m_dirName);
#if defined(__DOS__) || defined(__WINDOWS__) #if defined(__DOS__) || defined(__WINDOWS__) || defined(__OS2__)
if (dirname.length() == 2 && dirname[1u] == wxT(':')) if (dirname.length() == 2 && dirname[1u] == wxT(':'))
dirname << wxT('\\'); dirname << wxT('\\');
#endif #endif
@@ -770,7 +776,9 @@ void wxFileCtrl::UpdateFiles()
if ( dir.IsOpened() ) if ( dir.IsOpened() )
{ {
wxString dirPrefix(dirname + wxFILE_SEP_PATH); wxString dirPrefix(dirname);
if (!wxIsPathSeparator(dirPrefix.Last()))
dirPrefix << wxFILE_SEP_PATH;
int hiddenFlag = m_showHidden ? wxDIR_HIDDEN : 0; int hiddenFlag = m_showHidden ? wxDIR_HIDDEN : 0;
bool cont; bool cont;
@@ -816,7 +824,7 @@ void wxFileCtrl::UpdateFiles()
// Finally, enable/disable context-dependent controls: // Finally, enable/disable context-dependent controls:
if ( m_goToParentControl ) if ( m_goToParentControl )
m_goToParentControl->Enable(!IsTopMostDir(m_dirName)); m_goToParentControl->Enable(!IsTopMostDir(m_dirName));
#if defined(__DOS__) || defined(__WINDOWS__) #if defined(__DOS__) || defined(__WINDOWS__) || defined(__OS2__)
if ( m_newDirControl ) if ( m_newDirControl )
m_newDirControl->Enable(!IsTopMostDir(m_dirName)); m_newDirControl->Enable(!IsTopMostDir(m_dirName));
#endif #endif
@@ -883,7 +891,10 @@ void wxFileCtrl::GoToParentDir()
m_dirName.Remove( len-1, 1 ); m_dirName.Remove( len-1, 1 );
wxString fname( wxFileNameFromPath(m_dirName) ); wxString fname( wxFileNameFromPath(m_dirName) );
m_dirName = wxPathOnly( m_dirName ); m_dirName = wxPathOnly( m_dirName );
#ifdef __UNIX__ #if defined(__OS2__)
if (!m_dirName.IsEmpty() && fname.IsEmpty())
m_dirName = wxT("");
#elif defined(__UNIX__)
if (m_dirName.IsEmpty()) if (m_dirName.IsEmpty())
m_dirName = wxT("/"); m_dirName = wxT("/");
#endif #endif