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

compilation fixes after previous check in (sorry)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13836 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-01-26 22:05:19 +00:00
parent 4ed09051a2
commit e32d659d4d
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/common/filefn.cpp
View File

@@ -300,7 +300,7 @@ bool
wxFileExists (const wxString& filename) wxFileExists (const wxString& filename)
{ {
#if defined(__WIN32__) && !defined(__WXMICROWIN__) #if defined(__WIN32__) && !defined(__WXMICROWIN__)
// GetFileAttributes can copy with network paths // GetFileAttributes can copy with network paths unlike stat()
DWORD ret = ::GetFileAttributes(filename); DWORD ret = ::GetFileAttributes(filename);
if ( ret == (DWORD)-1 ) if ( ret == (DWORD)-1 )
{ {
@@ -1266,6 +1266,7 @@ bool wxRmdir(const wxString& dir, int WXUNUSED(flags))
bool wxPathExists(const wxChar *pszPathName) bool wxPathExists(const wxChar *pszPathName)
{ {
wxString strPath(pszPathName); wxString strPath(pszPathName);
#ifdef __WINDOWS__ #ifdef __WINDOWS__
// Windows fails to find directory named "c:\dir\" even if "c:\dir" exists, // Windows fails to find directory named "c:\dir\" even if "c:\dir" exists,
// so remove all trailing backslashes from the path - but don't do this for // so remove all trailing backslashes from the path - but don't do this for
@@ -1281,8 +1282,8 @@ bool wxPathExists(const wxChar *pszPathName)
#endif // __WINDOWS__ #endif // __WINDOWS__
#if defined(__WIN32__) && !defined(__WXMICROWIN__) #if defined(__WIN32__) && !defined(__WXMICROWIN__)
// Stat can't cope with network paths // stat() can't cope with network paths
DWORD ret = ::GetFileAttributes(filename); DWORD ret = ::GetFileAttributes(strPath);
if ( ret == (DWORD)-1 ) if ( ret == (DWORD)-1 )
{ {
wxLogLastError(_T("GetFileAttributes")); wxLogLastError(_T("GetFileAttributes"));
@@ -1291,7 +1292,7 @@ bool wxPathExists(const wxChar *pszPathName)
} }
return (ret & FILE_ATTRIBUTE_DIRECTORY) != 0; return (ret & FILE_ATTRIBUTE_DIRECTORY) != 0;
#else #else // !__WIN32__
wxStructStat st; wxStructStat st;
#ifndef __VISAGECPP__ #ifndef __VISAGECPP__
@@ -1303,7 +1304,7 @@ bool wxPathExists(const wxChar *pszPathName)
(st.st_mode == S_IFDIR); (st.st_mode == S_IFDIR);
#endif #endif
#endif #endif // __WIN32__/!__WIN32__
} }
// Get a temporary filename, opening and closing the file. // Get a temporary filename, opening and closing the file.