Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make wxDir::Has{Files,SubDirs}() const

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53315 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-04-22 16:29:43 +00:00
parent 960b1f9409
commit 106dcc2cea
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/dir.h
View File

@@ -120,10 +120,10 @@ public:
bool GetNext(wxString *filename) const; bool GetNext(wxString *filename) const;
// return true if this directory has any files in it // return true if this directory has any files in it
bool HasFiles(const wxString& spec = wxEmptyString); bool HasFiles(const wxString& spec = wxEmptyString) const;
// return true if this directory has any subdirectories // return true if this directory has any subdirectories
bool HasSubDirs(const wxString& spec = wxEmptyString); bool HasSubDirs(const wxString& spec = wxEmptyString) const;
// enumerate all files in this directory and its subdirectories // enumerate all files in this directory and its subdirectories
// //

4
interface/dir.h
View File

@@ -244,14 +244,14 @@ public:
@a filespec. If @a filespec is empty, look for any files at all. In any @a filespec. If @a filespec is empty, look for any files at all. In any
case, even hidden files are taken into account. case, even hidden files are taken into account.
*/ */
bool HasFiles(const wxString& filespec = wxEmptyString); bool HasFiles(const wxString& filespec = wxEmptyString) const;
/** /**
Returns @true if the directory contains any subdirectories (if a non Returns @true if the directory contains any subdirectories (if a non
empty @a filespec is given, only check for directories matching it). empty @a filespec is given, only check for directories matching it).
The hidden subdirectories are taken into account as well. The hidden subdirectories are taken into account as well.
*/ */
bool HasSubDirs(const wxString& dirspec = wxEmptyString); bool HasSubDirs(const wxString& dirspec = wxEmptyString) const;
/** /**
Returns @true if the directory was successfully opened by a previous Returns @true if the directory was successfully opened by a previous

4
src/common/dircmn.cpp
View File

@@ -55,7 +55,7 @@ wxDirTraverser::OnOpenError(const wxString& WXUNUSED(dirname))
// dumb generic implementation // dumb generic implementation
bool wxDir::HasFiles(const wxString& spec) bool wxDir::HasFiles(const wxString& spec) const
{ {
wxString s; wxString s;
return GetFirst(&s, spec, wxDIR_FILES | wxDIR_HIDDEN); return GetFirst(&s, spec, wxDIR_FILES | wxDIR_HIDDEN);
@@ -64,7 +64,7 @@ bool wxDir::HasFiles(const wxString& spec)
// we have a (much) faster version for Unix // we have a (much) faster version for Unix
#if (defined(__CYGWIN__) && defined(__WINDOWS__)) || !defined(__UNIX_LIKE__) || defined(__WXMAC__) || defined(__EMX__) || defined(__WINE__) #if (defined(__CYGWIN__) && defined(__WINDOWS__)) || !defined(__UNIX_LIKE__) || defined(__WXMAC__) || defined(__EMX__) || defined(__WINE__)
bool wxDir::HasSubDirs(const wxString& spec) bool wxDir::HasSubDirs(const wxString& spec) const
{ {
wxString s; wxString s;
return GetFirst(&s, spec, wxDIR_DIRS | wxDIR_HIDDEN); return GetFirst(&s, spec, wxDIR_DIRS | wxDIR_HIDDEN);

2
src/unix/dir.cpp
View File

@@ -290,7 +290,7 @@ bool wxDir::GetNext(wxString *filename) const
return M_DIR->Read(filename); return M_DIR->Read(filename);
} }
bool wxDir::HasSubDirs(const wxString& spec) bool wxDir::HasSubDirs(const wxString& spec) const
{ {
wxCHECK_MSG( IsOpened(), false, _T("must wxDir::Open() first") ); wxCHECK_MSG( IsOpened(), false, _T("must wxDir::Open() first") );