/////////////////////////////////////////////////////////////////////////////
-// Name: dirctrlg.cpp
+// Name: src/generic/dirctrlg.cpp
// Purpose: wxGenericDirCtrl
// Author: Harm van der Heijden, Robert Roebling, Julian Smart
// Modified by:
#include "wx/wxprec.h"
#ifdef __BORLANDC__
-#pragma hdrstop
+ #pragma hdrstop
#endif
#if wxUSE_DIRDLG || wxUSE_FILEDLG
#include "wx/generic/dirctrlg.h"
-#include "wx/module.h"
-#include "wx/utils.h"
-#include "wx/button.h"
-#include "wx/layout.h"
-#include "wx/msgdlg.h"
-#include "wx/textctrl.h"
-#include "wx/textdlg.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/hash.h"
+ #include "wx/intl.h"
+ #include "wx/log.h"
+ #include "wx/utils.h"
+ #include "wx/button.h"
+ #include "wx/icon.h"
+ #include "wx/settings.h"
+ #include "wx/msgdlg.h"
+ #include "wx/cmndata.h"
+ #include "wx/choice.h"
+ #include "wx/textctrl.h"
+ #include "wx/layout.h"
+ #include "wx/sizer.h"
+ #include "wx/textdlg.h"
+ #include "wx/gdicmn.h"
+ #include "wx/image.h"
+ #include "wx/module.h"
+#endif
+
#include "wx/filefn.h"
-#include "wx/cmndata.h"
-#include "wx/gdicmn.h"
-#include "wx/intl.h"
#include "wx/imaglist.h"
-#include "wx/icon.h"
-#include "wx/log.h"
-#include "wx/sizer.h"
#include "wx/tokenzr.h"
#include "wx/dir.h"
-#include "wx/settings.h"
#include "wx/artprov.h"
-#include "wx/hash.h"
#include "wx/mimetype.h"
-#include "wx/image.h"
-#include "wx/choice.h"
#if wxUSE_STATLINE
#include "wx/statline.h"
#endif
#if defined(__WXMAC__)
- #include "wx/mac/private.h" // includes mac headers
+ #include "wx/mac/private.h" // includes mac headers
#endif
#ifdef __WXMSW__
#include <windows.h>
#include "wx/msw/winundef.h"
+#include "wx/volume.h"
// 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)
#if !defined(__WXWINCE__)
- #include <direct.h>
+ #include <direct.h>
#endif
- #include <stdlib.h>
- #include <ctype.h>
+ #include <stdlib.h>
+ #include <ctype.h>
#endif
#endif
#if defined(__OS2__) || defined(__DOS__)
- #ifdef __OS2__
- #define INCL_BASE
- #include <os2.h>
- #ifndef __EMX__
- #include <direct.h>
+ #ifdef __OS2__
+ #define INCL_BASE
+ #include <os2.h>
+ #ifndef __EMX__
+ #include <direct.h>
+ #endif
+ #include <stdlib.h>
+ #include <ctype.h>
#endif
- #include <stdlib.h>
- #include <ctype.h>
- #endif
- extern bool wxIsDriveAvailable(const wxString& dirName);
#endif // __OS2__
#if defined(__WXMAC__)
-# include "MoreFilesX.h"
+ #include "MoreFilesX.h"
#endif
#ifdef __BORLANDC__
-#include "dos.h"
+ #include "dos.h"
#endif
// If compiled under Windows, this macro can cause problems
#undef GetFirstChild
#endif
+bool wxIsDriveAvailable(const wxString& dirName);
+
// ----------------------------------------------------------------------------
// wxGetAvailableDrives, for WINDOWS, DOS, OS2, MAC, UNIX (returns "/")
// ----------------------------------------------------------------------------
paths.Add(wxT("\\"));
names.Add(wxT("\\"));
icon_ids.Add(wxFileIconsTable::computer);
-#elif defined(__WIN32__)
- wxChar driveBuffer[256];
- size_t n = (size_t) GetLogicalDriveStrings(255, driveBuffer);
- size_t i = 0;
- while (i < n)
- {
- wxString path, name;
- path.Printf(wxT("%c:\\"), driveBuffer[i]);
- name.Printf(wxT("%c:"), driveBuffer[i]);
+#elif defined(__WIN32__) && wxUSE_FSVOLUME
+ // TODO: this code (using wxFSVolumeBase) should be used for all platforms
+ // but unfortunately wxFSVolumeBase is not implemented everywhere
+ const wxArrayString as = wxFSVolumeBase::GetVolumes();
+ for (size_t i = 0; i < as.GetCount(); i++)
+ {
+ wxString path = as[i];
+ wxFSVolume vol(path);
int imageId;
- int driveType = ::GetDriveType(path);
- switch (driveType)
+ switch (vol.GetKind())
{
- case DRIVE_REMOVABLE:
- if (path == wxT("a:\\") || path == wxT("b:\\"))
+ case wxFS_VOL_FLOPPY:
+ if ( (path == wxT("a:\\")) || (path == wxT("b:\\")) )
imageId = wxFileIconsTable::floppy;
else
imageId = wxFileIconsTable::removeable;
break;
- case DRIVE_CDROM:
+ case wxFS_VOL_DVDROM:
+ case wxFS_VOL_CDROM:
imageId = wxFileIconsTable::cdrom;
break;
- case DRIVE_REMOTE:
- case DRIVE_FIXED:
+ case wxFS_VOL_NETWORK:
+ if (path[0] == wxT('\\'))
+ continue; // skip "\\computer\folder"
+ imageId = wxFileIconsTable::drive;
+ break;
+ case wxFS_VOL_DISK:
+ case wxFS_VOL_OTHER:
default:
imageId = wxFileIconsTable::drive;
break;
}
-
paths.Add(path);
- names.Add(name);
+ names.Add(vol.GetDisplayName());
icon_ids.Add(imageId);
-
- while (driveBuffer[i] != wxT('\0'))
- i ++;
- i ++;
- if (driveBuffer[i] == wxT('\0'))
- break;
}
#elif defined(__OS2__)
APIRET rc;
// Note: If _filesys is unsupported by some compilers,
// we can always replace it by DosQueryFSAttach
char filesysname[20];
+#ifdef __WATCOMC__
+ ULONG cbBuffer = sizeof(filesysname);
+ PFSQBUFFER2 pfsqBuffer = (PFSQBUFFER2)filesysname;
+ APIRET rc = ::DosQueryFSAttach(name.fn_str(),0,FSAIL_QUERYNAME,pfsqBuffer,&cbBuffer);
+ if (rc != NO_ERROR)
+ {
+ filesysname[0] = '\0';
+ }
+#else
_filesys(name.fn_str(), filesysname, sizeof(filesysname));
+#endif
/* FAT, LAN, HPFS, CDFS, NFS */
int imageId;
if (path == wxT("A:\\") || path == wxT("B:\\"))
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(':') )
+#ifdef __WATCOMC__
+ wxUnusedVar(dirName);
+#else
+ if ( dirName.length() == 3 && dirName[1u] == wxT(':') )
{
wxString dirNameLower(dirName.Lower());
// VS: always return true for removable media, since Win95 doesn't
// Check if this is a root directory and if so,
// whether the drive is available.
- if (dirName.Len() == 3 && dirName[(size_t)1] == wxT(':'))
+ if (dirName.length() == 3 && dirName[(size_t)1] == wxT(':'))
{
wxString dirNameLower(dirName.Lower());
#if defined(__GNUWIN32__) && !(defined(__MINGW32_MAJOR_VERSION) && __MINGW32_MAJOR_VERSION >= 1)
return false;
SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
+ SetForegroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT));
Init();
ExpandRoot();
- SetBestSize(size);
+ SetInitialSize(size);
DoResize();
return true;
void wxGenericDirCtrl::ShowHidden( bool show )
{
+ if ( m_showHidden == show )
+ return;
+
m_showHidden = show;
wxString path = GetPath();
void wxGenericDirCtrl::OnEndEditItem(wxTreeEvent &event)
{
+ if (event.IsEditCancelled())
+ return;
+
if ((event.GetLabel().empty()) ||
- (event.GetLabel() == _(".")) ||
- (event.GetLabel() == _("..")) ||
+ (event.GetLabel() == wxT(".")) ||
+ (event.GetLabel() == wxT("..")) ||
(event.GetLabel().Find(wxT('/')) != wxNOT_FOUND) ||
(event.GetLabel().Find(wxT('\\')) != wxNOT_FOUND) ||
(event.GetLabel().Find(wxT('|')) != wxNOT_FOUND))
// 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())
// Add the sorted dirs
size_t i;
- for (i = 0; i < dirs.Count(); i++)
+ for (i = 0; i < dirs.GetCount(); i++)
{
- wxString eachFilename(dirs[i]);
+ eachFilename = dirs[i];
path = dirName;
if (!wxEndsWithPathSeparator(path))
path += wxString(wxFILE_SEP_PATH);
// Add the sorted filenames
if ((GetWindowStyle() & wxDIRCTRL_DIR_ONLY) == 0)
{
- for (i = 0; i < filenames.Count(); i++)
+ for (i = 0; i < filenames.GetCount(); i++)
{
- wxString eachFilename(filenames[i]);
+ eachFilename = filenames[i];
path = dirName;
if (!wxEndsWithPathSeparator(path))
path += wxString(wxFILE_SEP_PATH);
childPath.MakeLower();
#endif
- if (childPath.Len() <= path2.Len())
+ if (childPath.length() <= path2.length())
{
- wxString path3 = path2.Mid(0, childPath.Len());
+ wxString path3 = path2.Mid(0, childPath.length());
if (childPath == path3)
{
- if (path3.Len() == path2.Len())
+ if (path3.length() == path2.length())
done = true;
else
done = false;
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
+ {
+ m_treeCtrl->SelectItem(lastId);
+ m_treeCtrl->EnsureVisible(lastId);
+ }
+
+ return true;
+}
+
+
+bool wxGenericDirCtrl::CollapsePath(const wxString& path)
+{
+ bool done = false;
+ wxTreeItemId id = FindChild(m_rootId, path, done);
+ wxTreeItemId lastId = id; // The last non-zero id
+
+ while ( id.IsOk() && !done )
+ {
+ CollapseDir(id);
+
+ id = FindChild(id, path, done);
+
+ if ( id.IsOk() )
+ lastId = id;
+ }
+
+ if ( !lastId.IsOk() )
return false;
+
+ m_treeCtrl->SelectItem(lastId);
+ m_treeCtrl->EnsureVisible(lastId);
+
+ return true;
}
+
wxString wxGenericDirCtrl::GetPath() const
{
wxTreeItemId id = m_treeCtrl->GetSelection();
return false;
}
-#if WXWIN_COMPATIBILITY_2_4
-// Parses the global filter, returning the number of filters.
-// Returns 0 if none or if there's a problem.
-// filterStr is in the form: "All files (*.*)|*.*|JPEG Files (*.jpeg)|*.jpg"
-int wxGenericDirCtrl::ParseFilter(const wxString& filterStr, wxArrayString& filters, wxArrayString& descriptions)
-{
- return wxParseCommonDialogsFilter(filterStr, descriptions, filters );
-}
-#endif // WXWIN_COMPATIBILITY_2_4
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(wxDefaultCoord,
- wxDefaultCoord,
- oldSize.x+10,
- wxDefaultCoord,
- wxSIZE_USE_EXISTING);
- m_filterListCtrl->SetSize(wxDefaultCoord,
- wxDefaultCoord,
- oldSize.x,
- wxDefaultCoord,
- wxSIZE_USE_EXISTING);
-#endif
filterSz = m_filterListCtrl->GetSize();
sz.y -= (filterSz.y + verticalSpacing);
}
return m_smallImageList;
}
-#if wxUSE_MIMETYPE && wxUSE_IMAGE
+#if wxUSE_MIMETYPE && wxUSE_IMAGE && (!defined(__WXMSW__) || wxUSE_WXDIB)
// VS: we don't need this function w/o wxMimeTypesManager because we'll only have
// one icon and we won't resize it
{
m_smallImageList->Add(bmp);
}
-#if wxUSE_IMAGE
+#if wxUSE_IMAGE && (!defined(__WXMSW__) || wxUSE_WXDIB)
else
{
wxImage img = bmp.ConvertToImage();
projects / wxWidgets.git / blobdiff