{
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;
}
if (ok)
return pathOut;
- else
- return path;
+
+ return path;
#else
return GetFullPath();
#endif
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;
if ( !s_triedToLoad )
{
s_triedToLoad = TRUE;
-#if 0
wxDllType dllKernel = wxDllLoader::LoadLibrary(_T("kernel32"));
if ( dllKernel )
{
}
}
}
-#endif
}
if (success)
return pathOut;
-#endif
- // wxUSE_DYNLIB_CLASS
+#endif // wxUSE_DYNLIB_CLASS
if (!success)
{
pathOut = wxEmptyString;
wxArrayString dirs = GetDirs();
- dirs.Add(GetName());
+ dirs.Add(GetFullName());
size_t count = dirs.GetCount();
size_t i;
}
}
}
+
return pathOut;
#else
return GetFullPath();
#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