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

blind fix for Borland problems with operator?: after latest changes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49087 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-10-07 23:24:22 +00:00
parent 8e5dbcdd50
commit d42b853581
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/generic/filectrlg.cpp
View File

@@ -1080,7 +1080,15 @@ wxFileName wxGenericFileCtrl::DoGetFileName() const
return fn; return fn;
} }
void wxGenericFileCtrl::DoGetFilenames( wxArrayString& filenames, const bool fullPath ) const // helper used in DoGetFilenames() and needed because Borland can't compile
// operator?: inline
static inline wxString GetFileNameOrPath(const wxFileName& fn, bool fullPath)
{
return fullPath ? fn.GetFullPath() : fn.GetFullName();
}
void
wxGenericFileCtrl::DoGetFilenames(wxArrayString& filenames, bool fullPath) const
{ {
filenames.clear(); filenames.clear();
@@ -1093,7 +1101,7 @@ void wxGenericFileCtrl::DoGetFilenames( wxArrayString& filenames, const bool ful
if ( fn.IsRelative() ) if ( fn.IsRelative() )
fn.MakeAbsolute(dir); fn.MakeAbsolute(dir);
filenames.push_back(fullPath ? fn.GetFullPath() : fn.GetFullName()); filenames.push_back(GetFileNameOrPath(fn, fullPath));
return; return;
} }
@@ -1117,7 +1125,7 @@ void wxGenericFileCtrl::DoGetFilenames( wxArrayString& filenames, const bool ful
m_list->GetItem(item); m_list->GetItem(item);
const wxFileName fn(dir, item.m_text); const wxFileName fn(dir, item.m_text);
filenames.push_back(fullPath ? fn.GetFullPath() : fn.GetFullName()); filenames.push_back(GetFileNameOrPath(fn, fullPath));
} }
} }