X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/93fa67c0e6124d2657488971800c8fd068dc0d0e..1b52f7aba0dce7c2a1d26d41a930856b93b02870:/include/wx/filename.h diff --git a/include/wx/filename.h b/include/wx/filename.h index 13df3117b2..14aed5347d 100644 --- a/include/wx/filename.h +++ b/include/wx/filename.h @@ -12,7 +12,7 @@ #ifndef _WX_FILENAME_H_ #define _WX_FILENAME_H_ -#if defined(__GNUG__) && !defined(__APPLE__) +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "filename.h" #endif @@ -72,7 +72,7 @@ enum wxPathNormalize wxPATH_NORM_CASE = 0x0008, // if case insensitive => tolower wxPATH_NORM_ABSOLUTE = 0x0010, // make the path absolute wxPATH_NORM_LONG = 0x0020, // make the path the long form - wxPATH_NORM_ALL = 0x003f + wxPATH_NORM_ALL = 0x003f & ~wxPATH_NORM_CASE }; // what exactly should GetPath() return? @@ -410,6 +410,9 @@ public: { return GetPath(wxPATH_GET_SEPARATOR, format); } private: + // check whether this dir is valid for Append/Prepend/InsertDir() + static bool IsValidDirComponent(const wxString& dir); + // the drive/volume/device specification (always empty for Unix) wxString m_volume;