X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/220ea2b9280b4b00ac2fa4ccff4ec505d5e74f38..9b49405777342458dc1666001865eef7309b6c30:/include/wx/filefn.h?ds=inline diff --git a/include/wx/filefn.h b/include/wx/filefn.h index 3905288843..427eb1974b 100644 --- a/include/wx/filefn.h +++ b/include/wx/filefn.h @@ -555,13 +555,14 @@ wxDEPRECATED_BUT_USED_INTERNALLY( WXDLLIMPEXP_BASE void wxUnix2DosFilename(wchar_t *s) ); // Strip the extension, in situ +// Deprecated in favour of wxFileName::StripExtension() but notice that their +// behaviour is slightly different, see the manual wxDEPRECATED( WXDLLIMPEXP_BASE void wxStripExtension(char *buffer) ); wxDEPRECATED( WXDLLIMPEXP_BASE void wxStripExtension(wchar_t *buffer) ); wxDEPRECATED( WXDLLIMPEXP_BASE void wxStripExtension(wxString& buffer) ); - // DEPRECATED: construct a wxFileName, use ClearExt() and then GetFullPath() // Get a temporary filename -wxDEPRECATED_BUT_USED_INTERNALLY( WXDLLIMPEXP_BASE wxChar* wxGetTempFileName(const wxString& prefix, wxChar *buf = (wxChar *) NULL) ); +wxDEPRECATED_BUT_USED_INTERNALLY( WXDLLIMPEXP_BASE wxChar* wxGetTempFileName(const wxString& prefix, wxChar *buf = NULL) ); wxDEPRECATED_BUT_USED_INTERNALLY( WXDLLIMPEXP_BASE bool wxGetTempFileName(const wxString& prefix, wxString& buf) ); // Expand file name (~/ and ${OPENWINHOME}/ stuff) @@ -623,7 +624,7 @@ WXDLLIMPEXP_BASE bool wxRenameFile(const wxString& file1, const wxString& file2, // 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) ); +wxDEPRECATED( WXDLLIMPEXP_BASE wxChar* wxGetWorkingDirectory(wxChar *buf = 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