Deprecate wxPathExists, make wxDirExists used everywhere, minor source cleaning.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33350 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-04-05 16:10:48 +00:00
parent 749a05ee85
commit da865fdd32
22 changed files with 154 additions and 140 deletions

View File

@@ -81,7 +81,7 @@ static inline FIND_DATA FindFirst(
rc = ::DosFindFirst( rsSpec.c_str()
,&hDir
,0x37 // was: FILE_NORMAL
,0x37 // was: FILE_NORMAL
,pFinddata
,sizeof(FILEFINDBUF3)
,&ulFindCount
@@ -213,7 +213,7 @@ bool wxDirData::Read(
wxString* psFilename
)
{
bool bFirst = FALSE;
bool bFirst = false;
FILEFINDBUF3 vFinddata;
#define PTR_TO_FINDDATA (&vFinddata)
@@ -234,12 +234,12 @@ bool wxDirData::Read(
m_vFinddata = FindFirst( sFilespec
,PTR_TO_FINDDATA
);
bFirst = TRUE;
bFirst = true;
}
if ( !IsFindDataOk(m_vFinddata) )
{
return FALSE;
return false;
}
const wxChar* zName;
@@ -249,7 +249,7 @@ bool wxDirData::Read(
{
if (bFirst)
{
bFirst = FALSE;
bFirst = false;
}
else
{
@@ -257,7 +257,7 @@ bool wxDirData::Read(
,PTR_TO_FINDDATA
))
{
return FALSE;
return false;
}
}
@@ -309,7 +309,7 @@ bool wxDirData::Read(
*psFilename = zName;
break;
}
return TRUE;
return true;
} // end of wxDirData::Read
// ----------------------------------------------------------------------------
@@ -321,7 +321,7 @@ bool wxDir::Exists(
const wxString& rsDir
)
{
return wxPathExists(rsDir);
return wxDirExists(rsDir);
} // end of wxDir::Exists
// ----------------------------------------------------------------------------
@@ -343,7 +343,7 @@ bool wxDir::Open(
{
delete M_DIR;
m_data = new wxDirData(rsDirname);
return TRUE;
return true;
} // end of wxDir::Open
bool wxDir::IsOpened() const
@@ -388,7 +388,7 @@ bool wxDir::GetFirst(
, int nFlags
) const
{
wxCHECK_MSG( IsOpened(), FALSE, _T("must wxDir::Open() first") );
wxCHECK_MSG( IsOpened(), false, _T("must wxDir::Open() first") );
M_DIR->Rewind();
M_DIR->SetFileSpec(rsFilespec);
M_DIR->SetFlags(nFlags);
@@ -399,8 +399,8 @@ bool wxDir::GetNext(
wxString* psFilename
) const
{
wxCHECK_MSG( IsOpened(), FALSE, _T("must wxDir::Open() first") );
wxCHECK_MSG( psFilename, FALSE, _T("bad pointer in wxDir::GetNext()") );
wxCHECK_MSG( IsOpened(), false, _T("must wxDir::Open() first") );
wxCHECK_MSG( psFilename, false, _T("bad pointer in wxDir::GetNext()") );
return M_DIR->Read(psFilename);
} // end of wxDir::GetNext