one additional assign

[wxWidgets.git] / include / wx / filefn.h

diff --git a/include/wx/filefn.h b/include/wx/filefn.h
index 7573a31f620b376b94a07d9bf2630f03c5952d8e..ba57e3800161481fc842ffcebefe1b4e37981260 100644 (file)
--- a/include/wx/filefn.h
+++ b/include/wx/filefn.h
@@ -95,6 +95,10 @@
 // constants
 // ----------------------------------------------------------------------------
 
 // constants
 // ----------------------------------------------------------------------------
 

+#if defined(__VISUALC__) || defined(__DIGITALMARS__)
+    typedef int mode_t;
+#endif
+

 #ifdef __WXWINCE__
     typedef long off_t;
 #else
 #ifdef __WXWINCE__
     typedef long off_t;
 #else


@@ -139,23 +143,23 @@ enum wxFileKind
 #if defined( __WXWINCE__)
     typedef __int64 wxFileOffset;
     #define wxFileOffsetFmtSpec _("I64")
 #if defined( __WXWINCE__)
     typedef __int64 wxFileOffset;
     #define wxFileOffsetFmtSpec _("I64")

-    int wxOpen(const wxChar *filename, int oflag, int WXUNUSED(pmode));
-    int wxAccess(const wxChar *name, int WXUNUSED(how));
-    int wxClose(int fd);
-    int wxFsync(int WXUNUSED(fd));
-    int wxRead(int fd, void *buf, unsigned int count);
-    int wxWrite(int fd, const void *buf, unsigned int count);
-    int wxEof(int fd);
-    wxFileOffset wxSeek(int fd, wxFileOffset offset, int origin);
+    WXDLLIMPEXP_BASE int wxCRT_Open(const wxChar *filename, int oflag, int WXUNUSED(pmode));
+    WXDLLIMPEXP_BASE int wxCRT_Access(const wxChar *name, int WXUNUSED(how));
+    WXDLLIMPEXP_BASE int wxClose(int fd);
+    WXDLLIMPEXP_BASE int wxFsync(int WXUNUSED(fd));
+    WXDLLIMPEXP_BASE int wxRead(int fd, void *buf, unsigned int count);
+    WXDLLIMPEXP_BASE int wxWrite(int fd, const void *buf, unsigned int count);
+    WXDLLIMPEXP_BASE int wxEof(int fd);
+    WXDLLIMPEXP_BASE wxFileOffset wxSeek(int fd, wxFileOffset offset, int origin);

     #define wxLSeek wxSeek
     #define wxLSeek wxSeek

-    wxFileOffset wxTell(int fd);
+    WXDLLIMPEXP_BASE wxFileOffset wxTell(int fd);

 
     // always Unicode under WinCE
 
     // always Unicode under WinCE

-    #define   wxMkDir      _wmkdir
-    #define   wxRmDir      _wrmdir
-    #define   wxStat       _wstat
+    #define   wxCRT_MkDir      _wmkdir
+    #define   wxCRT_RmDir      _wrmdir
+    #define   wxCRT_Stat       _wstat

     #define   wxStructStat struct _stat
     #define   wxStructStat struct _stat

