implement support for returning several elements at once from IEnumFORMATETC (part...

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

diff --git a/include/wx/filefn.h b/include/wx/filefn.h
index 4435d326144b9618cd02a06c1641d5d08906931d..3f00a7404ff97d698e934ce2c27af2a647946963 100644 (file)
--- a/include/wx/filefn.h
+++ b/include/wx/filefn.h
@@ -157,11 +157,18 @@ enum wxSeekMode
 WXDLLIMPEXP_BASE int wxStat( 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 );
 WXDLLIMPEXP_BASE int wxStat( 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
+#if defined(__WXMAC__) && !defined(__DARWIN__)
+#include <sys/stat.h>
+WXDLLIMPEXP_BASE int wxStat( 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   wxAccess     access
 #endif
 #else
     #define   wxOpen       open
     #define   wxStat       stat
     #define   wxAccess     access
 #endif

+#endif

 
 #endif  // VC++
 
 
 #endif  // VC++
 


@@ -360,12 +367,13 @@ WXDLLIMPEXP_BASE time_t wxFileModificationTime(const wxString& filename);
 class WXDLLIMPEXP_BASE wxPathList : public wxStringList
 {
 public:
 class WXDLLIMPEXP_BASE wxPathList : public wxStringList
 {
 public:

+    // avoid GCC warning about virtual functions w/o virtual dtor
+    virtual ~wxPathList() {}
+

     // Adds all paths in environment variable
     void AddEnvList(const wxString& envVariable);
 
     void Add(const wxString& path);
     // Adds all paths in environment variable
     void AddEnvList(const wxString& envVariable);
 
     void Add(const wxString& path);

-    // Avoid compiler warning
-    wxNode *Add(const wxChar *s) { return wxStringList::Add(s); }

     // Find the first full path for which the file exists
     wxString FindValidPath(const wxString& filename);
     // Find the first full path for which the file exists; ensure it's an
     // Find the first full path for which the file exists
     wxString FindValidPath(const wxString& filename);
     // Find the first full path for which the file exists; ensure it's an


@@ -377,7 +385,7 @@ public:
     bool Member(const wxString& path);
 
 private:
     bool Member(const wxString& path);
 
 private:

-    DECLARE_DYNAMIC_CLASS(wxPathList)
+    // DECLARE_DYNAMIC_CLASS(wxPathList)

 };
 
 #endif
 };
 
 #endif