X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4367345099df9e276e4805147ac40ec3e0349021..24c7767fc8e093be0f0790c78daeb12b4e58579b:/include/wx/filefn.h?ds=sidebyside

diff --git a/include/wx/filefn.h b/include/wx/filefn.h
index 6b6c285858..459e004132 100644
--- 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
 
@@ -271,16 +271,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
 // ----------------------------------------------------------------------------
@@ -367,12 +357,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
@@ -384,7 +375,7 @@ public:
     bool Member(const wxString& path);
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxPathList)
+    // DECLARE_DYNAMIC_CLASS(wxPathList)
 };
 
 #endif