X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3fa4bd0e78b0607dc7c89deebbef2377658874bd..6342bd1ab36c1957684c00d408d09fba65d33db6:/src/generic/dirctrlg.cpp diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp index cab585c310..2a98d67f83 100644 --- a/src/generic/dirctrlg.cpp +++ b/src/generic/dirctrlg.cpp @@ -47,6 +47,7 @@ #include "wx/generic/dirctrlg.h" #ifdef __WXMSW__ +#include #include #include #include @@ -121,9 +122,9 @@ static char * icon3_xpm[] = { /* width height ncolors chars_per_pixel */ "16 16 3 1", /* colors */ -" s None c None", -". c #000000", -"+ c #ffffff", +" s None c None", +". c #000000", +"+ c #ffffff", /* pixels */ " ", " ........ ", @@ -145,13 +146,13 @@ static char * icon3_xpm[] = { /* Computer */ static char * icon4_xpm[] = { "16 16 7 1", -" s None c None", -". c #808080", -"X c #c0c0c0", -"o c Black", -"O c Gray100", -"+ c #008080", -"@ c Blue", +" s None c None", +". c #808080", +"X c #c0c0c0", +"o c Black", +"O c Gray100", +"+ c #008080", +"@ c Blue", " ........... ", " .XXXXXXXXXX.o", " .OOOOOOOOO..o", @@ -172,13 +173,13 @@ static char * icon4_xpm[] = { /* Drive */ static char * icon5_xpm[] = { "16 16 7 1", -" s None c None", -". c #808080", -"X c #c0c0c0", -"o c Black", -"O c Gray100", -"+ c Green", -"@ c #008000", +" s None c None", +". c #808080", +"X c #c0c0c0", +"o c Black", +"O c Gray100", +"+ c Green", +"@ c #008000", " ", " ", " ", @@ -199,16 +200,16 @@ static char * icon5_xpm[] = { /* CD-ROM */ static char *icon6_xpm[] = { "16 16 10 1", -" s None c None", -". c #808080", -"X c #c0c0c0", -"o c Yellow", -"O c Blue", -"+ c Black", -"@ c Gray100", -"# c #008080", -"$ c Green", -"% c #008000", +" s None c None", +". c #808080", +"X c #c0c0c0", +"o c Yellow", +"O c Blue", +"+ c Black", +"@ c Gray100", +"# c #008080", +"$ c Green", +"% c #008000", " ... ", " ..XoX.. ", " .O.XoXXX+ ", @@ -229,13 +230,13 @@ static char *icon6_xpm[] = { /* Floppy */ static char * icon7_xpm[] = { "16 16 7 1", -" s None c None", -". c #808080", -"X c Gray100", -"o c #c0c0c0", -"O c Black", -"+ c Cyan", -"@ c Red", +" s None c None", +". c #808080", +"X c Gray100", +"o c #c0c0c0", +"O c Black", +"+ c Cyan", +"@ c Red", " ......X", " .ooooooO", " .+++++OO", @@ -256,13 +257,13 @@ static char * icon7_xpm[] = { /* Removeable */ static char * icon8_xpm[] = { "16 16 7 1", -" s None c None", -". c #808080", -"X c #c0c0c0", -"o c Black", -"O c Gray100", -"+ c Red", -"@ c #800000", +" s None c None", +". c #808080", +"X c #c0c0c0", +"o c Black", +"O c Gray100", +"+ c Red", +"@ c #800000", " ", " ", " ", @@ -288,6 +289,37 @@ static const int ID_CANCEL = 1003; static const int ID_NEW = 1004; //static const int ID_CHECK = 1005; +#ifdef __WXMSW__ +static bool wxIsDriveAvailable(const wxString dirName) +{ +#ifdef __WIN32__ + UINT errorMode = SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOOPENFILEERRORBOX); +#endif + bool success = TRUE; + + // Check if this is a root directory and if so, + // whether the drive is avaiable. + if (dirName.Len() == 3 && dirName[(size_t)1] == wxT(':')) + { + wxString dirNameLower(dirName.Lower()); + int currentDrive = _getdrive(); + int thisDrive = (int) (dirNameLower[(size_t)0] - 'a' + 1) ; + int err = _chdrive( thisDrive ) ; + _chdrive( currentDrive ); + + if (err == -1) + { + success = FALSE; + } + } +#ifdef __WIN32__ + (void) SetErrorMode(errorMode); +#endif + + return success; +} +#endif + //----------------------------------------------------------------------------- // wxDirItemDataEx //----------------------------------------------------------------------------- @@ -319,7 +351,24 @@ void wxDirItemDataEx::SetNewDirName( wxString path ) bool wxDirItemDataEx::HasSubDirs() { - wxString search = m_path + wxT("/*"); + if (m_path.IsEmpty()) + return TRUE; + + // On WIN32, must check if this volume is mounted or + // we get an error dialog for e.g. drive a: +#ifdef __WIN32__ + if (!wxIsDriveAvailable(m_path)) + return FALSE; +#endif + + wxString search = m_path; + + if (m_path.Last() != wxFILE_SEP_PATH) + { + search += wxString(wxFILE_SEP_PATH); + } + search += wxT("*"); + wxLogNull log; wxString path = wxFindFirstFile( search, wxDIR ); return (bool)(!path.IsNull()); @@ -393,14 +442,14 @@ bool wxGenericDirCtrl::Create(wxWindow *parent, m_imageList->Add(wxIcon(icon7_xpm)); m_imageList->Add(wxIcon(icon8_xpm)); #elif defined(__WXMSW__) - m_imageList->Add(wxIcon(wxT("wxICON_SMALL_CLOSED_FOLDER"), wxBITMAP_TYPE_RESOURCE)); - m_imageList->Add(wxIcon(wxT("wxICON_SMALL_OPEN_FOLDER"), wxBITMAP_TYPE_RESOURCE)); - m_imageList->Add(wxIcon(wxT("wxICON_SMALL_FILE"), wxBITMAP_TYPE_RESOURCE)); - m_imageList->Add(wxIcon(wxT("wxICON_SMALL_COMPUTER"), wxBITMAP_TYPE_RESOURCE)); - m_imageList->Add(wxIcon(wxT("wxICON_SMALL_DRIVE"), wxBITMAP_TYPE_RESOURCE)); - m_imageList->Add(wxIcon(wxT("wxICON_SMALL_CDROM"), wxBITMAP_TYPE_RESOURCE)); - m_imageList->Add(wxIcon(wxT("wxICON_SMALL_FLOPPY"), wxBITMAP_TYPE_RESOURCE)); - m_imageList->Add(wxIcon(wxT("wxICON_SMALL_REMOVEABLE"), wxBITMAP_TYPE_RESOURCE)); + m_imageList->Add(wxIcon(wxT("wxICON_SMALL_CLOSED_FOLDER"), wxBITMAP_TYPE_ICO_RESOURCE)); + m_imageList->Add(wxIcon(wxT("wxICON_SMALL_OPEN_FOLDER"), wxBITMAP_TYPE_ICO_RESOURCE)); + m_imageList->Add(wxIcon(wxT("wxICON_SMALL_FILE"), wxBITMAP_TYPE_ICO_RESOURCE)); + m_imageList->Add(wxIcon(wxT("wxICON_SMALL_COMPUTER"), wxBITMAP_TYPE_ICO_RESOURCE)); + m_imageList->Add(wxIcon(wxT("wxICON_SMALL_DRIVE"), wxBITMAP_TYPE_ICO_RESOURCE)); + m_imageList->Add(wxIcon(wxT("wxICON_SMALL_CDROM"), wxBITMAP_TYPE_ICO_RESOURCE)); + m_imageList->Add(wxIcon(wxT("wxICON_SMALL_FLOPPY"), wxBITMAP_TYPE_ICO_RESOURCE)); + m_imageList->Add(wxIcon(wxT("wxICON_SMALL_REMOVEABLE"), wxBITMAP_TYPE_ICO_RESOURCE)); #else #error "Sorry, we don't have icons available for this platforms." #endif @@ -513,9 +562,6 @@ void wxGenericDirCtrl::SetupSections() int drive; int currentDrive; - /* Save current drive. */ - currentDrive = _getdrive(); - /* If we can switch to the drive, it exists. */ for( drive = 1; drive <= 26; drive++ ) { @@ -523,15 +569,12 @@ void wxGenericDirCtrl::SetupSections() path.Printf(wxT("%c:\\"), (char) (drive + 'a' - 1)); name.Printf(wxT("(%c:)"), (char) (drive + 'a' - 1)); - if( !_chdrive( drive ) ) + if (wxIsDriveAvailable(path)) { AddSection(path, name); } } - - /* Restore original drive.*/ - _chdrive( currentDrive ); #endif #else @@ -581,7 +624,7 @@ void wxGenericDirCtrl::OnEndEditItem(wxTreeEvent &event) wxASSERT( data ); wxString new_name( wxPathOnly( data->m_path ) ); - new_name += wxT("/"); + new_name += wxString(wxFILE_SEP_PATH); new_name += event.GetLabel(); wxLogNull log; @@ -658,19 +701,11 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId) #ifdef __WXMSW__ // Check if this is a root directory and if so, // whether the drive is avaiable. - if (dirName.Len() == 3 && dirName[1] == wxT(':')) + if (!wxIsDriveAvailable(dirName)) { - int currentDrive = _getdrive(); - int thisDrive = (int) (dirName[0] - 'a' + 1) ; - int err = _chdrive( thisDrive ) ; - _chdrive( currentDrive ); - - if (err == -1) - { - data->m_isExpanded = FALSE; - wxMessageBox(wxT("Sorry, this drive is not available.")); - return; - } + data->m_isExpanded = FALSE; + wxMessageBox(wxT("Sorry, this drive is not available.")); + return; } #endif @@ -688,6 +723,7 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId) wxDir d; wxString eachFilename; + wxLogNull log; d.Open(dirName); if (d.IsOpened()) @@ -709,6 +745,8 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId) // Now do the filenames -- but only if we're allowed to if ((GetWindowStyle() & wxDIRCTRL_DIR_ONLY) == 0) { + wxLogNull log; + d.Open(dirName); if (d.IsOpened()) @@ -749,14 +787,18 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId) options = wxDIR_DIRS; } - wxDir dir2(path); - wxString str; - // Have to test for wxDIR_DIRS separately in case m_currentFilterStr is non-empty and - // and filters out any directories - if (dir2.GetFirst(& str, m_currentFilterStr, options) || dir2.GetFirst(& str, wxEmptyString, wxDIR_DIRS)) + wxLogNull log; + wxDir dir2; + if (dir2.Open(path)) { - m_treeCtrl->SetItemHasChildren(id); - } + wxString str; + // Have to test for wxDIR_DIRS separately in case m_currentFilterStr is non-empty and + // and filters out any directories + if (dir2.GetFirst(& str, m_currentFilterStr, options) || dir2.GetFirst(& str, wxEmptyString, wxDIR_DIRS)) + { + m_treeCtrl->SetItemHasChildren(id); + } + } } // Add the sorted filenames @@ -948,6 +990,7 @@ void wxGenericDirCtrl::FindChildFiles(wxTreeItemId id, int dirFlags, wxArrayStri wxDir d; wxString eachFilename; + wxLogNull log; d.Open(dirName); if (d.IsOpened()) @@ -1146,7 +1189,7 @@ wxGenericDirDialog::wxGenericDirDialog(wxWindow* parent, const wxString& title, // 1) dir ctrl m_dirCtrl = new wxGenericDirCtrl(this, ID_DIRCTRL, defaultPath, wxPoint(5, 5), - wxSize(300, 200), wxDIRCTRL_DIR_ONLY); + wxSize(300, 200), wxDIRCTRL_DIR_ONLY|wxSUNKEN_BORDER); topsizer->Add( m_dirCtrl, 1, wxTOP|wxLEFT|wxRIGHT | wxEXPAND, 10 );