added wxConvFileName which is a variable, not define as wxConvFile; added comments...

[wxWidgets.git] / src / common / filefn.cpp

diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index 39539d65fd19720b0328d9bafb05c3e1b962bbca..3434d5aaa07a1c6234a98dfe9411a3e4a69163e5 100644 (file)
--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -1226,6 +1226,8 @@ bool wxPathExists(const wxChar *pszPathName)
     DWORD ret = ::GetFileAttributes(strPath);
 
     return (ret != (DWORD)-1) && (ret & FILE_ATTRIBUTE_DIRECTORY);
+#elif defined(__OS2__)
+    return (::DosSetCurrentDir(WXSTRINGCAST strPath));
 #else // !__WIN32__
 
     wxStructStat st;
@@ -1900,7 +1902,7 @@ bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special )
 // This is important for the archive streams, which benefit greatly from
 // being able to seek on a stream, but which will produce corrupt archives
 // if they unknowingly seek on a non-seekable stream.
-// 
+//
 // wxFILE_KIND_DISK is a good catch all return value, since other values
 // disable features of the archive streams. Some other value must be returned
 // for a file type that appears seekable but isn't.
@@ -1952,7 +1954,8 @@ wxFileKind wxGetFileKind(int fd)
 
 wxFileKind wxGetFileKind(FILE *fp)
 {
-#ifndef wxFILEKIND_STUB
+    // note: the watcom rtl dll doesn't have fileno (the static lib does)
+#if !defined wxFILEKIND_STUB && !(defined __WATCOMC__ && defined __SW_BR)
     return wxGetFileKind(fileno(fp));
 #else
     (void)fp;