#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/module.h"
#endif
+#include "wx/filename.h"
#include "wx/filefn.h"
#include "wx/imaglist.h"
#include "wx/tokenzr.h"
#endif
#if defined(__WXMAC__)
- #include "wx/mac/private.h" // includes mac headers
+ #include "wx/osx/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
#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"
#endif
+extern WXDLLEXPORT_DATA(const char) wxFileSelectorDefaultWildcardStr[];
+
// If compiled under Windows, this macro can cause problems
#ifdef GetFirstChild
#undef GetFirstChild
#endif
+bool wxIsDriveAvailable(const wxString& dirName);
+
// ----------------------------------------------------------------------------
// wxGetAvailableDrives, for WINDOWS, DOS, OS2, MAC, UNIX (returns "/")
// ----------------------------------------------------------------------------
size_t wxGetAvailableDrives(wxArrayString &paths, wxArrayString &names, wxArrayInt &icon_ids)
{
-#if defined(__WINDOWS__) || defined(__DOS__) || defined(__OS2__)
+#ifdef wxHAS_FILESYSTEM_VOLUMES
#ifdef __WXWINCE__
// No logical drives; return "\"
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]);
-
- // Do not use GetVolumeInformation to further decorate the
- // name, since it can cause severe delays on network drives.
+#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;
{
if (ulDriveMap & ( 1 << i ))
{
- wxString path, name;
- path.Printf(wxT("%c:\\"), 'A' + i);
- name.Printf(wxT("%c:"), 'A' + i);
+ const wxString path = wxFileName::GetVolumeString(
+ 'A' + i, wxPATH_GET_SEPARATOR);
+ const wxString name = wxFileName::GetVolumeString(
+ 'A' + i, wxPATH_NO_SEPARATOR);
// Note: If _filesys is unsupported by some compilers,
// we can always replace it by DosQueryFSAttach
}
}
#else // !__WIN32__, !__OS2__
- int drive;
-
/* If we can switch to the drive, it exists. */
- for( drive = 1; drive <= 26; drive++ )
+ for ( char drive = 'A'; drive <= 'Z'; drive++ )
{
- wxString path, name;
- path.Printf(wxT("%c:\\"), (char) (drive + 'a' - 1));
- name.Printf(wxT("%c:"), (char) (drive + 'A' - 1));
+ const wxString
+ path = wxFileName::GetVolumeString(drive, wxPATH_GET_SEPARATOR);
if (wxIsDriveAvailable(path))
{
paths.Add(path);
- names.Add(name);
- icon_ids.Add((drive <= 2) ? wxFileIconsTable::floppy : wxFileIconsTable::drive);
+ names.Add(wxFileName::GetVolumeString(drive, wxPATH_NO_SEPARATOR));
+ icon_ids.Add(drive <= 2 ? wxFileIconsTable::floppy
+ : wxFileIconsTable::drive);
}
}
#endif // __WIN32__/!__WIN32__
-#elif defined(__WXMAC__)
+#elif defined(__WXMAC__) && wxOSX_USE_COCOA_OR_CARBON
ItemCount volumeIndex = 1;
OSErr err = noErr ;
}
}
-#elif defined(__UNIX__)
+#elif defined(__UNIX__) || defined(__WXPALMOS__)
paths.Add(wxT("/"));
names.Add(wxT("/"));
icon_ids.Add(wxFileIconsTable::computer);
// wxGenericDirCtrl
//-----------------------------------------------------------------------------
-
-#if wxUSE_EXTENDED_RTTI
-WX_DEFINE_FLAGS( wxGenericDirCtrlStyle )
-
-wxBEGIN_FLAGS( wxGenericDirCtrlStyle )
- // new style border flags, we put them first to
- // use them for streaming out
- wxFLAGS_MEMBER(wxBORDER_SIMPLE)
- wxFLAGS_MEMBER(wxBORDER_SUNKEN)
- wxFLAGS_MEMBER(wxBORDER_DOUBLE)
- wxFLAGS_MEMBER(wxBORDER_RAISED)
- wxFLAGS_MEMBER(wxBORDER_STATIC)
- wxFLAGS_MEMBER(wxBORDER_NONE)
-
- // old style border flags
- wxFLAGS_MEMBER(wxSIMPLE_BORDER)
- wxFLAGS_MEMBER(wxSUNKEN_BORDER)
- wxFLAGS_MEMBER(wxDOUBLE_BORDER)
- wxFLAGS_MEMBER(wxRAISED_BORDER)
- wxFLAGS_MEMBER(wxSTATIC_BORDER)
- wxFLAGS_MEMBER(wxBORDER)
-
- // standard window styles
- wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
- wxFLAGS_MEMBER(wxCLIP_CHILDREN)
- wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
- wxFLAGS_MEMBER(wxWANTS_CHARS)
- wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
- wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
- wxFLAGS_MEMBER(wxVSCROLL)
- wxFLAGS_MEMBER(wxHSCROLL)
-
- wxFLAGS_MEMBER(wxDIRCTRL_DIR_ONLY)
- wxFLAGS_MEMBER(wxDIRCTRL_3D_INTERNAL)
- wxFLAGS_MEMBER(wxDIRCTRL_SELECT_FIRST)
- wxFLAGS_MEMBER(wxDIRCTRL_SHOW_FILTERS)
-
-wxEND_FLAGS( wxGenericDirCtrlStyle )
-
-IMPLEMENT_DYNAMIC_CLASS_XTI(wxGenericDirCtrl, wxControl,"wx/dirctrl.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxGenericDirCtrl)
- wxHIDE_PROPERTY( Children )
- wxPROPERTY( DefaultPath , wxString , SetDefaultPath , GetDefaultPath , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
- wxPROPERTY( Filter , wxString , SetFilter , GetFilter , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group") )
- wxPROPERTY( DefaultFilter , int , SetFilterIndex, GetFilterIndex, EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group") )
- wxPROPERTY_FLAGS( WindowStyle, wxGenericDirCtrlStyle, long, SetWindowStyleFlag, GetWindowStyleFlag, EMPTY_MACROVALUE , 0, wxT("Helpstring"), wxT("group") )
-wxEND_PROPERTIES_TABLE()
-
-wxBEGIN_HANDLERS_TABLE(wxGenericDirCtrl)
-wxEND_HANDLERS_TABLE()
-
-wxCONSTRUCTOR_8( wxGenericDirCtrl , wxWindow* , Parent , wxWindowID , Id , wxString , DefaultPath ,
- wxPoint , Position , wxSize , Size , long , WindowStyle , wxString , Filter , int , DefaultFilter )
-#else
-IMPLEMENT_DYNAMIC_CLASS(wxGenericDirCtrl, wxControl)
-#endif
-
BEGIN_EVENT_TABLE(wxGenericDirCtrl, wxControl)
EVT_TREE_ITEM_EXPANDING (wxID_TREECTRL, wxGenericDirCtrl::OnExpandItem)
EVT_TREE_ITEM_COLLAPSED (wxID_TREECTRL, wxGenericDirCtrl::OnCollapseItem)
}
bool wxGenericDirCtrl::Create(wxWindow *parent,
- const wxWindowID id,
+ const wxWindowID treeid,
const wxString& dir,
const wxPoint& pos,
const wxSize& size,
int defaultFilter,
const wxString& name)
{
- if (!wxControl::Create(parent, id, pos, size, style, wxDefaultValidator, name))
+ if (!wxControl::Create(parent, treeid, pos, size, style, wxDefaultValidator, name))
return false;
SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
if (style & wxDIRCTRL_EDIT_LABELS)
treeStyle |= wxTR_EDIT_LABELS;
- if ((style & wxDIRCTRL_3D_INTERNAL) == 0)
- treeStyle |= wxNO_BORDER;
- else
- treeStyle |= wxBORDER_SUNKEN;
+ if (style & wxDIRCTRL_MULTIPLE)
+ treeStyle |= wxTR_MULTIPLE;
- long filterStyle = 0;
if ((style & wxDIRCTRL_3D_INTERNAL) == 0)
- filterStyle |= wxNO_BORDER;
- else
- filterStyle |= wxBORDER_SUNKEN;
+ treeStyle |= wxNO_BORDER;
m_treeCtrl = CreateTreeCtrl(this, wxID_TREECTRL,
wxPoint(0,0), GetClientSize(), treeStyle);
- if (!filter.empty() && (style & wxDIRCTRL_SHOW_FILTERS))
- m_filterListCtrl = new wxDirFilterListCtrl(this, wxID_FILTERLISTCTRL, wxDefaultPosition, wxDefaultSize, filterStyle);
+ if (!filter.empty())
+ m_filterListCtrl = new wxDirFilterListCtrl(this, wxID_FILTERLISTCTRL);
m_defaultPath = dir;
m_filter = filter;
if (m_filter.empty())
-#ifdef __UNIX__
- m_filter = wxT("*");
-#else
- m_filter = wxT("*.*");
-#endif
+ m_filter = wxFileSelectorDefaultWildcardStr;
SetFilterIndex(defaultFilter);
m_filterListCtrl = NULL;
}
-wxTreeCtrl* wxGenericDirCtrl::CreateTreeCtrl(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long treeStyle)
+wxTreeCtrl* wxGenericDirCtrl::CreateTreeCtrl(wxWindow *parent, wxWindowID treeid, const wxPoint& pos, const wxSize& size, long treeStyle)
{
- return new wxTreeCtrl(parent, id, pos, size, treeStyle);
+ return new wxTreeCtrl(parent, treeid, pos, size, treeStyle);
}
void wxGenericDirCtrl::ShowHidden( bool show )
{
+ if ( m_showHidden == show )
+ return;
+
m_showHidden = show;
- wxString path = GetPath();
- ReCreateTree();
- SetPath(path);
+ if ( HasFlag(wxDIRCTRL_MULTIPLE) )
+ {
+ wxArrayString paths;
+ GetPaths(paths);
+ ReCreateTree();
+ for ( unsigned n = 0; n < paths.size(); n++ )
+ {
+ ExpandPath(paths[n]);
+ }
+ }
+ else
+ {
+ wxString path = GetPath();
+ ReCreateTree();
+ SetPath(path);
+ }
}
const wxTreeItemId
{
wxDirItemData *dir_item = new wxDirItemData(path,name,true);
- wxTreeItemId id = AppendItem( m_rootId, name, imageId, -1, dir_item);
+ wxTreeItemId treeid = AppendItem( m_rootId, name, imageId, -1, dir_item);
- m_treeCtrl->SetItemHasChildren(id);
+ m_treeCtrl->SetItemHasChildren(treeid);
- return id;
+ return treeid;
}
void wxGenericDirCtrl::SetupSections()
AddSection(paths[n], names[n], icons[n]);
}
+void wxGenericDirCtrl::SetFocus()
+{
+ // we don't need focus ourselves, give it to the tree so that the user
+ // could navigate it
+ if (m_treeCtrl)
+ m_treeCtrl->SetFocus();
+}
+
void wxGenericDirCtrl::OnBeginEditItem(wxTreeEvent &event)
{
// don't rename the main entry "Sections"
return;
}
- wxTreeItemId id = event.GetItem();
- wxDirItemData *data = (wxDirItemData*)m_treeCtrl->GetItemData( id );
+ wxTreeItemId treeid = event.GetItem();
+ wxDirItemData *data = (wxDirItemData*)m_treeCtrl->GetItemData( treeid );
wxASSERT( data );
wxString new_name( wxPathOnly( data->m_path ) );
// ctor when wxTR_HIDE_ROOT was specified
if (!m_rootId.IsOk())
-
m_rootId = m_treeCtrl->GetRootItem();
ExpandDir(parentId);
return;
data->m_isExpanded = false;
- wxTreeItemIdValue cookie;
- /* Workaround because DeleteChildren has disapeared (why?) and
- * CollapseAndReset doesn't work as advertised (deletes parent too) */
- 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(parentId, cookie);
- }
+
+ m_treeCtrl->Freeze();
if (parentId != m_treeCtrl->GetRootItem())
- m_treeCtrl->Collapse(parentId);
+ m_treeCtrl->CollapseAndReset(parentId);
+ m_treeCtrl->DeleteChildren(parentId);
+ m_treeCtrl->Thaw();
}
-void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId)
+void wxGenericDirCtrl::PopulateNode(wxTreeItemId parentId)
{
wxDirItemData *data = (wxDirItemData *) m_treeCtrl->GetItemData(parentId);
dirs.Sort(wxDirCtrlStringCompareFunction);
// Now do the filenames -- but only if we're allowed to
- if ((GetWindowStyle() & wxDIRCTRL_DIR_ONLY) == 0)
+ if (!HasFlag(wxDIRCTRL_DIR_ONLY))
{
d.Open(dirName);
filenames.Sort(wxDirCtrlStringCompareFunction);
}
+ // Now we really know whether we have any children so tell the tree control
+ // about it.
+ m_treeCtrl->SetItemHasChildren(parentId, !dirs.empty() || !filenames.empty());
+
// Add the sorted dirs
size_t i;
- for (i = 0; i < dirs.Count(); i++)
+ for (i = 0; i < dirs.GetCount(); i++)
{
eachFilename = dirs[i];
path = dirName;
path += eachFilename;
wxDirItemData *dir_item = new wxDirItemData(path,eachFilename,true);
- wxTreeItemId id = AppendItem( parentId, eachFilename,
+ wxTreeItemId treeid = AppendItem( parentId, eachFilename,
wxFileIconsTable::folder, -1, dir_item);
- m_treeCtrl->SetItemImage( id, wxFileIconsTable::folder_open,
+ m_treeCtrl->SetItemImage( treeid, wxFileIconsTable::folder_open,
wxTreeItemIcon_Expanded );
- // Has this got any children? If so, make it expandable.
- // (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)) )
- {
- m_treeCtrl->SetItemHasChildren(id);
- }
+ // assume that it does have children by default as it can take a long
+ // time to really check for this (think remote drives...)
+ //
+ // and if we're wrong, we'll correct the icon later if
+ // the user really tries to open this item
+ m_treeCtrl->SetItemHasChildren(treeid);
}
// Add the sorted filenames
- if ((GetWindowStyle() & wxDIRCTRL_DIR_ONLY) == 0)
+ if (!HasFlag(wxDIRCTRL_DIR_ONLY))
{
- for (i = 0; i < filenames.Count(); i++)
+ for (i = 0; i < filenames.GetCount(); i++)
{
eachFilename = filenames[i];
path = dirName;
}
}
+void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId)
+{
+ // ExpandDir() will not actually expand the tree node, just populate it
+ PopulateNode(parentId);
+}
+
void wxGenericDirCtrl::ReCreateTree()
{
CollapseDir(m_treeCtrl->GetRootItem());
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.IsOk() && !done)
+ wxTreeItemId treeid = FindChild(m_rootId, path, done);
+ wxTreeItemId lastId = treeid; // The last non-zero treeid
+ while (treeid.IsOk() && !done)
{
- ExpandDir(id);
+ ExpandDir(treeid);
- id = FindChild(id, path, done);
- if (id.IsOk())
- lastId = id;
+ treeid = FindChild(treeid, path, done);
+ if (treeid.IsOk())
+ lastId = treeid;
}
if (!lastId.IsOk())
return false;
{
m_treeCtrl->Expand(lastId);
}
- if ((GetWindowStyle() & wxDIRCTRL_SELECT_FIRST) && data->m_isDir)
+ if (HasFlag(wxDIRCTRL_SELECT_FIRST) && data->m_isDir)
{
// Find the first file in this directory
wxTreeItemIdValue cookie;
bool wxGenericDirCtrl::CollapsePath(const wxString& path)
{
bool done = false;
- wxTreeItemId id = FindChild(m_rootId, path, done);
- wxTreeItemId lastId = id; // The last non-zero id
+ wxTreeItemId treeid = FindChild(m_rootId, path, done);
+ wxTreeItemId lastId = treeid; // The last non-zero treeid
- while ( id.IsOk() && !done )
+ while ( treeid.IsOk() && !done )
{
- CollapseDir(id);
+ CollapseDir(treeid);
- id = FindChild(id, path, done);
+ treeid = FindChild(treeid, path, done);
- if ( id.IsOk() )
- lastId = id;
+ if ( treeid.IsOk() )
+ lastId = treeid;
}
if ( !lastId.IsOk() )
wxString wxGenericDirCtrl::GetPath() const
{
- wxTreeItemId id = m_treeCtrl->GetSelection();
- if (id)
+ // Allow calling GetPath() in multiple selection from OnSelFilter
+ if (m_treeCtrl->HasFlag(wxTR_MULTIPLE))
{
- wxDirItemData* data = (wxDirItemData*) m_treeCtrl->GetItemData(id);
+ wxArrayTreeItemIds items;
+ m_treeCtrl->GetSelections(items);
+ if (items.size() > 0)
+ {
+ // return first string only
+ wxTreeItemId treeid = items[0];
+ wxDirItemData* data = (wxDirItemData*) m_treeCtrl->GetItemData(treeid);
+ return data->m_path;
+ }
+
+ return wxEmptyString;
+ }
+
+ wxTreeItemId treeid = m_treeCtrl->GetSelection();
+ if (treeid)
+ {
+ wxDirItemData* data = (wxDirItemData*) m_treeCtrl->GetItemData(treeid);
return data->m_path;
}
else
return wxEmptyString;
}
+void wxGenericDirCtrl::GetPaths(wxArrayString& paths) const
+{
+ paths.clear();
+
+ wxArrayTreeItemIds items;
+ m_treeCtrl->GetSelections(items);
+ for ( unsigned n = 0; n < items.size(); n++ )
+ {
+ wxTreeItemId treeid = items[n];
+ wxDirItemData* data = (wxDirItemData*) m_treeCtrl->GetItemData(treeid);
+ paths.Add(data->m_path);
+ }
+}
+
wxString wxGenericDirCtrl::GetFilePath() const
{
- wxTreeItemId id = m_treeCtrl->GetSelection();
- if (id)
+ wxTreeItemId treeid = m_treeCtrl->GetSelection();
+ if (treeid)
{
- wxDirItemData* data = (wxDirItemData*) m_treeCtrl->GetItemData(id);
+ wxDirItemData* data = (wxDirItemData*) m_treeCtrl->GetItemData(treeid);
if (data->m_isDir)
return wxEmptyString;
else
return wxEmptyString;
}
+void wxGenericDirCtrl::GetFilePaths(wxArrayString& paths) const
+{
+ paths.clear();
+
+ wxArrayTreeItemIds items;
+ m_treeCtrl->GetSelections(items);
+ for ( unsigned n = 0; n < items.size(); n++ )
+ {
+ wxTreeItemId treeid = items[n];
+ wxDirItemData* data = (wxDirItemData*) m_treeCtrl->GetItemData(treeid);
+ if ( !data->m_isDir )
+ paths.Add(data->m_path);
+ }
+}
+
void wxGenericDirCtrl::SetPath(const wxString& path)
{
m_defaultPath = path;
ExpandPath(path);
}
+void wxGenericDirCtrl::SelectPath(const wxString& path, bool select)
+{
+ bool done = false;
+ wxTreeItemId treeid = FindChild(m_rootId, path, done);
+ wxTreeItemId lastId = treeid; // The last non-zero treeid
+ while ( treeid.IsOk() && !done )
+ {
+ treeid = FindChild(treeid, path, done);
+ if ( treeid.IsOk() )
+ lastId = treeid;
+ }
+ if ( !lastId.IsOk() )
+ return;
+
+ if ( done )
+ {
+ m_treeCtrl->SelectItem(treeid, select);
+ }
+}
+
+void wxGenericDirCtrl::SelectPaths(const wxArrayString& paths)
+{
+ if ( HasFlag(wxDIRCTRL_MULTIPLE) )
+ {
+ UnselectAll();
+ for ( unsigned n = 0; n < paths.size(); n++ )
+ {
+ SelectPath(paths[n]);
+ }
+ }
+}
+
+void wxGenericDirCtrl::UnselectAll()
+{
+ m_treeCtrl->UnselectAll();
+}
+
// Not used
#if 0
-void wxGenericDirCtrl::FindChildFiles(wxTreeItemId id, int dirFlags, wxArrayString& filenames)
+void wxGenericDirCtrl::FindChildFiles(wxTreeItemId treeid, int dirFlags, wxArrayString& filenames)
{
- wxDirItemData *data = (wxDirItemData *) m_treeCtrl->GetItemData(id);
+ wxDirItemData *data = (wxDirItemData *) m_treeCtrl->GetItemData(treeid);
// This may take a longish time. Go to busy cursor
wxBusyCursor busy;
{
m_filter = filter;
+ if (!filter.empty() && !m_filterListCtrl)
+ m_filterListCtrl = new wxDirFilterListCtrl(this, wxID_FILTERLISTCTRL);
+ else if (filter.empty() && m_filterListCtrl)
+ {
+ m_filterListCtrl->Destroy();
+ m_filterListCtrl = NULL;
+ }
+
wxString f, d;
if (ExtractWildcard(m_filter, m_currentFilter, f, d))
m_currentFilterStr = f;
#else
m_currentFilterStr = wxT("*.*");
#endif
+ // current filter index is meaningless after filter change, set it to zero
+ SetFilterIndex(0);
+ if (m_filterListCtrl)
+ m_filterListCtrl->FillFilterList(m_filter, 0);
}
// Extract description and actual filter from overall filter string
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()
{
EVT_CHOICE(wxID_ANY, wxDirFilterListCtrl::OnSelFilter)
END_EVENT_TABLE()
-bool wxDirFilterListCtrl::Create(wxGenericDirCtrl* parent, const wxWindowID id,
- const wxPoint& pos,
- const wxSize& size,
- long style)
+bool wxDirFilterListCtrl::Create(wxGenericDirCtrl* parent,
+ const wxWindowID treeid,
+ const wxPoint& pos,
+ const wxSize& size,
+ long style)
{
m_dirCtrl = parent;
- return wxChoice::Create(parent, id, pos, size, 0, NULL, style);
+
+ // by default our border style is determined by the style of our parent
+ if ( !(style & wxBORDER_MASK) )
+ {
+ style |= parent->HasFlag(wxDIRCTRL_3D_INTERNAL) ? wxBORDER_SUNKEN
+ : wxBORDER_NONE;
+ }
+
+ return wxChoice::Create(parent, treeid, pos, size, 0, NULL, style);
}
void wxDirFilterListCtrl::Init()
{
int sel = GetSelection();
- wxString currentPath = m_dirCtrl->GetPath();
+ if (m_dirCtrl->HasFlag(wxDIRCTRL_MULTIPLE))
+ {
+ wxArrayString paths;
+ m_dirCtrl->GetPaths(paths);
+
+ m_dirCtrl->SetFilterIndex(sel);
- m_dirCtrl->SetFilterIndex(sel);
+ // If the filter has changed, the view is out of date, so
+ // collapse the tree.
+ m_dirCtrl->ReCreateTree();
+
+ // Expand and select the previously selected paths
+ for (unsigned int i = 0; i < paths.GetCount(); i++)
+ {
+ m_dirCtrl->ExpandPath(paths.Item(i));
+ }
+ }
+ else
+ {
+ wxString currentPath = m_dirCtrl->GetPath();
- // If the filter has changed, the view is out of date, so
- // collapse the tree.
- m_dirCtrl->ReCreateTree();
+ m_dirCtrl->SetFilterIndex(sel);
+ m_dirCtrl->ReCreateTree();
- // Try to restore the selection, or at least the directory
- m_dirCtrl->ExpandPath(currentPath);
+ // Try to restore the selection, or at least the directory
+ m_dirCtrl->ExpandPath(currentPath);
+ }
}
void wxDirFilterListCtrl::FillFilterList(const wxString& filter, int defaultFilter)
// wxFileIconsTable icons
// ----------------------------------------------------------------------------
-#ifndef __WXGTK24__
+#ifndef __WXGTK20__
/* Computer (c) Julian Smart */
-static const char * file_icons_tbl_computer_xpm[] = {
+static const char* const file_icons_tbl_computer_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 16 42 1",
"r c #4E7FD0",
" dfffffffffffffd",
" "
};
-#endif // GTK+ < 2.4
+#endif // !GTK+ 2
// ----------------------------------------------------------------------------
// wxFileIconsTable & friends
// ----------------------------------------------------------------------------
// global instance of a wxFileIconsTable
-wxFileIconsTable* wxTheFileIconsTable = (wxFileIconsTable *)NULL;
+wxFileIconsTable* wxTheFileIconsTable = NULL;
// A module to allow icons table cleanup
bool OnInit() { wxTheFileIconsTable = new wxFileIconsTable; return true; }
void OnExit()
{
- if (wxTheFileIconsTable)
- {
- delete wxTheFileIconsTable;
- wxTheFileIconsTable = NULL;
- }
+ wxDELETE(wxTheFileIconsTable);
}
};
class wxFileIconEntry : public wxObject
{
public:
- wxFileIconEntry(int i) { id = i; }
+ wxFileIconEntry(int i) { iconid = i; }
- int id;
+ int iconid;
};
wxFileIconsTable::wxFileIconsTable()
wxART_CMN_DIALOG,
wxSize(16, 16)));
// computer
-#ifdef __WXGTK24__
+#ifdef __WXGTK20__
// GTK24 uses this icon in the file open dialog
m_smallImageList->Add(wxArtProvider::GetBitmap(wxART_HARDDISK,
wxART_CMN_DIALOG,
wxART_CMN_DIALOG,
wxSize(16, 16)));
// executable
- if (GetIconID(wxEmptyString, _T("application/x-executable")) == file)
+ if (GetIconID(wxEmptyString, wxT("application/x-executable")) == file)
{
m_smallImageList->Add(wxArtProvider::GetBitmap(wxART_EXECUTABLE_FILE,
wxART_CMN_DIALOG,
wxSize(16, 16)));
- delete m_HashTable->Get(_T("exe"));
- m_HashTable->Delete(_T("exe"));
- m_HashTable->Put(_T("exe"), new wxFileIconEntry(executable));
+ delete m_HashTable->Get(wxT("exe"));
+ m_HashTable->Delete(wxT("exe"));
+ m_HashTable->Put(wxT("exe"), new wxFileIconEntry(executable));
}
/* else put into list by GetIconID
(KDE defines application/x-executable for *.exe and has nice icon)
if (!extension.empty())
{
wxFileIconEntry *entry = (wxFileIconEntry*) m_HashTable->Get(extension);
- if (entry) return (entry -> id);
+ if (entry) return (entry -> iconid);
}
wxFileType *ft = (mime.empty()) ?
delete ft;
- if ( !ic.Ok() )
+ if ( !ic.IsOk() )
{
int newid = file;
m_HashTable->Put(extension, new wxFileIconEntry(newid));
wxBitmap bmp;
bmp.CopyFromIcon(ic);
- if ( !bmp.Ok() )
+ if ( !bmp.IsOk() )
{
int newid = file;
m_HashTable->Put(extension, new wxFileIconEntry(newid));
const unsigned int size = 16;
- int id = m_smallImageList->GetImageCount();
+ int treeid = m_smallImageList->GetImageCount();
if ((bmp.GetWidth() == (int) size) && (bmp.GetHeight() == (int) size))
{
m_smallImageList->Add(bmp);
}
#endif // wxUSE_IMAGE
- m_HashTable->Put(extension, new wxFileIconEntry(id));
- return id;
+ m_HashTable->Put(extension, new wxFileIconEntry(treeid));
+ return treeid;
#else // !wxUSE_MIMETYPE
projects / wxWidgets.git / blobdiff