Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleared the wxFileNameFromPath mess

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15546 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-05-13 23:49:32 +00:00
parent 0c5b83b0fa
commit 1f1070e2ed
1 changed files with 15 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
src/common/filefn.cpp
View File

@@ -156,6 +156,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxPathList, wxStringList)
// private globals // private globals
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// MT-FIXME: get rid of this horror and all code using it
static wxChar wxFileFunctionsBuffer[4*_MAXPATHLEN]; static wxChar wxFileFunctionsBuffer[4*_MAXPATHLEN];
#if defined(__VISAGECPP__) && __IBMCPP__ >= 400 #if defined(__VISAGECPP__) && __IBMCPP__ >= 400
@@ -669,11 +670,6 @@ wxContractPath (const wxString& filename, const wxString& envname, const wxStrin
wxStrcpy(wxFileFunctionsBuffer, wxT("~")); wxStrcpy(wxFileFunctionsBuffer, wxT("~"));
if (user != wxT("")) if (user != wxT(""))
wxStrcat(wxFileFunctionsBuffer, (const wxChar*) user); wxStrcat(wxFileFunctionsBuffer, (const wxChar*) user);
#ifdef __WXMSW__
// strcat(wxFileFunctionsBuffer, "\\");
#else
// strcat(wxFileFunctionsBuffer, "/");
#endif
wxStrcat(wxFileFunctionsBuffer, dest + len); wxStrcat(wxFileFunctionsBuffer, dest + len);
wxStrcpy (dest, wxFileFunctionsBuffer); wxStrcpy (dest, wxFileFunctionsBuffer);
} }
@@ -681,75 +677,27 @@ wxContractPath (const wxString& filename, const wxString& envname, const wxStrin
return dest; return dest;
} }
// Return just the filename, not the path // Return just the filename, not the path (basename)
// (basename)
wxChar *wxFileNameFromPath (wxChar *path) wxChar *wxFileNameFromPath (wxChar *path)
{ {
if (path) wxString p = path;
{ wxString n = wxFileNameFromPath(p);
register wxChar *tcp;
tcp = path + wxStrlen (path); return path + p.length() - n.length();
while (--tcp >= path)
{
#if defined(__WXMAC__) && !defined(__DARWIN__)
// Classic or Carbon CodeWarrior like
// Carbon with Apple DevTools is Unix like
if (*tcp == wxT(':'))
return tcp + 1;
#else
// Unix like or Windows
if (*tcp == wxT('/') || *tcp == wxT('\\'))
return tcp + 1;
#endif
#ifdef __VMS__
if (*tcp == wxT(':') || *tcp == wxT(']'))
return tcp + 1;
#endif
} /* while */
#if defined(__WXMSW__) || defined(__WXPM__)
// MSDOS like
if (wxIsalpha (*path) && *(path + 1) == wxT(':'))
return path + 2;
#endif
}
return path;
} }
wxString wxFileNameFromPath (const wxString& path1) wxString wxFileNameFromPath (const wxString& path)
{ {
if (path1 != wxT("")) wxString name, ext;
{ wxFileName::SplitPath(path, NULL, &name, &ext);
wxChar *path = WXSTRINGCAST path1 ;
register wxChar *tcp;
tcp = path + wxStrlen (path); wxString fullname = name;
while (--tcp >= path) if ( !ext.empty() )
{ {
#if defined(__WXMAC__) && !defined(__DARWIN__) fullname << wxFILE_SEP_EXT << ext;
// Classic or Carbon CodeWarrior like
// Carbon with Apple DevTools is Unix like
if (*tcp == wxT(':') )
return wxString(tcp + 1);
#else
// Unix like or Windows
if (*tcp == wxT('/') || *tcp == wxT('\\'))
return wxString(tcp + 1);
#endif
#ifdef __VMS__
if (*tcp == wxT(':') || *tcp == wxT(']'))
return wxString(tcp + 1);
#endif
} /* while */
#if defined(__WXMSW__) || defined(__WXPM__)
// MSDOS like
if (wxIsalpha (*path) && *(path + 1) == wxT(':'))
return wxString(path + 2);
#endif
} }
// Yes, this should return the path, not an empty string, otherwise
// we get "thing.txt" -> "". return fullname;
return path1;
} }
// Return just the directory, or NULL if no directory // Return just the directory, or NULL if no directory
@@ -1396,7 +1344,7 @@ wxString wxFindFirstFile(const wxChar *spec, int flags)
} }
wxString result; wxString result;
gs_dir->GetFirst(&result, wxFileNameFromPath((wxChar*) spec), dirFlags); gs_dir->GetFirst(&result, wxFileNameFromPath(wxString(spec)), dirFlags);
if ( result.IsEmpty() ) if ( result.IsEmpty() )
{ {
wxDELETE(gs_dir); wxDELETE(gs_dir);