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

wxStat call preliminary fix

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30587 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2004-11-17 15:16:58 +00:00
parent d5c8817ce5
commit f3660dcb2f
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/filefn.cpp
View File

@@ -298,7 +298,11 @@ wxFileExists (const wxString& filename)
return (ret != (DWORD)-1) && !(ret & FILE_ATTRIBUTE_DIRECTORY); return (ret != (DWORD)-1) && !(ret & FILE_ATTRIBUTE_DIRECTORY);
#else // !__WIN32__ #else // !__WIN32__
wxStructStat st; wxStructStat st;
return wxStat(filename, &st) == 0 && (st.st_mode & S_IFREG); #ifndef wxNEED_WX_UNISTD_H
return wxStat( filename.fn_str() , &st) == 0 && (st.st_mode & S_IFREG);
#else
return wxStat( filename , &st) == 0 && (st.st_mode & S_IFREG);
#endif
#endif // __WIN32__/!__WIN32__ #endif // __WIN32__/!__WIN32__
} }

6
src/generic/filedlgg.cpp
View File

@@ -200,7 +200,13 @@ void wxFileData::ReadData()
lstat( m_filePath.fn_str(), &buff ); lstat( m_filePath.fn_str(), &buff );
m_type |= S_ISLNK( buff.st_mode ) != 0 ? is_link : 0; m_type |= S_ISLNK( buff.st_mode ) != 0 ? is_link : 0;
#else // no lstat() #else // no lstat()
// only translate to file charset if we don't go by our
// wxStat implementation
#ifndef wxNEED_WX_UNISTD_H
wxStat( m_filePath.fn_str() , &buff );
#else
wxStat( m_filePath, &buff ); wxStat( m_filePath, &buff );
#endif
#endif #endif
m_type |= (buff.st_mode & S_IFDIR) != 0 ? is_dir : 0; m_type |= (buff.st_mode & S_IFDIR) != 0 ? is_dir : 0;