#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"
#include "wx/log.h"
#include "wx/sizer.h"
#include "wx/tokenzr.h"
+#include "wx/dir.h"
#if wxUSE_STATLINE
#include "wx/statline.h"
bool wxDirItemData::HasSubDirs()
{
- wxString search = m_path + wxT("/*");
- wxLogNull log;
- wxString path = wxFindFirstFile( search, wxDIR );
- return (bool)(!path.IsNull());
+ return wxDir(m_path).HasSubDirs();
}
//-----------------------------------------------------------------------------
wxDirItemData *data = (wxDirItemData *)GetItemData(event.GetItem());
wxASSERT(data);
- wxString search,path,filename;
-
m_paths.Clear();
m_names.Clear();
-#ifdef __WXMSW__
- search = data->m_path + "\\*.*";
-#else
- search = data->m_path + "/*";
-#endif
- for (path = wxFindFirstFile( search, wxDIR ); !path.IsNull();
- path=wxFindNextFile() )
+
+ wxDir dir(data->m_path);
+
+ wxString filename;
+ bool cont = dir.GetFirst(&filename, "", wxDIR_DIRS | wxDIR_HIDDEN);
+ while ( cont )
{
- filename = wxFileNameFromPath( path );
- /* Don't add "." and ".." to the tree. I think wxFindNextFile
- * also checks this, but I don't quite understand what happens
- * there. Also wxFindNextFile seems to swallow hidden dirs */
- if ((filename != ".") && (filename != ".."))
- {
- m_paths.Add(path);
- m_names.Add(filename);
- }
+ m_paths.Add(data->m_path);
+ m_names.Add(filename);
+
+ cont = dir.GetNext(&filename);
}
CreateItems( event.GetItem() );
wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
// 1) dir ctrl
- m_dir = new wxDirCtrl( this, ID_DIRCTRL, "/",
+ m_dir = new wxDirCtrl( this, ID_DIRCTRL, _T("/"),
wxDefaultPosition,
wxSize(200,200),
wxTR_HAS_BUTTONS |