-#elif defined(__WXMSW__) && !defined(__WXPALMOS__) && \
+#elif (defined(__WXMSW__) || defined(__OS2__)) && !defined(__WXPALMOS__) && \

       ( \
         defined(__VISUALC__) || \
         (defined(__MINGW32__) && !defined(__WINE__) && \
       ( \
         defined(__VISUALC__) || \
         (defined(__MINGW32__) && !defined(__WINE__) && \


@@ -168,13 +172,9 @@ enum wxFileKind
 
     #undef wxHAS_HUGE_FILES
 
 
     #undef wxHAS_HUGE_FILES
 

-    // detect compilers which have support for huge files (notice that the
-    // MSVC falls under _INTEGRAL_MAX_BITS >= 64 branch, so we don't have to
-    // test for it explicitly)
-    #if defined(_INTEGRAL_MAX_BITS)
-        #if _INTEGRAL_MAX_BITS >= 64
-            #define wxHAS_HUGE_FILES 1
-        #endif
+    // detect compilers which have support for huge files
+    #if defined(__VISUALC__)
+        #define wxHAS_HUGE_FILES 1

     #elif defined(__MINGW32__)
         #define wxHAS_HUGE_FILES 1
     #elif defined(_LARGE_FILES)
     #elif defined(__MINGW32__)
         #define wxHAS_HUGE_FILES 1
     #elif defined(_LARGE_FILES)


@@ -185,12 +185,6 @@ enum wxFileKind
     // huge file support (or at least not all functions needed for it by wx)
     // currently
 
     // huge file support (or at least not all functions needed for it by wx)
     // currently
 

-
-    // functions
-    #if defined(__BORLANDC__) || defined(__WATCOMC__)
-        #define   _tell        tell
-    #endif
-

     #ifdef wxHAS_HUGE_FILES
         typedef wxLongLong_t wxFileOffset;
         #define wxFileOffsetFmtSpec wxLongLongFmtSpec
     #ifdef wxHAS_HUGE_FILES
         typedef wxLongLong_t wxFileOffset;
         #define wxFileOffsetFmtSpec wxLongLongFmtSpec


@@ -198,7 +192,33 @@ enum wxFileKind
         typedef off_t wxFileOffset;
     #endif
 
         typedef off_t wxFileOffset;
     #endif
 

-    #define   wxClose      _close
+
+    // functions
+
+    // MSVC and compatible compilers prepend underscores to the POSIX function
+    // names, other compilers don't and even if their later versions usually do
+    // define the versions with underscores for MSVC compatibility, it's better
+    // to avoid using them as they're not present in earlier versions and
+    // always using the native functions spelling is easier than testing for
+    // the versions
+    #if defined(__BORLANDC__) || defined(__DMC__) || defined(__WATCOMC__)
+        #define wxPOSIX_IDENT(func)    ::func
+    #else // by default assume MSVC-compatible names
+        #define wxPOSIX_IDENT(func)    _ ## func
+        #define wxHAS_UNDERSCORES_IN_POSIX_IDENTS
+    #endif
+
+    // at least Borland 5.5 doesn't like "struct ::stat" so don't use the scope
+    // resolution operator present in wxPOSIX_IDENT for it
+    #ifdef __BORLANDC__
+        #define wxPOSIX_STRUCT(s)    struct s
+    #else
+        #define wxPOSIX_STRUCT(s)    struct wxPOSIX_IDENT(s)
+    #endif
+
+    // first functions not working with strings, i.e. without ANSI/Unicode
+    // complications
+    #define   wxClose      wxPOSIX_IDENT(close)

 
     #if defined(__MWERKS__)
         #if __MSL__ >= 0x6000
 
     #if defined(__MWERKS__)
         #if __MSL__ >= 0x6000


@@ -210,33 +230,33 @@ enum wxFileKind
             #define wxWrite(fd, buf, nCount)\
                   _write(fd, (const char *)buf, nCount)
         #endif
             #define wxWrite(fd, buf, nCount)\
                   _write(fd, (const char *)buf, nCount)
         #endif

-    #else
-        #if defined(__DMC__) || defined(__WATCOMC__)
-            #define wxRead        ::read
-            #define wxWrite       ::write
-        #else
-            #define wxRead         _read
-            #define wxWrite        _write
-        #endif
+    #else // __MWERKS__
+        #define wxRead         wxPOSIX_IDENT(read)
+        #define wxWrite        wxPOSIX_IDENT(write)

     #endif
     #endif

+

     #ifdef wxHAS_HUGE_FILES
     #ifdef wxHAS_HUGE_FILES

-        #define   wxSeek       _lseeki64
-        #define   wxLseek      _lseeki64
-        #define   wxTell       _telli64
+        #define   wxSeek       wxPOSIX_IDENT(lseeki64)
+        #define   wxLseek      wxPOSIX_IDENT(lseeki64)
+        #define   wxTell       wxPOSIX_IDENT(telli64)

     #else // !wxHAS_HUGE_FILES
     #else // !wxHAS_HUGE_FILES

-        #define   wxSeek       _lseek
-        #define   wxLseek      _lseek
-        #define   wxTell       _tell
+        #define   wxSeek       wxPOSIX_IDENT(lseek)
+        #define   wxLseek      wxPOSIX_IDENT(lseek)
+        #define   wxTell       wxPOSIX_IDENT(tell)

     #endif // wxHAS_HUGE_FILES/!wxHAS_HUGE_FILES
 
     #endif // wxHAS_HUGE_FILES/!wxHAS_HUGE_FILES
 

-    #define   wxFsync      _commit
+    #ifndef __WATCOMC__
+        #if !defined(__BORLANDC__) || (__BORLANDC__ > 0x540)
+           // NB: this one is not POSIX and always has the underscore
+           #define   wxFsync      _commit

 
 

-    #if defined(__WATCOMC__)
-        #define   wxEof        ::eof
-    #else
-        #define   wxEof        _eof
+           #define HAVE_FSYNC
+       #endif // BORLANDC

     #endif
 
     #endif
 

+    #define   wxEof        wxPOSIX_IDENT(eof)
+
+    // then the functions taking strings

     #if wxUSE_UNICODE
         #if wxUSE_UNICODE_MSLU
             // implement the missing file functions in Win9x ourselves
     #if wxUSE_UNICODE
         #if wxUSE_UNICODE_MSLU
             // implement the missing file functions in Win9x ourselves


@@ -245,57 +265,73 @@ enum wxFileKind
                 || ( defined(__MWERKS__) && defined(__WXMSW__) ) \
                 || ( defined(__BORLANDC__) && (__BORLANDC__ > 0x460) ) \
                 || defined(__DMC__)
                 || ( defined(__MWERKS__) && defined(__WXMSW__) ) \
                 || ( defined(__BORLANDC__) && (__BORLANDC__ > 0x460) ) \
                 || defined(__DMC__)

-                #ifdef __BORLANDC__
-                    // BCC has _stati64() function but struct stati64
-                    #define _stati64 stati64
-                #endif // __BORLANDC__

 
 

-                WXDLLIMPEXP_BASE int wxMSLU__wopen(const wxChar *name, int flags, int mode);
-                WXDLLIMPEXP_BASE int wxMSLU__waccess(const wxChar *name, int mode);
+                WXDLLIMPEXP_BASE int wxMSLU__wopen(const wxChar *name,
+                                                   int flags, int mode);
+                WXDLLIMPEXP_BASE int wxMSLU__waccess(const wxChar *name,
+                                                     int mode);

                 WXDLLIMPEXP_BASE int wxMSLU__wmkdir(const wxChar *name);
                 WXDLLIMPEXP_BASE int wxMSLU__wrmdir(const wxChar *name);
                 WXDLLIMPEXP_BASE int wxMSLU__wmkdir(const wxChar *name);
                 WXDLLIMPEXP_BASE int wxMSLU__wrmdir(const wxChar *name);

-                WXDLLIMPEXP_BASE int wxMSLU__wstat(const wxChar *name, struct _stat *buffer);
-                WXDLLIMPEXP_BASE int wxMSLU__wstati64(const wxChar *name, struct _stati64 *buffer);
+
+                WXDLLIMPEXP_BASE int
+                wxMSLU__wstat(const wxChar *name, wxPOSIX_STRUCT(stat) *buffer);
+                WXDLLIMPEXP_BASE int
+                wxMSLU__wstati64(const wxChar *name,
+                                 wxPOSIX_STRUCT(stati64) *buffer);

             #endif // Windows compilers with MSLU support
 
             #endif // Windows compilers with MSLU support
 

-            #define   wxOpen       wxMSLU__wopen
+            #define   wxCRT_Open       wxMSLU__wopen

 
 

-            #define   wxAccess     wxMSLU__waccess
-            #define   wxMkDir      wxMSLU__wmkdir
-            #define   wxRmDir      wxMSLU__wrmdir
+            #define   wxCRT_Access     wxMSLU__waccess
+            #define   wxCRT_MkDir      wxMSLU__wmkdir
+            #define   wxCRT_RmDir      wxMSLU__wrmdir

             #ifdef wxHAS_HUGE_FILES
             #ifdef wxHAS_HUGE_FILES

-                #define   wxStat       wxMSLU__wstati64
+                #define   wxCRT_Stat   wxMSLU__wstati64

             #else
             #else

-                #define   wxStat       wxMSLU__wstat
+                #define   wxCRT_Stat   wxMSLU__wstat

             #endif
             #endif

-        #else
-            #define   wxOpen       _wopen
-            #define   wxAccess     _waccess
-            #define   wxMkDir      _wmkdir
-            #define   wxRmDir      _wrmdir
-            #ifdef wxHAS_HUGE_FILES
-                #define   wxStat       _wstati64
+        #else // !wxUSE_UNICODE_MSLU
+            #ifdef __BORLANDC__
+                #if __BORLANDC__ >= 0x550 && __BORLANDC__ <= 0x551
+                    WXDLLIMPEXP_BASE int wxCRT_Open(const wxChar *pathname,
+                                                    int flags, mode_t mode);
+                #else
+                    #define   wxCRT_Open       _wopen
+                #endif
+                #define   wxCRT_Access     _waccess
+                #define   wxCRT_MkDir      _wmkdir
+                #define   wxCRT_RmDir      _wrmdir
+                #ifdef wxHAS_HUGE_FILES
+                    #define   wxCRT_Stat       _wstati64
+                #else
+                    #define   wxCRT_Stat       _wstat
+                #endif

             #else
             #else

-                #define   wxStat       _wstat
+                #define   wxCRT_Open       _wopen
+                #define   wxCRT_Access     _waccess
+                #define   wxCRT_MkDir      _wmkdir
+                #define   wxCRT_RmDir      _wrmdir
+                #ifdef wxHAS_HUGE_FILES
+                    #define   wxCRT_Stat       _wstati64
+                #else
+                    #define   wxCRT_Stat       _wstat
+                #endif

             #endif
             #endif

-        #endif
+        #endif // wxUSE_UNICODE_MSLU/!wxUSE_UNICODE_MSLU

     #else // !wxUSE_UNICODE
     #else // !wxUSE_UNICODE

-        #ifdef __BORLANDC__
-            #define   wxOpen       open
-        #else
-            #define   wxOpen       _open
-        #endif
-        #define   wxAccess     _access
-        #define   wxMkDir      _mkdir
-        #ifdef __WATCOMC__
-            #define   wxRmDir      rmdir
-        #else
-            #define   wxRmDir      _rmdir
-        #endif
+        #define   wxCRT_Open       wxPOSIX_IDENT(open)
+        #define   wxCRT_Access     wxPOSIX_IDENT(access)
+        #define   wxCRT_MkDir      wxPOSIX_IDENT(mkdir)
+        #define   wxCRT_RmDir      wxPOSIX_IDENT(rmdir)

         #ifdef wxHAS_HUGE_FILES
         #ifdef wxHAS_HUGE_FILES

-            #define   wxStat       _stati64
+            #define   wxCRT_Stat       wxPOSIX_IDENT(stati64)

         #else
         #else

-            #define   wxStat       _stat
+            // Unfortunately Watcom is not consistent, so:-
+            #if defined(__OS2__) && defined(__WATCOMC__)
+                #define   wxCRT_Stat       _stat
+            #else
+                #define   wxCRT_Stat       wxPOSIX_IDENT(stat)
+            #endif

         #endif
     #endif // wxUSE_UNICODE/!wxUSE_UNICODE
 
         #endif
     #endif // wxUSE_UNICODE/!wxUSE_UNICODE
 


@@ -317,7 +353,7 @@ enum wxFileKind
     #endif
 
     // constants (unless already defined by the user code)
     #endif
 
     // constants (unless already defined by the user code)

-    #if !defined(__BORLANDC__) && !defined(__WATCOMC__)
+    #ifdef wxHAS_UNDERSCORES_IN_POSIX_IDENTS

         #ifndef O_RDONLY
             #define   O_RDONLY    _O_RDONLY
             #define   O_WRONLY    _O_WRONLY
         #ifndef O_RDONLY
             #define   O_RDONLY    _O_RDONLY
             #define   O_WRONLY    _O_WRONLY


@@ -332,7 +368,7 @@ enum wxFileKind
             #define   S_IFDIR     _S_IFDIR
             #define   S_IFREG     _S_IFREG
         #endif
             #define   S_IFDIR     _S_IFDIR
             #define   S_IFREG     _S_IFREG
         #endif

-    #endif
+    #endif // wxHAS_UNDERSCORES_IN_POSIX_IDENTS

 
     #ifdef wxHAS_HUGE_FILES
         // wxFile is present and supports large files. Currently wxFFile
 
     #ifdef wxHAS_HUGE_FILES
         // wxFile is present and supports large files. Currently wxFFile


@@ -371,44 +407,55 @@ enum wxFileKind
     #define   wxFsync      fsync
     #define   wxEof        eof
 
     #define   wxFsync      fsync
     #define   wxEof        eof
 

-    #define   wxMkDir      mkdir
-    #define   wxRmDir      rmdir
+    #define   wxCRT_MkDir      mkdir
+    #define   wxCRT_RmDir      rmdir

 
     #define   wxTell(fd)   lseek(fd, 0, SEEK_CUR)
 
     #define   wxStructStat struct stat
 
 
     #define   wxTell(fd)   lseek(fd, 0, SEEK_CUR)
 
     #define   wxStructStat struct stat
 

-    #if wxUSE_UNICODE
-        #define wxNEED_WX_UNISTD_H
-        #if defined(__DMC__)
-            typedef unsigned long mode_t;
-        #endif
-        WXDLLIMPEXP_BASE int wxStat( const wxChar *file_name, wxStructStat *buf );
-        WXDLLIMPEXP_BASE int wxLstat( const wxChar *file_name, wxStructStat *buf );
-        WXDLLIMPEXP_BASE int wxAccess( const wxChar *pathname, int mode );
-        WXDLLIMPEXP_BASE int wxOpen( const wxChar *pathname, int flags, mode_t mode );
-    #else
-        #define   wxOpen       open
-        #define   wxStat       stat
-        #define   wxLstat      lstat
-        #define   wxAccess     access
-    #endif
+    #define   wxCRT_Open       open
+    #define   wxCRT_Stat       stat
+    #define   wxCRT_Lstat      lstat
+    #define   wxCRT_Access     access

 
     #define wxHAS_NATIVE_LSTAT
 #endif // platforms
 
 
     #define wxHAS_NATIVE_LSTAT
 #endif // platforms
 

+// if the platform doesn't have symlinks, define wxCRT_Lstat to be the same as
+// wxCRT_Stat to avoid #ifdefs in the code using it
+#ifndef wxHAS_NATIVE_LSTAT
+    #define wxCRT_Lstat wxCRT_Stat
+#endif
+
+inline int wxAccess(const wxString& path, mode_t mode)
+    { return wxCRT_Access(path.fn_str(), mode); }
+inline int wxOpen(const wxString& path, int flags, mode_t mode)
+    { return wxCRT_Open(path.fn_str(), flags, mode); }
+
+// FIXME-CE: provide our own implementations of the missing CRT functions
+#ifndef __WXWINCE__
+inline int wxStat(const wxString& path, wxStructStat *buf)
+    { return wxCRT_Stat(path.fn_str(), buf); }
+inline int wxLstat(const wxString& path, wxStructStat *buf)
+    { return wxCRT_Lstat(path.fn_str(), buf); }
+inline int wxRmDir(const wxString& path)
+    { return wxCRT_RmDir(path.fn_str()); }
+#if defined(__WINDOWS__) || (defined(__OS2__) && defined(__WATCOMC__))
+inline int wxMkDir(const wxString& path, mode_t WXUNUSED(mode) = 0)
+    { return wxCRT_MkDir(path.fn_str()); }
+#else
+inline int wxMkDir(const wxString& path, mode_t mode)
+    { return wxCRT_MkDir(path.fn_str(), mode); }
+#endif
+#endif // !__WXWINCE__
+

 #ifdef O_BINARY
     #define wxO_BINARY O_BINARY
 #else
     #define wxO_BINARY 0
 #endif
 
 #ifdef O_BINARY
     #define wxO_BINARY O_BINARY
 #else
     #define wxO_BINARY 0
 #endif
 

-// if the platform doesn't have symlinks, define wxLstat to be the same as
-// wxStat to avoid #ifdefs in the code using it
-#ifndef wxHAS_NATIVE_LSTAT
-    #define wxLstat wxStat
-#endif
-

 #if defined(__VISAGECPP__) && __IBMCPP__ >= 400
 //
 // VisualAge C++ V4.0 cannot have any external linkage const decs
 #if defined(__VISAGECPP__) && __IBMCPP__ >= 400
 //
 // VisualAge C++ V4.0 cannot have any external linkage const decs


@@ -425,7 +472,7 @@ const int wxInvalidOffset = -1;
 WXDLLIMPEXP_BASE bool wxFileExists(const wxString& filename);
 
 // does the path exist? (may have or not '/' or '\\' at the end)
 WXDLLIMPEXP_BASE bool wxFileExists(const wxString& filename);
 
 // does the path exist? (may have or not '/' or '\\' at the end)

-WXDLLIMPEXP_BASE bool wxDirExists(const wxChar *pszPathName);
+WXDLLIMPEXP_BASE bool wxDirExists(const wxString& pathName);

 
 WXDLLIMPEXP_BASE bool wxIsAbsolutePath(const wxString& filename);
 
 
 WXDLLIMPEXP_BASE bool wxIsAbsolutePath(const wxString& filename);
 


@@ -436,15 +483,15 @@ WXDLLIMPEXP_BASE wxString wxFileNameFromPath(const wxString& path);
 // Get directory
 WXDLLIMPEXP_BASE wxString wxPathOnly(const wxString& path);
 
 // Get directory
 WXDLLIMPEXP_BASE wxString wxPathOnly(const wxString& path);
 

-// wxString version
-WXDLLIMPEXP_BASE wxString wxRealPath(const wxString& path);
-
-WXDLLIMPEXP_BASE void wxDos2UnixFilename(wxChar *s);
+WXDLLIMPEXP_BASE void wxDos2UnixFilename(char *s);
+WXDLLIMPEXP_BASE void wxDos2UnixFilename(wchar_t *s);

 
 

-WXDLLIMPEXP_BASE void wxUnix2DosFilename(wxChar *s);
+WXDLLIMPEXP_BASE void wxUnix2DosFilename(char *s);
+WXDLLIMPEXP_BASE void wxUnix2DosFilename(wchar_t *s);

 
 // Strip the extension, in situ
 
 // Strip the extension, in situ

-WXDLLIMPEXP_BASE void wxStripExtension(wxChar *buffer);
+WXDLLIMPEXP_BASE void wxStripExtension(char *buffer);
+WXDLLIMPEXP_BASE void wxStripExtension(wchar_t *buffer);

 WXDLLIMPEXP_BASE void wxStripExtension(wxString& buffer);
 
 // Get a temporary filename
 WXDLLIMPEXP_BASE void wxStripExtension(wxString& buffer);
 
 // Get a temporary filename


@@ -452,8 +499,9 @@ WXDLLIMPEXP_BASE wxChar* wxGetTempFileName(const wxString& prefix, wxChar *buf =
 WXDLLIMPEXP_BASE bool wxGetTempFileName(const wxString& prefix, wxString& buf);
 
 // Expand file name (~/ and ${OPENWINHOME}/ stuff)
 WXDLLIMPEXP_BASE bool wxGetTempFileName(const wxString& prefix, wxString& buf);
 
 // Expand file name (~/ and ${OPENWINHOME}/ stuff)

-WXDLLIMPEXP_BASE wxChar* wxExpandPath(wxChar *dest, const wxChar *path);
-WXDLLIMPEXP_BASE bool wxExpandPath(wxString& dest, const wxChar *path);
+WXDLLIMPEXP_BASE char* wxExpandPath(char *dest, const wxString& path);
+WXDLLIMPEXP_BASE wchar_t* wxExpandPath(wchar_t *dest, const wxString& path);
+// FIXME-UTF8: add some wxString version

 
 // Contract w.r.t environment (</usr/openwin/lib, OPENWHOME> -> ${OPENWINHOME}/lib)
 // and make (if under the home tree) relative to home
 
 // Contract w.r.t environment (</usr/openwin/lib, OPENWHOME> -> ${OPENWINHOME}/lib)
 // and make (if under the home tree) relative to home


@@ -463,7 +511,10 @@ WXDLLIMPEXP_BASE wxChar* wxContractPath(const wxString& filename,
                                    const wxString& user = wxEmptyString);
 
 // Destructive removal of /./ and /../ stuff
                                    const wxString& user = wxEmptyString);
 
 // Destructive removal of /./ and /../ stuff

-WXDLLIMPEXP_BASE wxChar* wxRealPath(wxChar *path);
+// FIXME-UTF8: deprecate these two (and similar)
+WXDLLIMPEXP_BASE char* wxRealPath(char *path);
+WXDLLIMPEXP_BASE wchar_t* wxRealPath(wchar_t *path);
+WXDLLIMPEXP_BASE wxString wxRealPath(const wxString& path);

 
 // Allocate a copy of the full absolute path
 WXDLLIMPEXP_BASE wxChar* wxCopyAbsolutePath(const wxString& path);
 
 // Allocate a copy of the full absolute path
 WXDLLIMPEXP_BASE wxChar* wxCopyAbsolutePath(const wxString& path);


@@ -472,7 +523,7 @@ WXDLLIMPEXP_BASE wxChar* wxCopyAbsolutePath(const wxString& path);
 // Flags are reserved for future use.
 #define wxFILE  1
 #define wxDIR   2
 // Flags are reserved for future use.
 #define wxFILE  1
 #define wxDIR   2

-WXDLLIMPEXP_BASE wxString wxFindFirstFile(const wxChar *spec, int flags = wxFILE);
+WXDLLIMPEXP_BASE wxString wxFindFirstFile(const wxString& spec, int flags = wxFILE);

 WXDLLIMPEXP_BASE wxString wxFindNextFile();
 
 // Does the pattern contain wildcards?
 WXDLLIMPEXP_BASE wxString wxFindNextFile();
 
 // Does the pattern contain wildcards?


@@ -592,17 +643,17 @@ inline bool wxIsPathSeparator(wxChar c)
 }
 
 // does the string ends with path separator?
 }
 
 // does the string ends with path separator?

-WXDLLIMPEXP_BASE bool wxEndsWithPathSeparator(const wxChar *pszFileName);
+WXDLLIMPEXP_BASE bool wxEndsWithPathSeparator(const wxString& filename);

 
 // split the full path into path (including drive for DOS), name and extension
 // (understands both '/' and '\\')
 
 // split the full path into path (including drive for DOS), name and extension
 // (understands both '/' and '\\')

-WXDLLIMPEXP_BASE void wxSplitPath(const wxChar *pszFileName,
+WXDLLIMPEXP_BASE void wxSplitPath(const wxString& fileName,

                              wxString *pstrPath,
                              wxString *pstrName,
                              wxString *pstrExt);
 
 // find a file in a list of directories, returns false if not found
                              wxString *pstrPath,
                              wxString *pstrName,
                              wxString *pstrExt);
 
 // find a file in a list of directories, returns false if not found

-WXDLLIMPEXP_BASE bool wxFindFileInPath(wxString *pStr, const wxChar *pszPath, const wxChar *pszFile);
+WXDLLIMPEXP_BASE bool wxFindFileInPath(wxString *pStr, const wxString& szPath, const wxString& szFile);

 
 // Get the OS directory if appropriate (such as the Windows directory).
 // On non-Windows platform, probably just return the empty string.
 
 // Get the OS directory if appropriate (such as the Windows directory).
 // On non-Windows platform, probably just return the empty string.


@@ -673,7 +724,7 @@ public:
     void AddEnvList(const wxString& envVariable);
 
     // Adds given path to this list
     void AddEnvList(const wxString& envVariable);
 
     // Adds given path to this list

-    void Add(const wxString& path);
+    bool Add(const wxString& path);

     void Add(const wxArrayString &paths);
 
     // Find the first full path for which the file exists
     void Add(const wxArrayString &paths);
 
     // Find the first full path for which the file exists


@@ -684,10 +735,12 @@ public:
     wxString FindAbsoluteValidPath(const wxString& filename) const;
 
     // Given full path and filename, add path to list
     wxString FindAbsoluteValidPath(const wxString& filename) const;
 
     // Given full path and filename, add path to list

-    void EnsureFileAccessible(const wxString& path);
+    bool EnsureFileAccessible(const wxString& path);

 
 

+#if WXWIN_COMPATIBILITY_2_6

     // Returns true if the path is in the list
     wxDEPRECATED( bool Member(const wxString& path) const );
     // Returns true if the path is in the list
     wxDEPRECATED( bool Member(const wxString& path) const );

+#endif

 };
 
 #endif // _WX_FILEFN_H_
 };
 
 #endif // _WX_FILEFN_H_