X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3bd8a40543a03914e55a532a8bc600b5d77d6859..f15fa3a93ffd477077d1255ebd9d6335758021c4:/src/generic/dirctrlg.cpp diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp index 3394172477..1d77415609 100644 --- a/src/generic/dirctrlg.cpp +++ b/src/generic/dirctrlg.cpp @@ -9,10 +9,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "dirctrlg.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -167,9 +163,19 @@ size_t wxGetAvailableDrives(wxArrayString &paths, wxArrayString &names, wxArrayI path.Printf(wxT("%c:\\"), 'A' + i); name.Printf(wxT("%c:"), 'A' + i); + // Note: If _filesys is unsupported by some compilers, + // we can always replace it by DosQueryFSAttach + char filesysname[20]; + _filesys(name.fn_str(), filesysname, sizeof(filesysname)); + /* FAT, LAN, HPFS, CDFS, NFS */ int imageId; if (path == wxT("A:\\") || path == wxT("B:\\")) imageId = wxFileIconsTable::floppy; + else if (!strcmp(filesysname, "CDFS")) + imageId = wxFileIconsTable::cdrom; + else if (!strcmp(filesysname, "LAN") || + !strcmp(filesysname, "NFS")) + imageId = wxFileIconsTable::drive; else imageId = wxFileIconsTable::drive; paths.Add(path); @@ -259,7 +265,7 @@ bool wxIsDriveAvailable(const wxString& dirName) // like it when MS-DOS app accesses empty floppy drive return (dirNameLower[0u] == wxT('a') || dirNameLower[0u] == wxT('b') || - wxPathExists(dirNameLower)); + wxDirExists(dirNameLower)); } else #endif @@ -268,10 +274,9 @@ bool wxIsDriveAvailable(const wxString& dirName) #elif defined(__WINDOWS__) || defined(__OS2__) -int setdrive(int drive) +int setdrive(int WXUNUSED_IN_WINCE(drive)) { #ifdef __WXWINCE__ - wxUnusedVar(drive); return 0; #elif defined(__GNUWIN32__) && \ (defined(__MINGW32_MAJOR_VERSION) && __MINGW32_MAJOR_VERSION >= 1) @@ -301,10 +306,9 @@ int setdrive(int drive) #endif // !GNUWIN32 } -bool wxIsDriveAvailable(const wxString& dirName) +bool wxIsDriveAvailable(const wxString& WXUNUSED_IN_WINCE(dirName)) { #ifdef __WXWINCE__ - wxUnusedVar(dirName); return false; #else #ifdef __WIN32__ @@ -318,7 +322,7 @@ bool wxIsDriveAvailable(const wxString& dirName) { wxString dirNameLower(dirName.Lower()); #if defined(__GNUWIN32__) && !(defined(__MINGW32_MAJOR_VERSION) && __MINGW32_MAJOR_VERSION >= 1) - success = wxPathExists(dirNameLower); + success = wxDirExists(dirNameLower); #else #if defined(__OS2__) // Avoid changing to drive since no media may be inserted. @@ -826,8 +830,6 @@ 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()) @@ -861,7 +863,7 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId) size_t i; for (i = 0; i < dirs.Count(); i++) { - wxString eachFilename(dirs[i]); + eachFilename = dirs[i]; path = dirName; if (!wxEndsWithPathSeparator(path)) path += wxString(wxFILE_SEP_PATH); @@ -890,7 +892,7 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId) { for (i = 0; i < filenames.Count(); i++) { - wxString eachFilename(filenames[i]); + eachFilename = filenames[i]; path = dirName; if (!wxEndsWithPathSeparator(path)) path += wxString(wxFILE_SEP_PATH); @@ -993,48 +995,46 @@ bool wxGenericDirCtrl::ExpandPath(const wxString& path) if (id.IsOk()) lastId = id; } - if (lastId.IsOk()) + if (!lastId.IsOk()) + return false; + + wxDirItemData *data = (wxDirItemData *) m_treeCtrl->GetItemData(lastId); + if (data->m_isDir) { - wxDirItemData *data = (wxDirItemData *) m_treeCtrl->GetItemData(lastId); - if (data->m_isDir) - { - m_treeCtrl->Expand(lastId); - } - if ((GetWindowStyle() & wxDIRCTRL_SELECT_FIRST) && data->m_isDir) + m_treeCtrl->Expand(lastId); + } + if ((GetWindowStyle() & wxDIRCTRL_SELECT_FIRST) && data->m_isDir) + { + // Find the first file in this directory + wxTreeItemIdValue cookie; + wxTreeItemId childId = m_treeCtrl->GetFirstChild(lastId, cookie); + bool selectedChild = false; + while (childId.IsOk()) { - // Find the first file in this directory - wxTreeItemIdValue cookie; - wxTreeItemId childId = m_treeCtrl->GetFirstChild(lastId, cookie); - bool selectedChild = false; - while (childId.IsOk()) - { - wxDirItemData* data = (wxDirItemData*) m_treeCtrl->GetItemData(childId); + data = (wxDirItemData*) m_treeCtrl->GetItemData(childId); - if (data && data->m_path != wxEmptyString && !data->m_isDir) - { - m_treeCtrl->SelectItem(childId); - m_treeCtrl->EnsureVisible(childId); - selectedChild = true; - break; - } - childId = m_treeCtrl->GetNextChild(lastId, cookie); - } - if (!selectedChild) + if (data && data->m_path != wxEmptyString && !data->m_isDir) { - m_treeCtrl->SelectItem(lastId); - m_treeCtrl->EnsureVisible(lastId); + m_treeCtrl->SelectItem(childId); + m_treeCtrl->EnsureVisible(childId); + selectedChild = true; + break; } + childId = m_treeCtrl->GetNextChild(lastId, cookie); } - else + if (!selectedChild) { m_treeCtrl->SelectItem(lastId); m_treeCtrl->EnsureVisible(lastId); } - - return true; } else - return false; + { + m_treeCtrl->SelectItem(lastId); + m_treeCtrl->EnsureVisible(lastId); + } + + return true; } wxString wxGenericDirCtrl::GetPath() const @@ -1295,32 +1295,70 @@ void wxDirFilterListCtrl::FillFilterList(const wxString& filter, int defaultFilt // ---------------------------------------------------------------------------- #ifndef __WXGTK24__ -/* Computer */ +/* Computer (c) Julian Smart */ static const char * file_icons_tbl_computer_xpm[] = { -"16 16 7 1", -" s None c None", -". c #808080", -"X c #c0c0c0", -"o c Black", -"O c Gray100", -"+ c #008080", -"@ c Blue", -" ........... ", -" .XXXXXXXXXX.o", -" .OOOOOOOOO..o", -" .OoooooooX..o", -" .Oo+...@+X..o", -" .Oo+XXX.+X..o", -" .Oo+....+X..o", -" .Oo++++++X..o", -" .OXXXXXXXX.oo", -" ..........o.o", -" ...........Xo", -" .XXXXXXXXXX.o", -" .o.o.o.o.o...o", -" .oXoXoXoXoXo.o ", -".XOXXXXXXXXX.o ", -"............o "}; +/* columns rows colors chars-per-pixel */ +"16 16 42 1", +"r c #4E7FD0", +"$ c #7198D9", +"; c #DCE6F6", +"q c #FFFFFF", +"u c #4A7CCE", +"# c #779DDB", +"w c #95B2E3", +"y c #7FA2DD", +"f c #3263B4", +"= c #EAF0FA", +"< c #B1C7EB", +"% c #6992D7", +"9 c #D9E4F5", +"o c #9BB7E5", +"6 c #F7F9FD", +", c #BED0EE", +"3 c #F0F5FC", +"1 c #A8C0E8", +" c None", +"0 c #FDFEFF", +"4 c #C4D5F0", +"@ c #81A4DD", +"e c #4377CD", +"- c #E2EAF8", +"i c #9FB9E5", +"> c #CCDAF2", +"+ c #89A9DF", +"s c #5584D1", +"t c #5D89D3", +": c #D2DFF4", +"5 c #FAFCFE", +"2 c #F5F8FD", +"8 c #DFE8F7", +"& c #5E8AD4", +"X c #638ED5", +"a c #CEDCF2", +"p c #90AFE2", +"d c #2F5DA9", +"* c #5282D0", +"7 c #E5EDF9", +". c #A2BCE6", +"O c #8CACE0", +/* pixels */ +" ", +" .XXXXXXXXXXX ", +" oXO++@#$%&*X ", +" oX=-;:>,<1%X ", +" oX23=-;:4,$X ", +" oX5633789:@X ", +" oX05623=78+X ", +" oXqq05623=OX ", +" oX,,,,,<<<$X ", +" wXXXXXXXXXXe ", +" XrtX%$$y@+O,, ", +" uyiiiiiiiii@< ", +" ouiiiiiiiiiip