From d42b8535819a789e20aca0f39bf1e0aa27b5ebdb Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 7 Oct 2007 23:24:22 +0000 Subject: [PATCH] blind fix for Borland problems with operator?: after latest changes git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49087 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/generic/filectrlg.cpp | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/generic/filectrlg.cpp b/src/generic/filectrlg.cpp index dc82dcba88..66ee552da4 100644 --- a/src/generic/filectrlg.cpp +++ b/src/generic/filectrlg.cpp @@ -1080,7 +1080,15 @@ wxFileName wxGenericFileCtrl::DoGetFileName() const 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(); @@ -1093,7 +1101,7 @@ void wxGenericFileCtrl::DoGetFilenames( wxArrayString& filenames, const bool ful if ( fn.IsRelative() ) fn.MakeAbsolute(dir); - filenames.push_back(fullPath ? fn.GetFullPath() : fn.GetFullName()); + filenames.push_back(GetFileNameOrPath(fn, fullPath)); return; } @@ -1117,7 +1125,7 @@ void wxGenericFileCtrl::DoGetFilenames( wxArrayString& filenames, const bool ful m_list->GetItem(item); const wxFileName fn(dir, item.m_text); - filenames.push_back(fullPath ? fn.GetFullPath() : fn.GetFullName()); + filenames.push_back(GetFileNameOrPath(fn, fullPath)); } } -- 2.45.2