X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/267a7108512069169a855457d027cd68fed5bf2e..19e30148e18cc99296b26503c155e5cef59045f4:/src/generic/dirctrlg.cpp diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp index 173eb12a0e..38c948fc2c 100644 --- a/src/generic/dirctrlg.cpp +++ b/src/generic/dirctrlg.cpp @@ -20,13 +20,14 @@ #pragma hdrstop #endif -#include "wx/defs.h" +#if wxUSE_DIRDLG #include "wx/utils.h" #include "wx/dialog.h" #include "wx/button.h" #include "wx/layout.h" #include "wx/msgdlg.h" +#include "wx/textctrl.h" #include "wx/textdlg.h" #include "wx/filefn.h" #include "wx/cmndata.h" @@ -46,11 +47,37 @@ #include "wx/generic/dirctrlg.h" +#if defined(__WXMAC__) + #include "wx/mac/private.h" // includes mac headers +#endif + #ifdef __WXMSW__ #include + +// FIXME - Mingw32 1.0 has both _getdrive() and _chdrive(). For now, let's assume +// older releases don't, but it should be verified and the checks modified +// accordingly. +#if !defined(__GNUWIN32__) || \ + (defined(__MINGW32_MAJOR_VERSION) && __MINGW32_MAJOR_VERSION >= 1) + #include + #include + #include +#endif + +#endif + +#ifdef __WXPM__ + +#define INCL_BASE +#include #include #include #include + +#endif // __WXPM__ + +#if defined(__WXMAC__) +# include "MoreFilesExtras.h" #endif #ifdef __BORLANDC__ @@ -62,9 +89,8 @@ #undef GetFirstChild #endif -#if !defined(__WXMSW__) || wxUSE_XPM_IN_MSW /* Closed folder */ -static char * icon1_xpm[] = { +static const char * icon1_xpm[] = { /* width height ncolors chars_per_pixel */ "16 16 6 1", /* colors */ @@ -93,7 +119,7 @@ static char * icon1_xpm[] = { " "}; /* Open folder */ -static char * icon2_xpm[] = { +static const char * icon2_xpm[] = { /* width height ncolors chars_per_pixel */ "16 16 6 1", /* colors */ @@ -122,7 +148,7 @@ static char * icon2_xpm[] = { " "}; /* File */ -static char * icon3_xpm[] = { +static const char * icon3_xpm[] = { /* width height ncolors chars_per_pixel */ "16 16 3 1", /* colors */ @@ -148,7 +174,7 @@ static char * icon3_xpm[] = { " "}; /* Computer */ -static char * icon4_xpm[] = { +static const char * icon4_xpm[] = { "16 16 7 1", " s None c None", ". c #808080", @@ -175,7 +201,7 @@ static char * icon4_xpm[] = { "............o "}; /* Drive */ -static char * icon5_xpm[] = { +static const char * icon5_xpm[] = { "16 16 7 1", " s None c None", ". c #808080", @@ -202,7 +228,7 @@ static char * icon5_xpm[] = { " "}; /* CD-ROM */ -static char *icon6_xpm[] = { +static const char *icon6_xpm[] = { "16 16 10 1", " s None c None", ". c #808080", @@ -232,7 +258,7 @@ static char *icon6_xpm[] = { " "}; /* Floppy */ -static char * icon7_xpm[] = { +static const char * icon7_xpm[] = { "16 16 7 1", " s None c None", ". c #808080", @@ -259,7 +285,7 @@ static char * icon7_xpm[] = { " "}; /* Removeable */ -static char * icon8_xpm[] = { +static const char * icon8_xpm[] = { "16 16 7 1", " s None c None", ". c #808080", @@ -284,17 +310,60 @@ static char * icon8_xpm[] = { " ", " ", " "}; -#endif // !wxMSW -static const int ID_DIRCTRL = 1000; -static const int ID_TEXTCTRL = 1001; -static const int ID_OK = 1002; -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) +#if defined(__DOS__) + +bool wxIsDriveAvailable(const wxString& dirName) +{ + // FIXME_MGL - this method leads to hang up under Watcom for some reason +#ifndef __WATCOMC__ + if ( dirName.Len() == 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') || + wxPathExists(dirNameLower)); + } + else +#endif + return TRUE; +} + +#elif defined(__WINDOWS__) || defined(__WXPM__) + +int setdrive(int drive) +{ +#if defined(__GNUWIN32__) && \ + (defined(__MINGW32_MAJOR_VERSION) && __MINGW32_MAJOR_VERSION >= 1) + return _chdrive(drive); +#else + wxChar newdrive[3]; + + if (drive < 1 || drive > 31) + return -1; + newdrive[0] = (wxChar)(wxT('A') + drive - 1); + newdrive[1] = wxT(':'); + newdrive[2] = wxT('\0'); +#if defined(__WXMSW__) +#ifdef __WIN16__ + if (wxSetWorkingDirectory(newdrive)) +#else + if (::SetCurrentDirectory(newdrive)) +#endif +#else + // VA doesn't know what LPSTR is and has its own set + if (DosSetCurrentDir((PSZ)newdrive)) +#endif + return 0; + else + return -1; +#endif // !GNUWIN32 +} + +bool wxIsDriveAvailable(const wxString& dirName) { #ifdef __WIN32__ UINT errorMode = SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOOPENFILEERRORBOX); @@ -306,15 +375,20 @@ static bool wxIsDriveAvailable(const wxString dirName) if (dirName.Len() == 3 && dirName[(size_t)1] == wxT(':')) { wxString dirNameLower(dirName.Lower()); +#if defined(__GNUWIN32__) && \ + !(defined(__MINGW32_MAJOR_VERSION) && __MINGW32_MAJOR_VERSION >= 1) + success = wxPathExists(dirNameLower); +#else int currentDrive = _getdrive(); int thisDrive = (int) (dirNameLower[(size_t)0] - 'a' + 1) ; - int err = _chdrive( thisDrive ) ; - _chdrive( currentDrive ); + int err = setdrive( thisDrive ) ; + setdrive( currentDrive ); if (err == -1) { success = FALSE; } +#endif } #ifdef __WIN32__ (void) SetErrorMode(errorMode); @@ -322,14 +396,24 @@ static bool wxIsDriveAvailable(const wxString dirName) return success; } -#endif +#endif // __WINDOWS__ || __WXPM__ + +// Function which is called by quick sort. We want to override the default wxArrayString behaviour, +// and sort regardless of case. +static int LINKAGEMODE wxDirCtrlStringCompareFunction(const void *first, const void *second) +{ + wxString *strFirst = (wxString *)first; + wxString *strSecond = (wxString *)second; + + return strFirst->CmpNoCase(*strSecond); +} //----------------------------------------------------------------------------- -// wxDirItemDataEx +// wxDirItemData //----------------------------------------------------------------------------- -wxDirItemDataEx::wxDirItemDataEx(const wxString& path, const wxString& name, - bool isDir) +wxDirItemData::wxDirItemData(const wxString& path, const wxString& name, + bool isDir) { m_path = path; m_name = name; @@ -338,44 +422,48 @@ wxDirItemDataEx::wxDirItemDataEx(const wxString& path, const wxString& name, * For FileNameFromPath read LastDirNameInThisPath ;-) */ // m_isHidden = (bool)(wxFileNameFromPath(*m_path)[0] == '.'); m_isHidden = FALSE; - m_hasSubDirs = HasSubDirs(); m_isExpanded = FALSE; m_isDir = isDir; } -wxDirItemDataEx::~wxDirItemDataEx() +wxDirItemData::~wxDirItemData() { } -void wxDirItemDataEx::SetNewDirName( wxString path ) +void wxDirItemData::SetNewDirName(const wxString& path) { m_path = path; - m_name = wxFileNameFromPath( path ); + m_name = wxFileNameFromPath(path); } -bool wxDirItemDataEx::HasSubDirs() +bool wxDirItemData::HasSubDirs() const { if (m_path.IsEmpty()) - return TRUE; + return FALSE; - // 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)) + wxDir dir; + { + wxLogNull nolog; + if ( !dir.Open(m_path) ) + return FALSE; + } + + return dir.HasSubDirs(); +} + +bool wxDirItemData::HasFiles(const wxString& WXUNUSED(spec)) const +{ + if (m_path.IsEmpty()) return FALSE; -#endif - wxString search = m_path; - - if (m_path.Last() != wxFILE_SEP_PATH) + wxDir dir; { - search += wxString(wxFILE_SEP_PATH); + wxLogNull nolog; + if ( !dir.Open(m_path) ) + return FALSE; } - search += wxT("*"); - wxLogNull log; - wxString path = wxFindFirstFile( search, wxDIR ); - return (bool)(!path.IsNull()); + return dir.HasFiles(); } //----------------------------------------------------------------------------- @@ -398,23 +486,27 @@ wxGenericDirCtrl::wxGenericDirCtrl(void) } bool wxGenericDirCtrl::Create(wxWindow *parent, - const wxWindowID id, - const wxString& dir, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& filter, - int defaultFilter, - const wxString& name ) + const wxWindowID id, + const wxString& dir, + const wxPoint& pos, + const wxSize& size, + long style, + const wxString& filter, + int defaultFilter, + const wxString& name) { if (!wxControl::Create(parent, id, pos, size, style, wxDefaultValidator, name)) return FALSE; - SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE)); + SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE)); Init(); - long treeStyle = wxTR_HAS_BUTTONS; + long treeStyle = wxTR_HAS_BUTTONS | wxTR_HIDE_ROOT; + + if (style & wxDIRCTRL_EDIT_LABELS) + treeStyle |= wxTR_EDIT_LABELS; + if ((style & wxDIRCTRL_3D_INTERNAL) == 0) treeStyle |= wxNO_BORDER; @@ -436,7 +528,6 @@ bool wxGenericDirCtrl::Create(wxWindow *parent, m_filterListCtrl->FillFilterList(filter, defaultFilter); m_imageList = new wxImageList(16, 16, TRUE); -#if !defined(__WXMSW__) || wxUSE_XPM_IN_MSW m_imageList->Add(wxIcon(icon1_xpm)); m_imageList->Add(wxIcon(icon2_xpm)); m_imageList->Add(wxIcon(icon3_xpm)); @@ -445,26 +536,14 @@ bool wxGenericDirCtrl::Create(wxWindow *parent, m_imageList->Add(wxIcon(icon6_xpm)); 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_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 - m_treeCtrl->SetImageList(m_imageList); + m_treeCtrl->AssignImageList(m_imageList); m_showHidden = FALSE; - wxDirItemDataEx* rootData = new wxDirItemDataEx(wxT(""), wxT(""), TRUE); + wxDirItemData* rootData = new wxDirItemData(wxT(""), wxT(""), TRUE); wxString rootName; -#ifdef __WXMSW__ +#if defined(__WINDOWS__) || defined(__WXPM__) || defined(__DOS__) rootName = _("Computer"); #else rootName = _("Sections"); @@ -472,7 +551,7 @@ bool wxGenericDirCtrl::Create(wxWindow *parent, m_rootId = m_treeCtrl->AddRoot( rootName, 3, -1, rootData); m_treeCtrl->SetItemHasChildren(m_rootId); - m_treeCtrl->Expand(m_rootId); // automatically expand first level + ExpandDir(m_rootId); // automatically expand first level // Expand and select the default path if (!m_defaultPath.IsEmpty()) @@ -485,8 +564,6 @@ bool wxGenericDirCtrl::Create(wxWindow *parent, wxGenericDirCtrl::~wxGenericDirCtrl() { - m_treeCtrl->SetImageList(NULL); - delete m_imageList; } void wxGenericDirCtrl::Init() @@ -499,26 +576,27 @@ void wxGenericDirCtrl::Init() m_filterListCtrl = NULL; } +void wxGenericDirCtrl::ShowHidden( bool show ) +{ + m_showHidden = show; + + wxString path = GetPath(); + ReCreateTree(); + SetPath(path); +} + void wxGenericDirCtrl::AddSection(const wxString& path, const wxString& name, int imageId) { - wxDirItemDataEx *dir_item = new wxDirItemDataEx(path,name,TRUE); + wxDirItemData *dir_item = new wxDirItemData(path,name,TRUE); -#ifdef __WXMSW__ - // Windows: sections are displayed as drives wxTreeItemId id = m_treeCtrl->AppendItem( m_rootId, name, imageId, -1, dir_item); -#else - // Unix: sections are displayed as folders - wxTreeItemId id = m_treeCtrl->AppendItem( m_rootId, name, 0, -1, dir_item); - m_treeCtrl->SetItemImage( id, 1, wxTreeItemIcon_Expanded ); -#endif - // TODO: other operating systems. m_treeCtrl->SetItemHasChildren(id); } void wxGenericDirCtrl::SetupSections() { -#ifdef __WXMSW__ +#if defined(__WINDOWS__) || defined(__DOS__) || defined(__WXPM__) #ifdef __WIN32__ wxChar driveBuffer[256]; @@ -562,34 +640,38 @@ void wxGenericDirCtrl::SetupSections() if (driveBuffer[i] == wxT('\0')) break; } -#else +#else // !__WIN32__ int drive; - int currentDrive; /* If we can switch to the drive, it exists. */ for( drive = 1; drive <= 26; drive++ ) { wxString path, name; path.Printf(wxT("%c:\\"), (char) (drive + 'a' - 1)); - name.Printf(wxT("(%c:)"), (char) (drive + 'a' - 1)); + name.Printf(wxT("(%c:)"), (char) (drive + 'A' - 1)); if (wxIsDriveAvailable(path)) { - - AddSection(path, name); + AddSection(path, name, (drive <= 2) ? 6/*floppy*/ : 4/*disk*/); } } -#endif - +#endif // __WIN32__/!__WIN32__ + +#elif defined(__WXMAC__) + FSSpec volume ; + short index = 1 ; + while(1) { + short actualCount = 0 ; + if ( OnLine( &volume , 1 , &actualCount , &index ) != noErr || actualCount == 0 ) + break ; + + wxString name = wxMacFSSpec2MacFilename( &volume ) ; + AddSection(name + wxFILE_SEP_PATH, name, 0); + } +#elif defined(__UNIX__) + AddSection(wxT("/"), wxT("/"), 3/*computer icon*/); #else - AddSection(wxT("/"), _("The Computer"), 0); - AddSection(wxGetHomeDir(), _("My Home"), 0 ); - AddSection(wxT("/mnt"), _("Mounted Devices"), 0 ); - AddSection(wxT("/usr/local"), _("User Local"), 0 ); - AddSection(wxT("/usr"), _("User"), 0 ); - AddSection(wxT("/var"), _("Variables"), 0 ); - AddSection(wxT("/etc"), _("Etcetera"), 0 ); - AddSection(wxT("/tmp"), _("Temporary"), 0 ); + #error "Unsupported platform in wxGenericDirCtrl!" #endif } @@ -624,7 +706,7 @@ void wxGenericDirCtrl::OnEndEditItem(wxTreeEvent &event) } wxTreeItemId id = event.GetItem(); - wxDirItemDataEx *data = (wxDirItemDataEx*)m_treeCtrl->GetItemData( id ); + wxDirItemData *data = (wxDirItemData*)m_treeCtrl->GetItemData( id ); wxASSERT( data ); wxString new_name( wxPathOnly( data->m_path ) ); @@ -656,14 +738,24 @@ void wxGenericDirCtrl::OnExpandItem(wxTreeEvent &event) { wxTreeItemId parentId = event.GetItem(); + // VS: this is needed because the event handler is called from wxTreeCtrl + // ctor when wxTR_HIDE_ROOT was specified + if (m_rootId == 0) + m_rootId = m_treeCtrl->GetRootItem(); + ExpandDir(parentId); } void wxGenericDirCtrl::OnCollapseItem(wxTreeEvent &event ) { - wxTreeItemId child, parent = event.GetItem(); + CollapseDir(event.GetItem()); +} + +void wxGenericDirCtrl::CollapseDir(wxTreeItemId parentId) +{ + wxTreeItemId child; - wxDirItemDataEx *data = (wxDirItemDataEx *) m_treeCtrl->GetItemData(event.GetItem()); + wxDirItemData *data = (wxDirItemData *) m_treeCtrl->GetItemData(parentId); if (!data->m_isExpanded) return; @@ -671,26 +763,26 @@ void wxGenericDirCtrl::OnCollapseItem(wxTreeEvent &event ) long cookie; /* Workaround because DeleteChildren has disapeared (why?) and * CollapseAndReset doesn't work as advertised (deletes parent too) */ - child = m_treeCtrl->GetFirstChild(parent, cookie); + child = m_treeCtrl->GetFirstChild(parentId, cookie); while (child.IsOk()) { m_treeCtrl->Delete(child); /* Not GetNextChild below, because the cookie mechanism can't * handle disappearing children! */ - child = m_treeCtrl->GetFirstChild(parent, cookie); + child = m_treeCtrl->GetFirstChild(parentId, cookie); } } void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId) { - wxDirItemDataEx *data = (wxDirItemDataEx *) m_treeCtrl->GetItemData(parentId); + wxDirItemData *data = (wxDirItemData *) m_treeCtrl->GetItemData(parentId); if (data->m_isExpanded) return; data->m_isExpanded = TRUE; - if (parentId == m_rootId) + if (parentId == m_treeCtrl->GetRootItem()) { SetupSections(); return; @@ -702,21 +794,21 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId) wxString dirName(data->m_path); -#ifdef __WXMSW__ +#if defined(__WINDOWS__) || defined(__DOS__) || defined(__WXPM__) // Check if this is a root directory and if so, // whether the drive is avaiable. if (!wxIsDriveAvailable(dirName)) { data->m_isExpanded = FALSE; - wxMessageBox(wxT("Sorry, this drive is not available.")); - return; + //wxMessageBox(wxT("Sorry, this drive is not available.")); + return; } #endif // This may take a longish time. Go to busy cursor wxBusyCursor busy; -#ifdef __WXMSW__ +#if defined(__WINDOWS__) || defined(__DOS__) || defined(__WXPM__) if (dirName.Last() == ':') dirName += wxString(wxFILE_SEP_PATH); #endif @@ -732,7 +824,9 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId) if (d.IsOpened()) { - if (d.GetFirst(& eachFilename, wxEmptyString, wxDIR_DIRS)) + int style = wxDIR_DIRS; + if (m_showHidden) style |= wxDIR_HIDDEN; + if (d.GetFirst(& eachFilename, wxEmptyString, style)) { do { @@ -741,10 +835,10 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId) dirs.Add(eachFilename); } } - while (d.GetNext(& eachFilename)) ; + while (d.GetNext(& eachFilename)); } } - dirs.Sort(); + dirs.Sort((wxArrayString::CompareFunction) wxDirCtrlStringCompareFunction); // Now do the filenames -- but only if we're allowed to if ((GetWindowStyle() & wxDIRCTRL_DIR_ONLY) == 0) @@ -752,7 +846,7 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId) wxLogNull log; d.Open(dirName); - + if (d.IsOpened()) { if (d.GetFirst(& eachFilename, m_currentFilterStr, wxDIR_FILES)) @@ -764,10 +858,10 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId) filenames.Add(eachFilename); } } - while (d.GetNext(& eachFilename)) ; + while (d.GetNext(& eachFilename)); } } - filenames.Sort(); + filenames.Sort((wxArrayString::CompareFunction) wxDirCtrlStringCompareFunction); } // Add the sorted dirs @@ -780,29 +874,20 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId) path += wxString(wxFILE_SEP_PATH); path += eachFilename; - wxDirItemDataEx *dir_item = new wxDirItemDataEx(path,eachFilename,TRUE); + wxDirItemData *dir_item = new wxDirItemData(path,eachFilename,TRUE); wxTreeItemId id = m_treeCtrl->AppendItem( parentId, eachFilename, 0, -1, dir_item); m_treeCtrl->SetItemImage( id, 1, wxTreeItemIcon_Expanded ); - + // Has this got any children? If so, make it expandable. - int options = wxDIR_DEFAULT; - if (GetWindowStyle() & wxDIRCTRL_DIR_ONLY) // If only showing dirs, then we specify dirs only here + // (There are two situations when a dir has children: either it + // has subdirectories or it contains files that weren't filtered + // out. The latter only applies to dirctrl with files.) + if ( dir_item->HasSubDirs() || + (((GetWindowStyle() & wxDIRCTRL_DIR_ONLY) == 0) && + dir_item->HasFiles(m_currentFilterStr)) ) { - options = wxDIR_DIRS; + m_treeCtrl->SetItemHasChildren(id); } - - wxLogNull log; - wxDir dir2; - if (dir2.Open(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)) - { - m_treeCtrl->SetItemHasChildren(id); - } - } } // Add the sorted filenames @@ -816,48 +901,54 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId) path += wxString(wxFILE_SEP_PATH); path += eachFilename; //path = dirName + wxString(wxT("/")) + eachFilename; - wxDirItemDataEx *dir_item = new wxDirItemDataEx(path,eachFilename,FALSE); + wxDirItemData *dir_item = new wxDirItemData(path,eachFilename,FALSE); (void)m_treeCtrl->AppendItem( parentId, eachFilename, 2, -1, dir_item); } } } +void wxGenericDirCtrl::ReCreateTree() +{ + CollapseDir(m_treeCtrl->GetRootItem()); + ExpandDir(m_treeCtrl->GetRootItem()); +} + // Find the child that matches the first part of 'path'. // E.g. if a child path is "/usr" and 'path' is "/usr/include" // then the child for /usr is returned. wxTreeItemId wxGenericDirCtrl::FindChild(wxTreeItemId parentId, const wxString& path, bool& done) { wxString path2(path); - + // Make sure all separators are as per the current platform path2.Replace(wxT("\\"), wxString(wxFILE_SEP_PATH)); path2.Replace(wxT("/"), wxString(wxFILE_SEP_PATH)); - + // Append a separator to foil bogus substring matching path2 += wxString(wxFILE_SEP_PATH); - - // In MSW, case is not significant -#ifdef __WXMSW__ + + // In MSW or PM, case is not significant +#if defined(__WINDOWS__) || defined(__DOS__) || defined(__WXPM__) path2.MakeLower(); #endif - + long cookie; wxTreeItemId childId = m_treeCtrl->GetFirstChild(parentId, cookie); - while (childId != 0) + while (childId.IsOk()) { - wxDirItemDataEx* data = (wxDirItemDataEx*) m_treeCtrl->GetItemData(childId); - - if (data && data->m_path != "") + wxDirItemData* data = (wxDirItemData*) m_treeCtrl->GetItemData(childId); + + if (data && !data->m_path.IsEmpty()) { wxString childPath(data->m_path); if (childPath.Last() != wxFILE_SEP_PATH) childPath += wxString(wxFILE_SEP_PATH); - - // In MSW, case is not significant -#ifdef __WXMSW__ + + // In MSW and PM, case is not significant +#if defined(__WINDOWS__) || defined(__DOS__) || defined(__WXPM__) childPath.MakeLower(); #endif - + if (childPath.Len() <= path2.Len()) { wxString path3 = path2.Mid(0, childPath.Len()); @@ -871,8 +962,8 @@ wxTreeItemId wxGenericDirCtrl::FindChild(wxTreeItemId parentId, const wxString& } } } - - childId = m_treeCtrl->GetNextChild(childId, cookie); + + childId = m_treeCtrl->GetNextChild(parentId, cookie); } wxTreeItemId invalid; return invalid; @@ -885,17 +976,17 @@ bool wxGenericDirCtrl::ExpandPath(const wxString& path) bool done = FALSE; wxTreeItemId id = FindChild(m_rootId, path, done); wxTreeItemId lastId = id; // The last non-zero id - while ((id > 0) && !done) + while (id.IsOk() && !done) { ExpandDir(id); id = FindChild(id, path, done); - if (id != 0) + if (id.IsOk()) lastId = id; } - if (lastId > 0) + if (lastId.IsOk()) { - wxDirItemDataEx *data = (wxDirItemDataEx *) m_treeCtrl->GetItemData(lastId); + wxDirItemData *data = (wxDirItemData *) m_treeCtrl->GetItemData(lastId); if (data->m_isDir) { m_treeCtrl->Expand(lastId); @@ -906,10 +997,10 @@ bool wxGenericDirCtrl::ExpandPath(const wxString& path) long cookie; wxTreeItemId childId = m_treeCtrl->GetFirstChild(lastId, cookie); bool selectedChild = FALSE; - while (childId != 0) + while (childId.IsOk()) { - wxDirItemDataEx* data = (wxDirItemDataEx*) m_treeCtrl->GetItemData(childId); - + wxDirItemData* data = (wxDirItemData*) m_treeCtrl->GetItemData(childId); + if (data && data->m_path != "" && !data->m_isDir) { m_treeCtrl->SelectItem(childId); @@ -942,7 +1033,7 @@ wxString wxGenericDirCtrl::GetPath() const wxTreeItemId id = m_treeCtrl->GetSelection(); if (id) { - wxDirItemDataEx* data = (wxDirItemDataEx*) m_treeCtrl->GetItemData(id); + wxDirItemData* data = (wxDirItemData*) m_treeCtrl->GetItemData(id); return data->m_path; } else @@ -954,7 +1045,7 @@ wxString wxGenericDirCtrl::GetFilePath() const wxTreeItemId id = m_treeCtrl->GetSelection(); if (id) { - wxDirItemDataEx* data = (wxDirItemDataEx*) m_treeCtrl->GetItemData(id); + wxDirItemData* data = (wxDirItemData*) m_treeCtrl->GetItemData(id); if (data->m_isDir) return wxEmptyString; else @@ -975,7 +1066,7 @@ void wxGenericDirCtrl::SetPath(const wxString& path) #if 0 void wxGenericDirCtrl::FindChildFiles(wxTreeItemId id, int dirFlags, wxArrayString& filenames) { - wxDirItemDataEx *data = (wxDirItemDataEx *) m_treeCtrl->GetItemData(id); + wxDirItemData *data = (wxDirItemData *) m_treeCtrl->GetItemData(id); // This may take a longish time. Go to busy cursor wxBusyCursor busy; @@ -986,7 +1077,7 @@ void wxGenericDirCtrl::FindChildFiles(wxTreeItemId id, int dirFlags, wxArrayStri wxString dirName(data->m_path); -#ifdef __WXMSW__ +#if defined(__WXMSW__) || defined(__WXPM__) if (dirName.Last() == ':') dirName += wxString(wxFILE_SEP_PATH); #endif @@ -1047,8 +1138,8 @@ bool wxGenericDirCtrl::ExtractWildcard(const wxString& filterStr, int n, wxStrin description = descriptions[n]; return TRUE; } - else - return FALSE; + + return FALSE; } // Parses the global filter, returning the number of filters. @@ -1099,6 +1190,14 @@ void wxGenericDirCtrl::DoResize() wxSize filterSz ; if (m_filterListCtrl) { +#ifdef __WXMSW__ + // For some reason, this is required in order for the + // correct control height to always be returned, rather + // than the drop-down list height which is sometimes returned. + wxSize oldSize = m_filterListCtrl->GetSize(); + m_filterListCtrl->SetSize(-1, -1, oldSize.x+10, -1, wxSIZE_USE_EXISTING); + m_filterListCtrl->SetSize(-1, -1, oldSize.x, -1, wxSIZE_USE_EXISTING); +#endif filterSz = m_filterListCtrl->GetSize(); sz.y -= (filterSz.y + verticalSpacing); } @@ -1113,7 +1212,7 @@ void wxGenericDirCtrl::DoResize() } -void wxGenericDirCtrl::OnSize(wxSizeEvent &event) +void wxGenericDirCtrl::OnSize(wxSizeEvent& WXUNUSED(event)) { DoResize(); } @@ -1142,18 +1241,17 @@ void wxDirFilterListCtrl::Init() m_dirCtrl = NULL; } -void wxDirFilterListCtrl::OnSelFilter(wxCommandEvent& event) +void wxDirFilterListCtrl::OnSelFilter(wxCommandEvent& WXUNUSED(event)) { int sel = GetSelection(); wxString currentPath = m_dirCtrl->GetPath(); - + m_dirCtrl->SetFilterIndex(sel); // If the filter has changed, the view is out of date, so // collapse the tree. - m_dirCtrl->GetTreeCtrl()->Collapse(m_dirCtrl->GetRootId()); - m_dirCtrl->GetTreeCtrl()->Expand(m_dirCtrl->GetRootId()); + m_dirCtrl->ReCreateTree(); // Try to restore the selection, or at least the directory m_dirCtrl->ExpandPath(currentPath); @@ -1174,77 +1272,4 @@ void wxDirFilterListCtrl::FillFilterList(const wxString& filter, int defaultFilt } } -// wxGenericDirDialog implementation -// This should be moved into dirdlgg.cpp eventually - -BEGIN_EVENT_TABLE(wxGenericDirDialog, wxDialog) - EVT_BUTTON(wxID_OK, wxGenericDirDialog::OnOK) - EVT_CLOSE(wxGenericDirDialog::OnCloseWindow) -END_EVENT_TABLE() - -wxGenericDirDialog::wxGenericDirDialog(wxWindow* parent, const wxString& title, - const wxString& defaultPath, long style, const wxPoint& pos, const wxSize& sz, const wxString& name): - wxDialog(parent, ID_DIRCTRL, title, pos, sz, style, name) -{ - wxBusyCursor cursor; - - wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL ); - - // 1) dir ctrl - m_dirCtrl = new wxGenericDirCtrl(this, ID_DIRCTRL, - defaultPath, wxPoint(5, 5), - wxSize(300, 200), wxDIRCTRL_DIR_ONLY|wxSUNKEN_BORDER); - - topsizer->Add( m_dirCtrl, 1, wxTOP|wxLEFT|wxRIGHT | wxEXPAND, 10 ); - - // 2) TODO: text control for entering path? - -#if wxUSE_STATLINE - // 3) Static line - topsizer->Add( new wxStaticLine( this, -1 ), 0, wxEXPAND | wxLEFT|wxRIGHT|wxTOP, 10 ); -#endif - - // 4) Buttons - wxSizer* buttonsizer = new wxBoxSizer( wxHORIZONTAL ); - wxButton* okButton = new wxButton(this, wxID_OK, _("OK")); - buttonsizer->Add( okButton, 0, wxLEFT|wxRIGHT, 10 ); - wxButton* cancelButton = new wxButton(this, wxID_CANCEL, _("Cancel")); - buttonsizer->Add( cancelButton, 0, wxLEFT|wxRIGHT, 10 ); - -/* TODO: new directory button - wxButton* newButton = new wxButton( this, ID_NEW, _("New...") ); - buttonsizer->Add( newButton, 0, wxLEFT|wxRIGHT, 10 ); -*/ - topsizer->Add( buttonsizer, 0, wxALL | wxCENTER, 10 ); - - okButton->SetDefault(); - m_dirCtrl->SetFocus(); - - SetAutoLayout( TRUE ); - SetSizer( topsizer ); - - topsizer->SetSizeHints( this ); - topsizer->Fit( this ); - - Centre( wxBOTH ); -} - -void wxGenericDirDialog::OnCloseWindow(wxCloseEvent& event) -{ - EndModal(wxID_CANCEL); -} - -void wxGenericDirDialog::OnOK(wxCommandEvent& event) -{ - EndModal(wxID_OK); -} - -void wxGenericDirDialog::SetPath(const wxString& path) -{ - m_dirCtrl->SetPath(path); -} - -wxString wxGenericDirDialog::GetPath(void) const -{ - return m_dirCtrl->GetPath(); -} +#endif // wxUSE_DIRDLG