Remove 2_6 compatibility code

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54490 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/filefn.h b/include/wx/filefn.h
index 269a645e829d070a674ce0ca388da71d7ec5e4bc..ed1dfe297748b5717f4a5d795b533a90120ea8e0 100644 (file)
--- a/include/wx/filefn.h
+++ b/include/wx/filefn.h
@@ -607,15 +607,6 @@ WXDLLIMPEXP_BASE bool wxRemoveFile(const wxString& file);
 WXDLLIMPEXP_BASE bool wxRenameFile(const wxString& file1, const wxString& file2, bool overwrite = true);
 
 // Get current working directory.
 WXDLLIMPEXP_BASE bool wxRenameFile(const wxString& file1, const wxString& file2, bool overwrite = true);
 
 // Get current working directory.

-#if WXWIN_COMPATIBILITY_2_6
-// If buf is NULL, allocates space using new, else
-// copies into buf.
-// IMPORTANT NOTE getcwd is know not to work under some releases
-// of Win32s 1.3, according to MS release notes!
-wxDEPRECATED( WXDLLIMPEXP_BASE wxChar* wxGetWorkingDirectory(wxChar *buf = (wxChar *) NULL, int sz = 1000) );
-// new and preferred version of wxGetWorkingDirectory
-// NB: can't have the same name because of overloading ambiguity
-#endif // WXWIN_COMPATIBILITY_2_6

 WXDLLIMPEXP_BASE wxString wxGetCwd();
 
 // Set working directory
 WXDLLIMPEXP_BASE wxString wxGetCwd();
 
 // Set working directory


@@ -631,15 +622,6 @@ WXDLLIMPEXP_BASE bool wxRmdir(const wxString& dir, int flags = 0);
 WXDLLIMPEXP_BASE wxFileKind wxGetFileKind(int fd);
 WXDLLIMPEXP_BASE wxFileKind wxGetFileKind(FILE *fp);
 
 WXDLLIMPEXP_BASE wxFileKind wxGetFileKind(int fd);
 WXDLLIMPEXP_BASE wxFileKind wxGetFileKind(FILE *fp);
 

-#if WXWIN_COMPATIBILITY_2_6
-// compatibility defines, don't use in new code
-wxDEPRECATED( inline bool wxPathExists(const wxChar *pszPathName) );
-inline bool wxPathExists(const wxChar *pszPathName)
-{
-    return wxDirExists(pszPathName);
-}
-#endif //WXWIN_COMPATIBILITY_2_6
-

 // permissions; these functions work both on files and directories:
 WXDLLIMPEXP_BASE bool wxIsWritable(const wxString &path);
 WXDLLIMPEXP_BASE bool wxIsReadable(const wxString &path);
 // permissions; these functions work both on files and directories:
 WXDLLIMPEXP_BASE bool wxIsWritable(const wxString &path);
 WXDLLIMPEXP_BASE bool wxIsReadable(const wxString &path);


@@ -798,11 +780,6 @@ public:
 
     // Given full path and filename, add path to list
     bool EnsureFileAccessible(const wxString& path);
 
     // Given full path and filename, add path to list
     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 );
-#endif

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

diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index b9053ba8ac76d8dda4841b558f47f568de45b137..2c9ebbda40cc4ff8ab4c9048fbe0be0258666d1c 100644 (file)
--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -230,13 +230,6 @@ bool wxPathList::EnsureFileAccessible (const wxString& path)
     return Add(wxPathOnly(path));
 }
 
     return Add(wxPathOnly(path));
 }
 

-#if WXWIN_COMPATIBILITY_2_6
-bool wxPathList::Member (const wxString& path) const
-{
-    return Index(path) != wxNOT_FOUND;
-}
-#endif
-

 wxString wxPathList::FindValidPath (const wxString& file) const
 {
     // normalize the given string as it could be a path + a filename
 wxString wxPathList::FindValidPath (const wxString& file) const
 {
     // normalize the given string as it could be a path + a filename


@@ -1582,13 +1575,6 @@ wxChar *wxDoGetCwd(wxChar *buf, int sz)
     // __WXWINCE__
 }
 
     // __WXWINCE__
 }
 

-#if WXWIN_COMPATIBILITY_2_6
-wxChar *wxGetWorkingDirectory(wxChar *buf, int sz)
-{
-    return wxDoGetCwd(buf,sz);
-}
-#endif // WXWIN_COMPATIBILITY_2_6
-

 wxString wxGetCwd()
 {
     wxString str;
 wxString wxGetCwd()
 {
     wxString str;