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

diff --git a/src/generic/filectrlg.cpp b/src/generic/filectrlg.cpp
index dc82dcba88a4b458babba5c7e9da5fdc3b827d9e..66ee552da4dba9ae498823c05250d57ff6f6c2f0 100644 (file)
--- a/src/generic/filectrlg.cpp
+++ b/src/generic/filectrlg.cpp
@@ -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() )
             fn.MakeAbsolute(dir);
 
         if ( fn.IsRelative() )
             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);
 
         const wxFileName fn(dir, item.m_text);
         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));

     }
 }
 
     }
 }