X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8cb172b4f12fae80b06d5936108a1bc7f2521674..1971d23c57b3c582f32d05704914ad902ec76fa5:/src/common/filename.cpp

diff --git a/src/common/filename.cpp b/src/common/filename.cpp
index d3ee13116e..b9679a11a3 100644
--- a/src/common/filename.cpp
+++ b/src/common/filename.cpp
@@ -530,8 +530,44 @@ wxString wxFileName::GetPath( bool add_separator, wxPathFormat format ) const
 
 wxString wxFileName::GetFullPath( wxPathFormat format ) const
 {
-	(void)format;
-    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)
@@ -554,8 +590,8 @@ wxString wxFileName::GetShortPath() const
     }
     if (ok)
         return pathOut;
-    else
-        return path;
+
+    return path;
 #else
     return GetFullPath();
 #endif
@@ -569,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;
@@ -577,7 +614,6 @@ wxString wxFileName::GetLongPath() const
     if ( !s_triedToLoad )
     {
         s_triedToLoad = TRUE;
-#if 0
         wxDllType dllKernel = wxDllLoader::LoadLibrary(_T("kernel32"));
         if ( dllKernel )
         {
@@ -615,12 +651,10 @@ wxString wxFileName::GetLongPath() const
                 }
             }
         }
-#endif		
     }
     if (success)
         return pathOut;
-#endif
-    // wxUSE_DYNLIB_CLASS
+#endif // wxUSE_DYNLIB_CLASS
 
     if (!success)
     {
@@ -632,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;
@@ -669,6 +703,7 @@ wxString wxFileName::GetLongPath() const
             }
         }
     }
+
     return pathOut;
 #else
     return GetFullPath();
@@ -682,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