Match changes in DECLARE_*_CLASS.

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

diff --git a/include/wx/filefn.h b/include/wx/filefn.h
index 4435d326144b9618cd02a06c1641d5d08906931d..e2c028f542cfa6c64878b57dd6df1fcbdfe22018 100644 (file)
--- a/include/wx/filefn.h
+++ b/include/wx/filefn.h
@@ -12,7 +12,7 @@
 #ifndef   _FILEFN_H_
 #define   _FILEFN_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "filefn.h"
 #endif
 
@@ -74,9 +74,10 @@ enum wxSeekMode
 // Microsoft compiler loves underscores, feed them to it
 #if defined( __VISUALC__ ) \
     || ( defined(__MINGW32__) && !defined(__WINE__) && wxCHECK_W32API_VERSION( 0, 5 ) ) \
-    || ( defined(__MWERKS__) && defined(__WXMSW__) )
+    || ( defined(__MWERKS__) && defined(__WXMSW__) ) \
+    || ( defined(__WATCOMC__) && defined(__WXMSW__) )
     // functions
-#ifdef __BORLANDC__
+#if defined(__BORLANDC__) || defined(__WATCOMC__)
     #define   _tell        tell
 #endif
     #define   wxClose      _close
@@ -111,15 +112,23 @@ enum wxSeekMode
 #endif
         #define   wxAccess     _access
         #define   wxMkDir      _mkdir
+#ifdef __WATCOMC__
+        #define   wxRmDir      rmdir
+#else
         #define   wxRmDir      _rmdir
+#endif
         #define   wxStat       _stat
     #endif
 
     // types
+#if defined(__WATCOMC__)&& wxUSE_UNICODE
+    #define   wxStructStat struct _wstat
+#else
     #define   wxStructStat struct _stat
+#endif
 
     // constants (unless already defined by the user code)
-    #if !defined(O_RDONLY) && !defined(__BORLANDC__)
+    #if !defined(O_RDONLY) && !defined(__BORLANDC__) && !defined(__WATCOMC__)
         #define   O_RDONLY    _O_RDONLY
         #define   O_WRONLY    _O_WRONLY
         #define   O_RDWR      _O_RDWR
@@ -128,7 +137,7 @@ enum wxSeekMode
         #define   O_BINARY    _O_BINARY
     #endif
 
-    #ifndef __BORLANDC__
+    #if !defined(__BORLANDC__) && !defined(__WATCOMC__)
         #define   S_IFMT      _S_IFMT
         #define   S_IFDIR     _S_IFDIR
         #define   S_IFREG     _S_IFREG
@@ -264,16 +273,6 @@ WXDLLIMPEXP_BASE bool wxRmdir(const wxString& dir, int flags = 0);
 // compatibility defines, don't use in new code
 #define wxDirExists wxPathExists
 
-#if WXWIN_COMPATIBILITY_2
-    #define FileExists wxFileExists
-    #define DirExists wxDirExists
-    #define IsAbsolutePath wxIsAbsolutePath
-    #define FileNameFromPath wxFileNameFromPath
-    #define PathOnly wxPathOnly
-    #define Dos2UnixFilename wxDos2UnixFilename
-    #define Unix2DosFilename wxUnix2DosFilename
-#endif
-
 // ----------------------------------------------------------------------------
 // separators in file names
 // ----------------------------------------------------------------------------
@@ -360,12 +359,13 @@ WXDLLIMPEXP_BASE time_t wxFileModificationTime(const wxString& filename);
 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);
-    // 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
@@ -377,7 +377,7 @@ public:
     bool Member(const wxString& path);
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxPathList)
+    // DECLARE_DYNAMIC_CLASS(wxPathList)
 };
 
 #endif