#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"
// 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_MULTIPLE)
-
-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));
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 )
{
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()
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);
- if ( m_treeCtrl->GetChildrenCount(parentId, false) == 0 )
- {
- m_treeCtrl->SetItemHasChildren(parentId, false);
- }
}
void wxGenericDirCtrl::OnCollapseItem(wxTreeEvent &event )
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);
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.GetCount(); i++)
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 );
// 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 it later in OnExpandItem() if
+ // and if we're wrong, we'll correct the icon later if
// the user really tries to open this item
- m_treeCtrl->SetItemHasChildren(id);
+ m_treeCtrl->SetItemHasChildren(treeid);
}
// Add the sorted filenames
}
}
+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;
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
m_treeCtrl->GetSelections(items);
for ( unsigned n = 0; n < items.size(); n++ )
{
- wxTreeItemId id = items[n];
- wxDirItemData* data = (wxDirItemData*) m_treeCtrl->GetItemData(id);
+ 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
m_treeCtrl->GetSelections(items);
for ( unsigned n = 0; n < items.size(); n++ )
{
- wxTreeItemId id = items[n];
- wxDirItemData* data = (wxDirItemData*) m_treeCtrl->GetItemData(id);
+ wxTreeItemId treeid = items[n];
+ wxDirItemData* data = (wxDirItemData*) m_treeCtrl->GetItemData(treeid);
if ( !data->m_isDir )
paths.Add(data->m_path);
}
void wxGenericDirCtrl::SelectPath(const wxString& path, bool select)
{
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 )
{
- id = FindChild(id, path, done);
- if ( id.IsOk() )
- lastId = id;
+ treeid = FindChild(treeid, path, done);
+ if ( treeid.IsOk() )
+ lastId = treeid;
}
if ( !lastId.IsOk() )
return;
if ( done )
{
- if(select && m_treeCtrl->IsSelected(id))
- return;
- else
- {
- m_treeCtrl->SelectItem(id, select);
- }
+ m_treeCtrl->SelectItem(treeid, select);
}
}
// 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;
END_EVENT_TABLE()
bool wxDirFilterListCtrl::Create(wxGenericDirCtrl* parent,
- const wxWindowID id,
+ const wxWindowID treeid,
const wxPoint& pos,
const wxSize& size,
long style)
: wxBORDER_NONE;
}
- return wxChoice::Create(parent, id, pos, size, 0, NULL, style);
+ 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);
+
+ // If the filter has changed, the view is out of date, so
+ // collapse the tree.
+ m_dirCtrl->ReCreateTree();
- m_dirCtrl->SetFilterIndex(sel);
+ // 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)
#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",
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)));
// 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()) ?
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