From bf58daba3897eff9fdbf7477b6bfe90e3dc7a205 Mon Sep 17 00:00:00 2001 From: Stefan Neis Date: Sun, 15 Jan 2006 22:16:02 +0000 Subject: [PATCH] Some OS/2 specific improvements. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36889 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/filefn.cpp | 7 ++++++- src/common/filename.cpp | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp index 84ebf76d34..ed9b69b1cd 100644 --- a/src/common/filefn.cpp +++ b/src/common/filefn.cpp @@ -301,7 +301,12 @@ wxFileExists (const wxString& filename) #else // !__WIN32__ wxStructStat st; #ifndef wxNEED_WX_UNISTD_H - return wxStat( filename.fn_str() , &st) == 0 && (st.st_mode & S_IFREG); + return (wxStat( filename.fn_str() , &st) == 0 && (st.st_mode & S_IFREG)) +#ifdef __OS2__ + || (errno == EACCES) // if access is denied something with that name + // exists and is opened in exclusive mode. +#endif + ; #else return wxStat( filename , &st) == 0 && (st.st_mode & S_IFREG); #endif diff --git a/src/common/filename.cpp b/src/common/filename.cpp index 451effbc3c..7be190fe44 100644 --- a/src/common/filename.cpp +++ b/src/common/filename.cpp @@ -1989,7 +1989,7 @@ bool wxFileName::GetTimes(wxDateTime *dtAccess, return true; } -#elif defined(__UNIX_LIKE__) || defined(__WXMAC__) || (defined(__DOS__) && defined(__WATCOMC__)) +#elif defined(__UNIX_LIKE__) || defined(__WXMAC__) || defined(__OS2__) || (defined(__DOS__) && defined(__WATCOMC__)) wxStructStat stBuf; if ( wxStat( GetFullPath().c_str(), &stBuf) == 0 ) { -- 2.45.2