added overloads taking pairs of const char/wchar_t pointers for wxString methods...

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

diff --git a/include/wx/filefn.h b/include/wx/filefn.h
index 4f539ab1761be50bbe984eff53fae058912b5c36..466adfaa7dac1979810e229644b639d540d38959 100644 (file)
--- a/include/wx/filefn.h
+++ b/include/wx/filefn.h
@@ -204,6 +204,13 @@ enum wxFileKind
         #define wxHAS_UNDERSCORES_IN_POSIX_IDENTS
     #endif
 
         #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
 
     // first functions not working with strings, i.e. without ANSI/Unicode
     // complications


@@ -263,11 +270,10 @@ enum wxFileKind
                 WXDLLIMPEXP_BASE int wxMSLU__wrmdir(const wxChar *name);
 
                 WXDLLIMPEXP_BASE int
                 WXDLLIMPEXP_BASE int wxMSLU__wrmdir(const wxChar *name);
 
                 WXDLLIMPEXP_BASE int

-                wxMSLU__wstat(const wxChar *name,
-                              struct wxPOSIX_IDENT(stat) *buffer);
+                wxMSLU__wstat(const wxChar *name, wxPOSIX_STRUCT(stat) *buffer);

                 WXDLLIMPEXP_BASE int
                 wxMSLU__wstati64(const wxChar *name,
                 WXDLLIMPEXP_BASE int
                 wxMSLU__wstati64(const wxChar *name,

-                                 struct wxPOSIX_IDENT(stati64) *buffer);
+                                 wxPOSIX_STRUCT(stati64) *buffer);

             #endif // Windows compilers with MSLU support
 
             #define   wxOpen       wxMSLU__wopen
             #endif // Windows compilers with MSLU support
 
             #define   wxOpen       wxMSLU__wopen


@@ -289,8 +295,8 @@ enum wxFileKind
                     #define   wxOpen       _wopen
                 #endif
                 #define   wxAccess     _waccess
                     #define   wxOpen       _wopen
                 #endif
                 #define   wxAccess     _waccess

-                #define   wxMkDir      _mkdir
-                #define   wxRmDir      _rmdir
+                #define   wxMkDir      _wmkdir
+                #define   wxRmDir      _wrmdir

                 #ifdef wxHAS_HUGE_FILES
                     #define   wxStat       _wstati64
                 #else
                 #ifdef wxHAS_HUGE_FILES
                     #define   wxStat       _wstati64
                 #else


@@ -446,7 +452,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);