X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7328394a2afaf3519424ae3280c51cd8d2c10f9f..c10f20703e5b4e9c605b908f480b863c89ca31ee:/src/generic/dirctrlg.cpp?ds=sidebyside diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp index 5ea3910aee..d00e4d958b 100644 --- a/src/generic/dirctrlg.cpp +++ b/src/generic/dirctrlg.cpp @@ -20,7 +20,7 @@ #pragma hdrstop #endif -#include "wx/defs.h" +#if wxUSE_DIRDLG #include "wx/utils.h" #include "wx/dialog.h" @@ -57,6 +57,20 @@ #endif +#ifdef __WXPM__ + +#define INCL_BASE +#include +#include +#include +#include + +#endif // __WXPM__ + +#if defined(__WXMAC__) && !defined(__UNIX__) +#include "moreextr.h" +#endif + #ifdef __BORLANDC__ #include "dos.h" #endif @@ -66,7 +80,6 @@ #undef GetFirstChild #endif -#if !defined(__WXMSW__) || wxUSE_XPM_IN_MSW /* Closed folder */ static char * icon1_xpm[] = { /* width height ncolors chars_per_pixel */ @@ -288,7 +301,6 @@ static char * icon8_xpm[] = { " ", " ", " "}; -#endif // !wxMSW static const int ID_DIRCTRL = 1000; static const int ID_TEXTCTRL = 1001; @@ -297,7 +309,31 @@ static const int ID_CANCEL = 1003; static const int ID_NEW = 1004; //static const int ID_CHECK = 1005; +#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__ @@ -315,8 +351,8 @@ static bool wxIsDriveAvailable(const wxString dirName) #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) { @@ -332,6 +368,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 //----------------------------------------------------------------------------- @@ -420,7 +466,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)); @@ -429,18 +474,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; @@ -448,7 +481,7 @@ bool wxGenericDirCtrl::Create(wxWindow *parent, wxString rootName; -#ifdef __WXMSW__ +#if defined(__WXMSW__) || defined(__WXPM__) rootName = _("Computer"); #else rootName = _("Sections"); @@ -487,8 +520,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 @@ -502,7 +535,7 @@ void wxGenericDirCtrl::AddSection(const wxString& path, const wxString& name, in void wxGenericDirCtrl::SetupSections() { -#ifdef __WXMSW__ +#if defined(__WXMSW__) || defined(__WXPM__) #ifdef __WIN32__ wxChar driveBuffer[256]; @@ -559,12 +592,22 @@ void wxGenericDirCtrl::SetupSections() if (wxIsDriveAvailable(path)) { - + AddSection(path, name); } } #endif - +#elif defined(__WXMAC__) && !defined(__UNIX__) + 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+":", name, 0); + } #else AddSection(wxT("/"), _("The Computer"), 0); AddSection(wxGetHomeDir(), _("My Home"), 0 ); @@ -686,7 +729,7 @@ 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)) @@ -700,7 +743,7 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId) // 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 @@ -728,7 +771,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) @@ -736,7 +779,7 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId) wxLogNull log; d.Open(dirName); - + if (d.IsOpened()) { if (d.GetFirst(& eachFilename, m_currentFilterStr, wxDIR_FILES)) @@ -751,7 +794,7 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId) while (d.GetNext(& eachFilename)) ; } } - filenames.Sort(); + filenames.Sort((wxArrayString::CompareFunction) wxDirCtrlStringCompareFunction); } // Add the sorted dirs @@ -767,7 +810,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 @@ -812,36 +855,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()); @@ -855,7 +898,7 @@ wxTreeItemId wxGenericDirCtrl::FindChild(wxTreeItemId parentId, const wxString& } } } - + childId = m_treeCtrl->GetNextChild(childId, cookie); } wxTreeItemId invalid; @@ -869,15 +912,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) @@ -890,10 +933,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); @@ -970,7 +1013,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 @@ -1097,7 +1140,7 @@ void wxGenericDirCtrl::DoResize() } -void wxGenericDirCtrl::OnSize(wxSizeEvent &event) +void wxGenericDirCtrl::OnSize(wxSizeEvent& WXUNUSED(event)) { DoResize(); } @@ -1126,12 +1169,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 @@ -1226,12 +1269,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) @@ -1357,3 +1400,5 @@ void wxGenericDirDialog::OnNew( wxCommandEvent& WXUNUSED(event) ) m_dirCtrl->GetTreeCtrl()->EnsureVisible( new_id ); m_dirCtrl->GetTreeCtrl()->EditLabel( new_id ); } + +#endif // wxUSE_DIRDLG