use wxWindows zlib.h instead of Mac OS X system zlib.h directly

[wxWidgets.git] / src / common / filename.cpp

diff --git a/src/common/filename.cpp b/src/common/filename.cpp
index 3785a8682e8fa9445bf19869c47f33467067cb57..d30a7f8ba13c62fb2e4b2275058ece6aef61d6b6 100644 (file)
--- a/src/common/filename.cpp
+++ b/src/common/filename.cpp
@@ -70,18 +70,18 @@ void wxFileName::Assign( const wxString& path,
 {
     wxStringTokenizer tn(path, GetPathSeparators(format),
                          wxTOKEN_RET_EMPTY_ALL);
 {
     wxStringTokenizer tn(path, GetPathSeparators(format),
                          wxTOKEN_RET_EMPTY_ALL);

-    bool first = TRUE;
+    int i = 0;

     m_dirs.Clear();
     while ( tn.HasMoreTokens() )
     {
         wxString token = tn.GetNextToken();
 
     m_dirs.Clear();
     while ( tn.HasMoreTokens() )
     {
         wxString token = tn.GetNextToken();
 

-        // If the path starts with a slash, we need the first
-        // dir entry to be an empty for later reassembly.
-        if (first || !token.IsEmpty())
+        // If the path starts with a slash (or two for a network path),
+        // we need the first dir entry to be an empty for later reassembly.
+        if ((i < 2) || !token.IsEmpty())

             m_dirs.Add( token );
 
             m_dirs.Add( token );
 

-        first = FALSE;
+        i ++;

     }
 
     m_ext = ext;
     }
 
     m_ext = ext;


@@ -666,7 +666,7 @@ wxString wxFileName::GetLongPath() const
         pathOut = wxEmptyString;
 
         wxArrayString dirs = GetDirs();
         pathOut = wxEmptyString;
 
         wxArrayString dirs = GetDirs();

-        dirs.Add(GetName());
+        dirs.Add(GetFullName());

 
         size_t count = dirs.GetCount();
         size_t i;
 
         size_t count = dirs.GetCount();
         size_t i;