X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/48598c661a0f39d8b7cb8b79fdefd86b744b5443..96defed03c190cb602ed4f7ca6e962a49e10dddd:/include/wx/filefn.h diff --git a/include/wx/filefn.h b/include/wx/filefn.h index 01b9c03a82..c64db53235 100644 --- a/include/wx/filefn.h +++ b/include/wx/filefn.h @@ -549,8 +549,10 @@ WXDLLIMPEXP_BASE wxString wxPathOnly(const wxString& path); wxDEPRECATED( WXDLLIMPEXP_BASE void wxDos2UnixFilename(char *s) ); wxDEPRECATED( WXDLLIMPEXP_BASE void wxDos2UnixFilename(wchar_t *s) ); -wxDEPRECATED( WXDLLIMPEXP_BASE void wxUnix2DosFilename(char *s) ); -wxDEPRECATED( WXDLLIMPEXP_BASE void wxUnix2DosFilename(wchar_t *s) ); +wxDEPRECATED_BUT_USED_INTERNALLY( + WXDLLIMPEXP_BASE void wxUnix2DosFilename(char *s) ); +wxDEPRECATED_BUT_USED_INTERNALLY( + WXDLLIMPEXP_BASE void wxUnix2DosFilename(wchar_t *s) ); // Strip the extension, in situ wxDEPRECATED( WXDLLIMPEXP_BASE void wxStripExtension(char *buffer) ); @@ -559,7 +561,7 @@ 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) @@ -621,7 +623,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