warning in Unicode compilation fixed

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

diff --git a/src/common/filename.cpp b/src/common/filename.cpp
index cebec267bcbf4aa68334d5c3e501aca0c3918fdb..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;
@@ -464,6 +464,7 @@ bool wxFileName::IsWild( wxPathFormat format )
 {
     // FIXME: this is probably false for Mac and this is surely wrong for most
     //        of Unix shells (think about "[...]")
+       (void)format;
     return m_name.find_first_of(_T("*?")) != wxString::npos;
 }
 
@@ -529,13 +530,50 @@ wxString wxFileName::GetPath( bool add_separator, wxPathFormat format ) const
 
 wxString wxFileName::GetFullPath( wxPathFormat format ) const
 {
-    return GetPathWithSep() + GetFullName();
+    format = GetFormat( format );
+    
+    wxString ret;
+    if (format == wxPATH_DOS)
+    {
+        for (size_t i = 0; i < m_dirs.GetCount(); i++)
+        {
+            ret += m_dirs[i];
+            ret += '\\';
+        }
+    }
+    else
+    if (format == wxPATH_UNIX)
+    {
+        for (size_t i = 0; i < m_dirs.GetCount(); i++)
+        {
+            ret += m_dirs[i];
+            ret += '/';
+        }
+    }
+    else
+    {
+        for (size_t i = 0; i < m_dirs.GetCount(); i++)
+        {
+            ret += m_dirs[i];
+            ret += ':';
+        }
+    }
+    
+    ret += m_name;
+    
+    if (!m_ext.IsEmpty())
+    {
+        ret += '.';
+        ret += m_ext;
+    }
+    
+    return ret;
 }
 
 // Return the short form of the path (returns identity on non-Windows platforms)
 wxString wxFileName::GetShortPath() const
 {
-#if defined(__WXMSW__) && defined(__WIN32__)
+#if defined(__WXMSW__) && defined(__WIN32__) && !defined(__WXMICROWIN__)
     wxString path(GetFullPath());
     wxString pathOut;
     DWORD sz = ::GetShortPathName(path, NULL, 0);
@@ -552,8 +590,8 @@ wxString wxFileName::GetShortPath() const
     }
     if (ok)
         return pathOut;
-    else
-        return path;
+
+    return path;
 #else
     return GetFullPath();
 #endif
@@ -562,26 +600,25 @@ wxString wxFileName::GetShortPath() const
 // Return the long form of the path (returns identity on non-Windows platforms)
 wxString wxFileName::GetLongPath() const
 {
-#if defined(__WXMSW__) && defined(__WIN32__)
+#if defined(__WXMSW__) && defined(__WIN32__) && !defined(__WXMICROWIN__)
     wxString path(GetFullPath());
     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;
-    static GET_LONG_PATH_NAME s_pfnGetLongPathName = NULL;
 
     if ( !s_triedToLoad )
     {
         s_triedToLoad = TRUE;
-
         wxDllType dllKernel = wxDllLoader::LoadLibrary(_T("kernel32"));
-        short avoidCompilerWarning = 0;
-        if ( avoidCompilerWarning ) // dllKernel )
+        if ( dllKernel )
         {
             // may succeed or fail depending on the Windows version
+                       static GET_LONG_PATH_NAME s_pfnGetLongPathName = NULL;
 #ifdef _UNICODE
             s_pfnGetLongPathName = (GET_LONG_PATH_NAME) wxDllLoader::GetSymbol(dllKernel, _T("GetLongPathNameW"));
 #else
@@ -617,8 +654,7 @@ wxString wxFileName::GetLongPath() const
     }
     if (success)
         return pathOut;
-#endif
-    // wxUSE_DYNLIB_CLASS
+#endif // wxUSE_DYNLIB_CLASS
 
     if (!success)
     {
@@ -630,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;
@@ -667,6 +703,7 @@ wxString wxFileName::GetLongPath() const
             }
         }
     }
+
     return pathOut;
 #else
     return GetFullPath();
@@ -680,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