X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/33b97389e59de9b2acd902a334c08976c7d83d44..e13f1288772a23069470562fb5e0ce228640e77c:/include/wx/filename.h diff --git a/include/wx/filename.h b/include/wx/filename.h index 646e239303..38e6645e06 100644 --- a/include/wx/filename.h +++ b/include/wx/filename.h @@ -12,7 +12,7 @@ #ifndef _WX_FILENAME_H_ #define _WX_FILENAME_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "filename.h" #endif @@ -80,6 +80,12 @@ enum wxPATH_GET_SEPARATOR = 0x0002 // terminate the path with the separator }; +// MkDir flags +enum +{ + wxPATH_MKDIR_FULL = 0x0001 // create directories recursively +}; + // ---------------------------------------------------------------------------- // wxFileName: encapsulates a file path // ---------------------------------------------------------------------------- @@ -90,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 @@ -213,6 +219,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 @@ -236,8 +243,8 @@ public: // directory creation and removal. // if full is TRUE, will try to make each directory in the path. - bool Mkdir( int perm = 0777, bool full = FALSE); - static bool Mkdir( const wxString &dir, int perm = 0777, bool full = FALSE ); + bool Mkdir( int perm = 0777, int flags = 0); + static bool Mkdir( const wxString &dir, int perm = 0777, int flags = 0 ); bool Rmdir(); static bool Rmdir( const wxString &dir ); @@ -267,14 +274,21 @@ public: // Comparison - // compares with the rules of this platform - bool SameAs(const wxFileName &filepath, - wxPathFormat format = wxPATH_NATIVE); - - // uses the current platform settings - bool operator==(const wxFileName& filename) { return SameAs(filename); } - bool operator==(const wxString& filename) - { return *this == wxFileName(filename); } + // 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); } + + // 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 );