Compilation fix.

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

diff --git a/include/wx/filename.h b/include/wx/filename.h
index 3d549d2b361e8f350389440e0b0359d9d625eddd..14aed5347d906440519d8a4a14855aeb8a570a79 100644 (file)
--- a/include/wx/filename.h
+++ b/include/wx/filename.h
@@ -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_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?
 };
 
 // what exactly should GetPath() return?


@@ -410,6 +410,9 @@ public:
         { return GetPath(wxPATH_GET_SEPARATOR, format); }
 
 private:
         { 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;
 
     // the drive/volume/device specification (always empty for Unix)
     wxString        m_volume;