Fixed strange situation when we had wxPathExists and wxDirExists with the same finctionality. Using wxPathExists instead wxFileExists (fixes bug #865628). Minor source cleaning.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32862 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -460,16 +460,6 @@ wxChar *wxGetUserHome(const wxString& WXUNUSED(user))
|
||||
return (wxChar *)wxGetHomeDir(&s_home);
|
||||
}
|
||||
|
||||
bool wxDirExists(const wxString& dir)
|
||||
{
|
||||
#ifdef __WXMICROWIN__
|
||||
return wxPathExist(dir);
|
||||
#elif defined(__WIN32__)
|
||||
DWORD attribs = GetFileAttributes(dir);
|
||||
return ((attribs != (DWORD)-1) && (attribs & FILE_ATTRIBUTE_DIRECTORY));
|
||||
#endif // Win32/__WXMICROWIN__
|
||||
}
|
||||
|
||||
bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree)
|
||||
{
|
||||
#ifdef __WXWINCE__
|
||||
@@ -1231,9 +1221,9 @@ wxToolkitInfo& wxAppTraits::GetToolkitInfo()
|
||||
#ifdef __WXWINCE__
|
||||
case VER_PLATFORM_WIN32_CE:
|
||||
s_ver = wxWINDOWS_CE;
|
||||
#endif
|
||||
#endif
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user