X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e63fdcd600e2eb717a19f9fa2895e9256e83c890..8fbdfa4faf61ecc4177d9952d3f3718cf4514ae6:/src/generic/dirctrlg.cpp diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp index b06515e348..7df3852fe2 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" @@ -48,9 +49,27 @@ #ifdef __WXMSW__ #include + +#ifndef __GNUWIN32__ +#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,7 +81,6 @@ #undef GetFirstChild #endif -#if !defined(__WXMSW__) || wxUSE_XPM_IN_MSW /* Closed folder */ static char * icon1_xpm[] = { /* width height ncolors chars_per_pixel */ @@ -284,7 +302,6 @@ static char * icon8_xpm[] = { " ", " ", " "}; -#endif // !wxMSW static const int ID_DIRCTRL = 1000; static const int ID_TEXTCTRL = 1001; @@ -293,7 +310,31 @@ static const int ID_CANCEL = 1003; static const int ID_NEW = 1004; //static const int ID_CHECK = 1005; -#ifdef __WXMSW__ +#if defined(__WXMSW__) || defined(__WXPM__) +int setdrive(int drive) +{ + 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; +} + static bool wxIsDriveAvailable(const wxString dirName) { #ifdef __WIN32__ @@ -306,15 +347,19 @@ static bool wxIsDriveAvailable(const wxString dirName) if (dirName.Len() == 3 && dirName[(size_t)1] == wxT(':')) { wxString dirNameLower(dirName.Lower()); +#if defined(__GNUWIN32__) + 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); @@ -324,6 +369,16 @@ static bool wxIsDriveAvailable(const wxString dirName) } #endif +// 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 //----------------------------------------------------------------------------- @@ -354,32 +409,6 @@ void wxDirItemDataEx::SetNewDirName( wxString path ) m_name = wxFileNameFromPath( path ); } -// No longer used, and takes a very long time -bool wxDirItemDataEx::HasSubDirs() -{ - 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()); -} - //----------------------------------------------------------------------------- // wxGenericDirCtrl //----------------------------------------------------------------------------- @@ -416,7 +445,7 @@ bool wxGenericDirCtrl::Create(wxWindow *parent, Init(); - long treeStyle = wxTR_HAS_BUTTONS; + long treeStyle = wxTR_HAS_BUTTONS ; // | wxTR_EDIT_LABELS; if ((style & wxDIRCTRL_3D_INTERNAL) == 0) treeStyle |= wxNO_BORDER; @@ -438,7 +467,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)); @@ -447,18 +475,6 @@ 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_showHidden = FALSE; @@ -466,7 +482,7 @@ bool wxGenericDirCtrl::Create(wxWindow *parent, wxString rootName; -#ifdef __WXMSW__ +#if defined(__WXMSW__) || defined(__WXPM__) rootName = _("Computer"); #else rootName = _("Sections"); @@ -505,8 +521,8 @@ void wxGenericDirCtrl::AddSection(const wxString& path, const wxString& name, in { wxDirItemDataEx *dir_item = new wxDirItemDataEx(path,name,TRUE); -#ifdef __WXMSW__ - // Windows: sections are displayed as drives +#if defined(__WXMSW__) || defined(__WXPM__) + // Windows and OS/2: sections are displayed as drives wxTreeItemId id = m_treeCtrl->AppendItem( m_rootId, name, imageId, -1, dir_item); #else // Unix: sections are displayed as folders @@ -520,9 +536,9 @@ void wxGenericDirCtrl::AddSection(const wxString& path, const wxString& name, in void wxGenericDirCtrl::SetupSections() { -#ifdef __WXMSW__ +#if defined(__WXMSW__) || defined(__WXPM__) -#ifdef __WIN32__ +# ifdef __WIN32__ wxChar driveBuffer[256]; size_t n = (size_t) GetLogicalDriveStrings(255, driveBuffer); size_t i = 0; @@ -564,7 +580,7 @@ void wxGenericDirCtrl::SetupSections() if (driveBuffer[i] == wxT('\0')) break; } -#else +# else int drive; int currentDrive; @@ -577,12 +593,22 @@ void wxGenericDirCtrl::SetupSections() if (wxIsDriveAvailable(path)) { - + AddSection(path, name); } } -#endif - +# endif +#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); + } #else AddSection(wxT("/"), _("The Computer"), 0); AddSection(wxGetHomeDir(), _("My Home"), 0 ); @@ -704,21 +730,21 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId) wxString dirName(data->m_path); -#ifdef __WXMSW__ +#if defined(__WXMSW__) || 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(__WXMSW__) || defined(__WXPM__) if (dirName.Last() == ':') dirName += wxString(wxFILE_SEP_PATH); #endif @@ -746,7 +772,7 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId) 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) @@ -754,7 +780,7 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId) wxLogNull log; d.Open(dirName); - + if (d.IsOpened()) { if (d.GetFirst(& eachFilename, m_currentFilterStr, wxDIR_FILES)) @@ -769,7 +795,7 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId) while (d.GetNext(& eachFilename)) ; } } - filenames.Sort(); + filenames.Sort((wxArrayString::CompareFunction) wxDirCtrlStringCompareFunction); } // Add the sorted dirs @@ -785,7 +811,7 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId) wxDirItemDataEx *dir_item = new wxDirItemDataEx(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 @@ -830,36 +856,36 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId) 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(__WXMSW__) || 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 != "") { 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(__WXMSW__) || defined(__WXPM__) childPath.MakeLower(); #endif - + if (childPath.Len() <= path2.Len()) { wxString path3 = path2.Mid(0, childPath.Len()); @@ -873,7 +899,7 @@ wxTreeItemId wxGenericDirCtrl::FindChild(wxTreeItemId parentId, const wxString& } } } - + childId = m_treeCtrl->GetNextChild(childId, cookie); } wxTreeItemId invalid; @@ -887,15 +913,15 @@ 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); if (data->m_isDir) @@ -908,10 +934,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); - + if (data && data->m_path != "" && !data->m_isDir) { m_treeCtrl->SelectItem(childId); @@ -988,7 +1014,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 @@ -1049,8 +1075,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. @@ -1115,7 +1141,7 @@ void wxGenericDirCtrl::DoResize() } -void wxGenericDirCtrl::OnSize(wxSizeEvent &event) +void wxGenericDirCtrl::OnSize(wxSizeEvent& WXUNUSED(event)) { DoResize(); } @@ -1144,12 +1170,12 @@ 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 @@ -1181,10 +1207,11 @@ void wxDirFilterListCtrl::FillFilterList(const wxString& filter, int defaultFilt BEGIN_EVENT_TABLE(wxGenericDirDialog, wxDialog) EVT_BUTTON(wxID_OK, wxGenericDirDialog::OnOK) + EVT_BUTTON(wxID_NEW, wxGenericDirDialog::OnNew) EVT_BUTTON (wxID_NEW, wxGenericDirDialog::OnNew) EVT_CLOSE(wxGenericDirDialog::OnCloseWindow) - EVT_TREE_KEY_DOWN (ID_DIRCTRL, wxGenericDirDialog::OnTreeKeyDown) - EVT_TREE_SEL_CHANGED (ID_DIRCTRL, wxGenericDirDialog::OnTreeSelected) + EVT_TREE_KEY_DOWN (-1, wxGenericDirDialog::OnTreeKeyDown) + EVT_TREE_SEL_CHANGED (-1, wxGenericDirDialog::OnTreeSelected) EVT_TEXT_ENTER (ID_TEXTCTRL, wxGenericDirDialog::OnOK) END_EVENT_TABLE() @@ -1192,6 +1219,9 @@ 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) { + m_dirCtrl = NULL; + m_path = defaultPath; + wxBusyCursor cursor; wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL ); @@ -1204,7 +1234,7 @@ wxGenericDirDialog::wxGenericDirDialog(wxWindow* parent, const wxString& title, topsizer->Add( m_dirCtrl, 1, wxTOP|wxLEFT|wxRIGHT | wxEXPAND, 10 ); // 2) text ctrl - m_input = new wxTextCtrl( this, ID_TEXTCTRL, wxEmptyString, wxDefaultPosition ); + m_input = new wxTextCtrl( this, ID_TEXTCTRL, m_path, wxDefaultPosition ); topsizer->Add( m_input, 0, wxTOP|wxLEFT|wxRIGHT | wxEXPAND, 10 ); #if wxUSE_STATLINE @@ -1219,17 +1249,18 @@ wxGenericDirDialog::wxGenericDirDialog(wxWindow* parent, const wxString& title, 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...") ); + // I'm not convinced we need a New button, and we tend to get annoying + // accidental-editing with label editing enabled. +#if 0 + wxButton* newButton = new wxButton( this, wxID_NEW, _("New...") ); buttonsizer->Add( newButton, 0, wxLEFT|wxRIGHT, 10 ); -*/ +#endif + topsizer->Add( buttonsizer, 0, wxALL | wxCENTER, 10 ); okButton->SetDefault(); m_dirCtrl->SetFocus(); - m_input->SetValue(defaultPath); - SetAutoLayout( TRUE ); SetSizer( topsizer ); @@ -1239,12 +1270,12 @@ wxGenericDirDialog::wxGenericDirDialog(wxWindow* parent, const wxString& title, Centre( wxBOTH ); } -void wxGenericDirDialog::OnCloseWindow(wxCloseEvent& event) +void wxGenericDirDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event)) { EndModal(wxID_CANCEL); } -void wxGenericDirDialog::OnOK(wxCommandEvent& event) +void wxGenericDirDialog::OnOK(wxCommandEvent& WXUNUSED(event)) { m_path = m_input->GetValue(); // Does the path exist? (User may have typed anything in m_input) @@ -1281,21 +1312,25 @@ void wxGenericDirDialog::OnOK(wxCommandEvent& event) void wxGenericDirDialog::SetPath(const wxString& path) { m_dirCtrl->SetPath(path); + m_path = path; } wxString wxGenericDirDialog::GetPath(void) const { - return m_dirCtrl->GetPath(); + return m_path; } int wxGenericDirDialog::ShowModal() { - m_input->SetValue( m_path ); + //m_input->SetValue( m_path ); return wxDialog::ShowModal(); } void wxGenericDirDialog::OnTreeSelected( wxTreeEvent &event ) { + if (!m_dirCtrl) + return; + wxDirItemDataEx *data = (wxDirItemDataEx*)m_dirCtrl->GetTreeCtrl()->GetItemData(event.GetItem()); if (data) m_input->SetValue( data->m_path ); @@ -1303,6 +1338,9 @@ void wxGenericDirDialog::OnTreeSelected( wxTreeEvent &event ) void wxGenericDirDialog::OnTreeKeyDown( wxTreeEvent &WXUNUSED(event) ) { + if (!m_dirCtrl) + return; + wxDirItemDataEx *data = (wxDirItemDataEx*)m_dirCtrl->GetTreeCtrl()->GetItemData(m_dirCtrl->GetTreeCtrl()->GetSelection()); if (data) m_input->SetValue( data->m_path ); @@ -1310,10 +1348,9 @@ void wxGenericDirDialog::OnTreeKeyDown( wxTreeEvent &WXUNUSED(event) ) void wxGenericDirDialog::OnNew( wxCommandEvent& WXUNUSED(event) ) { -#if 0 - wxTreeItemId id = m_dir->GetSelection(); - if ((id == m_dir->GetRootItem()) || - (m_dir->GetParent(id) == m_dir->GetRootItem())) + wxTreeItemId id = m_dirCtrl->GetTreeCtrl()->GetSelection(); + if ((id == m_dirCtrl->GetTreeCtrl()->GetRootItem()) || + (m_dirCtrl->GetTreeCtrl()->GetParent(id) == m_dirCtrl->GetTreeCtrl()->GetRootItem())) { wxMessageDialog msg(this, _("You cannot add a new directory to this section."), _("Create directory"), wxOK | wxICON_INFORMATION ); @@ -1321,13 +1358,14 @@ void wxGenericDirDialog::OnNew( wxCommandEvent& WXUNUSED(event) ) return; } - wxTreeItemId parent = m_dir->GetParent( id ); - wxDirItemData *data = (wxDirItemData*)m_dir->GetItemData( parent ); + wxTreeItemId parent = id ; // m_dirCtrl->GetTreeCtrl()->GetParent( id ); + wxDirItemDataEx *data = (wxDirItemDataEx*)m_dirCtrl->GetTreeCtrl()->GetItemData( parent ); wxASSERT( data ); wxString new_name( wxT("NewName") ); wxString path( data->m_path ); - path += wxT("/"); + if (path.Last() != wxFILE_SEP_PATH) + path += wxFILE_SEP_PATH; path += new_name; if (wxFileExists(path)) { @@ -1340,7 +1378,8 @@ void wxGenericDirDialog::OnNew( wxCommandEvent& WXUNUSED(event) ) new_name += num; path = data->m_path; - path += wxT("/"); + if (path.Last() != wxFILE_SEP_PATH) + path += wxFILE_SEP_PATH; path += new_name; i++; } while (wxFileExists(path)); @@ -1354,9 +1393,13 @@ void wxGenericDirDialog::OnNew( wxCommandEvent& WXUNUSED(event) ) return; } - wxDirItemData *new_data = new wxDirItemData( path, new_name ); - wxTreeItemId new_id = m_dir->AppendItem( parent, new_name, 0, 1, new_data ); - m_dir->EnsureVisible( new_id ); - m_dir->EditLabel( new_id ); -#endif + wxDirItemDataEx *new_data = new wxDirItemDataEx( path, new_name, TRUE ); + + // TODO: THIS CODE DOESN'T WORK YET. We need to avoid duplication of the first child + // of the parent. + wxTreeItemId new_id = m_dirCtrl->GetTreeCtrl()->AppendItem( parent, new_name, 0, 0, new_data ); + m_dirCtrl->GetTreeCtrl()->EnsureVisible( new_id ); + m_dirCtrl->GetTreeCtrl()->EditLabel( new_id ); } + +#endif // wxUSE_DIRDLG