X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..5c750f949fa3915e7ee54cf060de704701000581:/include/wx/filename.h diff --git a/include/wx/filename.h b/include/wx/filename.h index 10ade9a914..954f4f349f 100644 --- a/include/wx/filename.h +++ b/include/wx/filename.h @@ -6,7 +6,7 @@ // Created: 28.12.00 // RCS-ID: $Id$ // Copyright: (c) 2000 Robert Roebling -// Licence: wxWidgets licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_FILENAME_H_ @@ -149,11 +149,7 @@ public: void Assign(const wxString& path, const wxString& name, const wxString& ext, - wxPathFormat format = wxPATH_NATIVE) - { - // empty volume - Assign(wxEmptyString, path, name, ext, format); - } + wxPathFormat format = wxPATH_NATIVE); void AssignDir(const wxString& dir, wxPathFormat format = wxPATH_NATIVE); @@ -178,7 +174,7 @@ public: // is the filename valid at all? bool IsOk() const - { + { // we're fine if we have the path or the name or if we're a root dir return m_dirs.size() != 0 || !m_name.IsEmpty() || !m_relative; } @@ -338,6 +334,10 @@ public: // get the string of path separators for this format static wxString GetPathSeparators(wxPathFormat format = wxPATH_NATIVE); + // get the string of path terminators, i.e. characters which terminate the + // path + static wxString GetPathTerminators(wxPathFormat format = wxPATH_NATIVE); + // get the canonical path separator for this format static wxChar GetPathSeparator(wxPathFormat format = wxPATH_NATIVE) { return GetPathSeparators(format)[0u]; } @@ -411,6 +411,11 @@ public: wxString *ext, wxPathFormat format = wxPATH_NATIVE); + // split a path into volume and pure path part + static void SplitVolume(const wxString& fullpathWithVolume, + wxString *volume, + wxString *path, + wxPathFormat format = wxPATH_NATIVE); // deprecated methods, don't use any more // --------------------------------------