use MoreFiles under Mac OS X

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

diff --git a/src/common/filename.cpp b/src/common/filename.cpp
index d8446148ac9a71499c931e20732719f75559d278..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);
-    bool first = TRUE;
+    int i = 0;
     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 );
 
-        first = FALSE;
+        i ++;
     }
 
     m_ext = ext;
@@ -590,8 +590,8 @@ wxString wxFileName::GetShortPath() const
     }
     if (ok)
         return pathOut;
-    else
-        return path;
+
+    return path;
 #else
     return GetFullPath();
 #endif
@@ -605,7 +605,8 @@ wxString wxFileName::GetLongPath() const
     wxString pathOut;
     bool success = FALSE;
 
-#if wxUSE_DYNLIB_CLASS
+    // VZ: this code was disabled, why?
+#if 0 // wxUSE_DYNLIB_CLASS
     typedef DWORD (*GET_LONG_PATH_NAME)(const wxChar *, wxChar *, DWORD);
 
     static bool s_triedToLoad = FALSE;
@@ -613,7 +614,6 @@ wxString wxFileName::GetLongPath() const
     if ( !s_triedToLoad )
     {
         s_triedToLoad = TRUE;
-#if 0
         wxDllType dllKernel = wxDllLoader::LoadLibrary(_T("kernel32"));
         if ( dllKernel )
         {
@@ -651,12 +651,10 @@ wxString wxFileName::GetLongPath() const
                 }
             }
         }
-#endif         
     }
     if (success)
         return pathOut;
-#endif
-    // wxUSE_DYNLIB_CLASS
+#endif // wxUSE_DYNLIB_CLASS
 
     if (!success)
     {
@@ -668,7 +666,7 @@ wxString wxFileName::GetLongPath() const
         pathOut = wxEmptyString;
 
         wxArrayString dirs = GetDirs();
-        dirs.Add(GetName());
+        dirs.Add(GetFullName());
 
         size_t count = dirs.GetCount();
         size_t i;
@@ -705,6 +703,7 @@ wxString wxFileName::GetLongPath() const
             }
         }
     }
+
     return pathOut;
 #else
     return GetFullPath();
@@ -718,7 +717,7 @@ wxPathFormat wxFileName::GetFormat( wxPathFormat format )
 #if defined(__WXMSW__) || defined(__WXPM__)
         format = wxPATH_DOS;
 #elif defined(__WXMAC__)
-        format = wxPATH_UNIX; // that's the way the rest of wx' code works right now
+        format = wxPATH_MAC; 
 #else
         format = wxPATH_UNIX;
 #endif