X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3c62105945ed63c3b7db9e3e14d942727cb056f9..b1d66b5415f7befb45e050d7097571642b8bfa56:/include/wx/filename.h diff --git a/include/wx/filename.h b/include/wx/filename.h index cf12b36501..36680b9fcb 100644 --- a/include/wx/filename.h +++ b/include/wx/filename.h @@ -96,6 +96,14 @@ public: wxPathFormat format = wxPATH_NATIVE) { Assign(path, name, format); } + // from a volume, directory name, file base name and extension + wxFileName(const wxString& volume, + const wxString& path, + const wxString& name, + const wxString& ext, + wxPathFormat format = wxPATH_NATIVE) + { Assign(volume, path, name, ext, format); } + // from a directory name, file base name and extension wxFileName(const wxString& path, const wxString& name, @@ -105,21 +113,31 @@ public: // the same for delayed initialization - // VZ: wouldn't it be better to call this Create() for consistency with - // all GUI classes? Personally, I like Set() more than Assign() too - void Assign(const wxFileName& filepath); + void Assign(const wxString& fullpath, wxPathFormat format = wxPATH_NATIVE); + + void Assign(const wxString& volume, + const wxString& path, + const wxString& name, + const wxString& ext, + wxPathFormat format = wxPATH_NATIVE); + void Assign(const wxString& path, const wxString& name, wxPathFormat format = wxPATH_NATIVE); + void Assign(const wxString& path, const wxString& name, const wxString& ext, - wxPathFormat format = wxPATH_NATIVE); - void AssignDir(const wxString& dir, wxPathFormat format = wxPATH_NATIVE) - { Assign(dir, _T(""), format); } + wxPathFormat format = wxPATH_NATIVE) + { + // empty volume + Assign(_T(""), path, name, ext, format); + } + + void AssignDir(const wxString& dir, wxPathFormat format = wxPATH_NATIVE); // assorted assignment operators @@ -179,8 +197,8 @@ public: // various file/dir operations // retrieve the value of the current working directory - void AssignCwd(); - static wxString GetCwd(); + void AssignCwd(const wxString& volume = wxEmptyString); + static wxString GetCwd(const wxString& volume = wxEmptyString); // change the current working directory bool SetCwd(); @@ -190,8 +208,9 @@ public: void AssignHomeDir(); static wxString GetHomeDir(); - // get a temp file name starting with thespecified prefix - void AssignTempFileName( const wxString &prefix ); + // get a temp file name starting with the specified prefix + void AssignTempFileName(const wxString& prefix); + static wxString CreateTempFileName(const wxString& prefix); // directory creation and removal. // if full is TRUE, will try to make each directory in the path. @@ -212,6 +231,18 @@ public: const wxString& cwd = wxEmptyString, wxPathFormat format = wxPATH_NATIVE); + // get a path path relative to the given base directory, i.e. opposite + // of Normalize + // + // pass an empty string to get a path relative to the working directory + // + // returns TRUE if the file name was modified, FALSE if we failed to do + // anything with it (happens when the file is on a different volume, + // for example) + bool MakeRelativeTo(const wxString& pathBase = _T(""), + wxPathFormat format = wxPATH_NATIVE); + + // Comparison // compares with the rules of this platform @@ -224,10 +255,22 @@ public: { return *this == wxFileName(filename); } // Tests + + // are the file names of this type cases sensitive? static bool IsCaseSensitive( wxPathFormat format = wxPATH_NATIVE ); - bool IsRelative( wxPathFormat format = wxPATH_NATIVE ); + + // is this filename absolute? bool IsAbsolute( wxPathFormat format = wxPATH_NATIVE ); + // is this filename relative? + bool IsRelative( wxPathFormat format = wxPATH_NATIVE ) + { return !IsAbsolute(format); } + + // Information about path format + + // get the string separating the volume from the path for this format + static wxString GetVolumeSeparator(wxPathFormat format = wxPATH_NATIVE); + // get the string of path separators for this format static wxString GetPathSeparators(wxPathFormat format = wxPATH_NATIVE); @@ -247,17 +290,21 @@ public: // Other accessors void SetExt( const wxString &ext ) { m_ext = ext; } wxString GetExt() const { return m_ext; } - bool HasExt() const { return !m_ext.IsEmpty(); } + bool HasExt() const { return !m_ext.empty(); } void SetName( const wxString &name ) { m_name = name; } wxString GetName() const { return m_name; } - bool HasName() const { return !m_name.IsEmpty(); } + bool HasName() const { return !m_name.empty(); } + + void SetVolume( const wxString &volume ) { m_volume = volume; } + wxString GetVolume() const { return m_volume; } + bool HasVolume() const { return !m_volume.empty(); } // full name is the file name + extension (but without the path) void SetFullName(const wxString& fullname); wxString GetFullName() const; - const wxArrayString &GetDirs() const { return m_dirs; } + const wxArrayString& GetDirs() const { return m_dirs; } // Construct path only - possibly with the trailing separator wxString GetPath( bool add_separator = FALSE, @@ -281,8 +328,16 @@ public: // get the canonical path format for this platform static wxPathFormat GetFormat( wxPathFormat format = wxPATH_NATIVE ); - // split a fullpath into path, (base) name and ext (all of the pointers - // can be NULL) + // split a fullpath into the volume, path, (base) name and extension + // (all of the pointers can be NULL) + static void SplitPath(const wxString& fullpath, + wxString *volume, + wxString *path, + wxString *name, + wxString *ext, + wxPathFormat format = wxPATH_NATIVE); + + // compatibility version static void SplitPath(const wxString& fullpath, wxString *path, wxString *name, @@ -290,6 +345,9 @@ public: wxPathFormat format = wxPATH_NATIVE); private: + // the drive/volume/device specification (always empty for Unix) + wxString m_volume; + // the path components of the file wxArrayString m_dirs;