Applied some of patch [ 688466 ] MSVC7 build & bug fixes

by Darren Whobrey


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19930 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2003-04-02 11:10:37 +00:00
parent baf3431445
commit 083f7497d3
18 changed files with 53 additions and 25 deletions

View File

@@ -939,7 +939,7 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId)
{
wxString eachFilename(dirs[i]);
path = dirName;
if (path.Last() != wxFILE_SEP_PATH)
if (!wxEndsWithPathSeparator(path))
path += wxString(wxFILE_SEP_PATH);
path += eachFilename;
@@ -966,7 +966,7 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId)
{
wxString eachFilename(filenames[i]);
path = dirName;
if (path.Last() != wxFILE_SEP_PATH)
if (!wxEndsWithPathSeparator(path))
path += wxString(wxFILE_SEP_PATH);
path += eachFilename;
//path = dirName + wxString(wxT("/")) + eachFilename;
@@ -1010,7 +1010,7 @@ wxTreeItemId wxGenericDirCtrl::FindChild(wxTreeItemId parentId, const wxString&
if (data && !data->m_path.IsEmpty())
{
wxString childPath(data->m_path);
if (childPath.Last() != wxFILE_SEP_PATH)
if (!wxEndsWithPathSeparator(childPath))
childPath += wxString(wxFILE_SEP_PATH);
// In MSW and PM, case is not significant