Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove 2_6 compatibility code

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54490 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2008-07-05 10:58:38 +00:00
parent dc874fb4ce
commit 961d941c0d
2 changed files with 0 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
include/wx/filefn.h
View File

@@ -607,15 +607,6 @@ WXDLLIMPEXP_BASE bool wxRemoveFile(const wxString& file);
WXDLLIMPEXP_BASE bool wxRenameFile(const wxString& file1, const wxString& file2, bool overwrite = true); WXDLLIMPEXP_BASE bool wxRenameFile(const wxString& file1, const wxString& file2, bool overwrite = true);
// Get current working directory. // 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(); WXDLLIMPEXP_BASE wxString wxGetCwd();
// Set working directory // 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(int fd);
WXDLLIMPEXP_BASE wxFileKind wxGetFileKind(FILE *fp); 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: // permissions; these functions work both on files and directories:
WXDLLIMPEXP_BASE bool wxIsWritable(const wxString &path); WXDLLIMPEXP_BASE bool wxIsWritable(const wxString &path);
WXDLLIMPEXP_BASE bool wxIsReadable(const wxString &path); WXDLLIMPEXP_BASE bool wxIsReadable(const wxString &path);
@@ -798,11 +780,6 @@ public:
// Given full path and filename, add path to list // Given full path and filename, add path to list
bool EnsureFileAccessible(const wxString& path); 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_

14
src/common/filefn.cpp
View File

@@ -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 wxString wxPathList::FindValidPath (const wxString& file) const
{ {
// normalize the given string as it could be a path + a filename // 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 wxGetCwd()
{ {
wxString str; wxString str;