OSX adaptions

[wxWidgets.git] / include / wx / filename.h

diff --git a/include/wx/filename.h b/include/wx/filename.h
index 967077393fecda063156e340ff54a813b8be2a8c..050a0378159403260b3db2550d47997d8930bfd7 100644 (file)
--- a/include/wx/filename.h
+++ b/include/wx/filename.h
@@ -4,7 +4,6 @@
 // Author:      Robert Roebling, Vadim Zeitlin
 // Modified by:
 // Created:     28.12.00
-// RCS-ID:      $Id$
 // Copyright:   (c) 2000 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -113,13 +112,15 @@ enum
 {
     wxFILE_EXISTS_REGULAR   = 0x0001,  // check for existence of a regular file
     wxFILE_EXISTS_DIR       = 0x0002,  // check for existence of a directory
-    wxFILE_EXISTS_SYMLINK   = 0x0004,  // check for existence of a symbolic link
+    wxFILE_EXISTS_SYMLINK   = 0x1004,  // check for existence of a symbolic link;
+                                       // also sets wxFILE_EXISTS_NO_FOLLOW as
+                                       // it would never be satisfied otherwise
     wxFILE_EXISTS_DEVICE    = 0x0008,  // check for existence of a device
     wxFILE_EXISTS_FIFO      = 0x0016,  // check for existence of a FIFO
     wxFILE_EXISTS_SOCKET    = 0x0032,  // check for existence of a socket
                                        // gap for future types
-    wxFILE_EXISTS_ANY       = 0x0FFF,  // check for existence of anything
-    wxFILE_EXISTS_NO_FOLLOW = 0x1000   // don't dereference a contained symlink
+    wxFILE_EXISTS_NO_FOLLOW = 0x1000,  // don't dereference a contained symlink
+    wxFILE_EXISTS_ANY       = 0x1FFF   // check for existence of anything
 };
 
 #if wxUSE_LONGLONG
@@ -488,16 +489,16 @@ public:
 
     // Dir accessors
     size_t GetDirCount() const { return m_dirs.size(); }
-    void AppendDir(const wxString& dir);
+    bool AppendDir(const wxString& dir);
     void PrependDir(const wxString& dir);
-    void InsertDir(size_t before, const wxString& dir);
+    bool InsertDir(size_t before, const wxString& dir);
     void RemoveDir(size_t pos);
     void RemoveLastDir() { RemoveDir(GetDirCount() - 1); }
 
     // Other accessors
     void SetExt( const wxString &ext )          { m_ext = ext; m_hasExt = !m_ext.empty(); }
-    void ClearExt()                             { m_ext = wxEmptyString; m_hasExt = false; }
-    void SetEmptyExt()                          { m_ext = wxT(""); m_hasExt = true; }
+    void ClearExt()                             { m_ext.clear(); m_hasExt = false; }
+    void SetEmptyExt()                          { m_ext.clear(); m_hasExt = true; }
     wxString GetExt() const                     { return m_ext; }
     bool HasExt() const                         { return m_hasExt; }