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

deprecate wxDos2UnixFilename, wxUnix2DosFilename, wxStripExtension, wxGetTempFileName, wxExpandPath, wxContractPath, wxRealPath, wxCopyAbsolutePath, wxSplitPath and provide deprecation description in the docs (for the documented functions) or directly in the header (for undocumented functions)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57872 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi
2009-01-07 01:29:54 +00:00
parent 1a7bfacc8a
commit 47d281e6b7
4 changed files with 66 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/common/filefn.cpp
View File

@@ -104,8 +104,9 @@
// private globals
// ----------------------------------------------------------------------------
// MT-FIXME: get rid of this horror and all code using it
#if WXWIN_COMPATIBILITY_2_8
static wxChar wxFileFunctionsBuffer[4*_MAXPATHLEN];
#endif
#if defined(__VISAGECPP__) && __IBMCPP__ >= 400
//
@@ -360,6 +361,7 @@ wxIsAbsolutePath (const wxString& filename)
return false ;
}
#if WXWIN_COMPATIBILITY_2_8
/*
* Strip off any extension (dot something) from end of file,
* IF one exists. Inserts zero into buffer.
@@ -755,6 +757,8 @@ wxContractPath (const wxString& filename,
return dest;
}
#endif // #if WXWIN_COMPATIBILITY_2_8
// Return just the filename, not the path (basename)
wxChar *wxFileNameFromPath (wxChar *path)
{
@@ -949,13 +953,16 @@ void wxMacFilename2FSSpec( const wxString& path , FSSpec *spec )
OSStatus err = noErr;
FSRef fsRef;
wxMacPathToFSRef( path , &fsRef );
err = FSGetCatalogInfo(&fsRef, kFSCatInfoNone, NULL, NULL, spec, NULL);
err = FSGetCatalogInfo(&fsRef, kFSCatInfoNone, NULL, NULL, spec, NULL);
verify_noerr( err );
}
#endif
#endif // __WXMAC__
#if WXWIN_COMPATIBILITY_2_8
template<typename T>
static void wxDoDos2UnixFilename(T *s)
{
@@ -998,6 +1005,8 @@ wxDoUnix2DosFilename(T *WXUNUSED(s) )
void wxUnix2DosFilename(char *s) { wxDoUnix2DosFilename(s); }
void wxUnix2DosFilename(wchar_t *s) { wxDoUnix2DosFilename(s); }
#endif // #if WXWIN_COMPATIBILITY_2_8
// Concatenate two files to form third
bool
wxConcatFiles (const wxString& file1, const wxString& file2, const wxString& file3)
@@ -1365,6 +1374,8 @@ bool wxDirExists(const wxString& pathName)
#endif // __WIN32__/!__WIN32__
}
#if WXWIN_COMPATIBILITY_2_8
// Get a temporary filename, opening and closing the file.
wxChar *wxGetTempFileName(const wxString& prefix, wxChar *buf)
{
@@ -1399,6 +1410,8 @@ bool wxGetTempFileName(const wxString& prefix, wxString& buf)
#endif // wxUSE_FILE/!wxUSE_FILE
}
#endif // #if WXWIN_COMPATIBILITY_2_8
// Get first file name matching given wild card.
static wxDir *gs_dir = NULL;
@@ -1406,7 +1419,7 @@ static wxString gs_dirPath;
wxString wxFindFirstFile(const wxString& spec, int flags)
{
wxSplitPath(spec, &gs_dirPath, NULL, NULL);
wxFileName::SplitPath(spec, &gs_dirPath, NULL, NULL);
if ( gs_dirPath.empty() )
gs_dirPath = wxT(".");
if ( !wxEndsWithPathSeparator(gs_dirPath ) )
@@ -1705,6 +1718,7 @@ bool wxFindFileInPath(wxString *pStr, const wxString& szPath, const wxString& sz
return false;
}
#if WXWIN_COMPATIBILITY_2_8
void WXDLLIMPEXP_BASE wxSplitPath(const wxString& fileName,
wxString *pstrPath,
wxString *pstrName,
@@ -1712,6 +1726,7 @@ void WXDLLIMPEXP_BASE wxSplitPath(const wxString& fileName,
{
wxFileName::SplitPath(fileName, pstrPath, pstrName, pstrExt);
}
#endif // #if WXWIN_COMPATIBILITY_2_8
#if wxUSE_DATETIME