X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1527281edb1538a8a446b1de791fbf303deb5804..1338c59a025505bc066be220fe56e898a72b3ad3:/include/wx/filename.h?ds=inline diff --git a/include/wx/filename.h b/include/wx/filename.h index 4e5923d5d2..e8a87042b8 100644 --- a/include/wx/filename.h +++ b/include/wx/filename.h @@ -6,13 +6,13 @@ // Created: 28.12.00 // RCS-ID: $Id$ // Copyright: (c) 2000 Robert Roebling -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_FILENAME_H_ #define _WX_FILENAME_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "filename.h" #endif @@ -96,7 +96,7 @@ public: // constructors and assignment // the usual stuff - wxFileName() { } + wxFileName() { Clear(); } wxFileName( const wxFileName &filepath ) { Assign(filepath); } // from a full filename: if it terminates with a '/', a directory path @@ -175,17 +175,17 @@ public: bool IsOk() const { return !m_dirs.IsEmpty() || !m_name.IsEmpty(); } // does the file with this name exists? - bool FileExists(); + bool FileExists() const; static bool FileExists( const wxString &file ); // does the directory with this name exists? - bool DirExists(); + bool DirExists() const; static bool DirExists( const wxString &dir ); // VZ: also need: IsDirWritable(), IsFileExecutable() &c (TODO) // time functions - +#if wxUSE_DATETIME // set the file last access/mod and creation times // (any of the pointers may be NULL) bool SetTimes(const wxDateTime *dtAccess, @@ -208,6 +208,7 @@ public: (void)GetTimes(NULL, &dtMod, NULL); return dtMod; } +#endif // wxUSE_DATETIME #ifdef __WXMAC__ bool MacSetTypeAndCreator( wxUint32 type , wxUint32 creator ) ; @@ -219,6 +220,7 @@ public: // looks up the appropriate type and creator from the registration and then sets bool MacSetDefaultTypeAndCreator() ; #endif + // various file/dir operations // retrieve the value of the current working directory @@ -270,17 +272,31 @@ public: bool MakeRelativeTo(const wxString& pathBase = _T(""), wxPathFormat format = wxPATH_NATIVE); + // make the path absolute + // + // this may be done using another (than current) value of cwd + bool MakeAbsolute(const wxString& cwd = wxEmptyString, + wxPathFormat format = wxPATH_NATIVE) + { return Normalize(wxPATH_NORM_DOTS | wxPATH_NORM_ABSOLUTE | + wxPATH_NORM_TILDE, cwd, format); } // Comparison - // compares with the rules of this platform - bool SameAs(const wxFileName &filepath, - wxPathFormat format = wxPATH_NATIVE); + // compares with the rules of the given platforms format + bool SameAs(const wxFileName& filepath, + wxPathFormat format = wxPATH_NATIVE) const; + + // compare with another filename object + bool operator==(const wxFileName& filename) const + { return SameAs(filename); } + bool operator!=(const wxFileName& filename) const + { return !SameAs(filename); } - // uses the current platform settings - bool operator==(const wxFileName& filename) { return SameAs(filename); } - bool operator==(const wxString& filename) - { return *this == wxFileName(filename); } + // compare with a filename string interpreted as a native file name + bool operator==(const wxString& filename) const + { return SameAs(wxFileName(filename)); } + bool operator!=(const wxString& filename) const + { return !SameAs(wxFileName(filename)); } // are the file names of this type cases sensitive? static bool IsCaseSensitive( wxPathFormat format = wxPATH_NATIVE ); @@ -378,9 +394,10 @@ public: // deprecated methods, don't use any more // -------------------------------------- +#ifndef __DIGITALMARS__ wxString GetPath( bool withSep, wxPathFormat format = wxPATH_NATIVE ) const { return GetPath(withSep ? wxPATH_GET_SEPARATOR : 0, format); } - +#endif wxString GetPathWithSep(wxPathFormat format = wxPATH_NATIVE ) const { return GetPath(wxPATH_GET_SEPARATOR, format); }