don't try to translate the standard encoding names

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

diff --git a/src/common/filename.cpp b/src/common/filename.cpp
index aad2543db419971a8a13755a6a396fc417ee3af7..b9679a11a3a1326331db2c74a3ac4aaeb7ba8a25 100644 (file)
--- a/src/common/filename.cpp
+++ b/src/common/filename.cpp
@@ -530,14 +530,50 @@ wxString wxFileName::GetPath( bool add_separator, wxPathFormat format ) const
 
 wxString wxFileName::GetFullPath( 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)
 wxString wxFileName::GetShortPath() const
 {
 }
 
 // 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);
     wxString path(GetFullPath());
     wxString pathOut;
     DWORD sz = ::GetShortPathName(path, NULL, 0);


@@ -554,8 +590,8 @@ wxString wxFileName::GetShortPath() const
     }
     if (ok)
         return pathOut;
     }
     if (ok)
         return pathOut;

-    else
-        return path;
+
+    return path;

 #else
     return GetFullPath();
 #endif
 #else
     return GetFullPath();
 #endif


@@ -564,12 +600,13 @@ wxString wxFileName::GetShortPath() const
 // Return the long form of the path (returns identity on non-Windows platforms)
 wxString wxFileName::GetLongPath() 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;
 
     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;
     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 ( !s_triedToLoad )
     {
         s_triedToLoad = TRUE;

-#if 0

         wxDllType dllKernel = wxDllLoader::LoadLibrary(_T("kernel32"));
         if ( dllKernel )
         {
         wxDllType dllKernel = wxDllLoader::LoadLibrary(_T("kernel32"));
         if ( dllKernel )
         {


@@ -615,12 +651,10 @@ wxString wxFileName::GetLongPath() const
                 }
             }
         }
                 }
             }
         }

-#endif         

     }
     if (success)
         return pathOut;
     }
     if (success)
         return pathOut;

-#endif
-    // wxUSE_DYNLIB_CLASS
+#endif // wxUSE_DYNLIB_CLASS

 
     if (!success)
     {
 
     if (!success)
     {


@@ -632,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;


@@ -669,6 +703,7 @@ wxString wxFileName::GetLongPath() const
             }
         }
     }
             }
         }
     }

+

     return pathOut;
 #else
     return GetFullPath();
     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__)
 #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
 #else
         format = wxPATH_UNIX;
 #endif