Mercurial > ecos

diff host/tools/configtool/standalone/wxwin/filename.cpp @ 2466:480aa5d146e3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* configtool/standalone/wxwin/admindlg.cpp, configtool/standalone/wxwin/appsettings.cpp, configtool/standalone/wxwin/configitem.cpp, configtool/standalone/wxwin/configtool.cpp, configtool/standalone/wxwin/configtooldoc.cpp, configtool/standalone/wxwin/configtooldoc.h, configtool/standalone/wxwin/configtoolview.cpp, configtool/standalone/wxwin/configtree.cpp, configtool/standalone/wxwin/conflictsdlg.cpp, configtool/standalone/wxwin/docsystem.cpp, configtool/standalone/wxwin/ecscrolwin.cpp, configtool/standalone/wxwin/ecscrolwin.h, configtool/standalone/wxwin/ecutils.cpp, configtool/standalone/wxwin/ecutils.h, configtool/standalone/wxwin/filename.cpp, configtool/standalone/wxwin/filename.h, configtool/standalone/wxwin/folderdlg.cpp, configtool/standalone/wxwin/mainwin.cpp, configtool/standalone/wxwin/makefile.gnu, configtool/standalone/wxwin/packagesdlg.cpp, configtool/standalone/wxwin/packagesdlg.h, configtool/standalone/wxwin/platformsdlg.cpp, configtool/standalone/wxwin/platformsdlg.h, configtool/standalone/wxwin/splittree.cpp: Changes to allow building against wxWidgets 2.6.x.
author jld
date Wed, 26 Mar 2008 13:15:44 +0000
parents 8bf039d894d8
children 24c0267fbb70
line wrap: on
line diff
--- a/host/tools/configtool/standalone/wxwin/filename.cpp
+++ b/host/tools/configtool/standalone/wxwin/filename.cpp
@@ -371,7 +371,11 @@ bool ecFileName::Exists     () const
 
 bool ecFileName::IsDir      () const
 {
+#if wxCHECK_VERSION(2, 6, 0)
+	return (wxDirExists(* this));
+#else
     return wxPathExists(* this);
+#endif
 }
 
 bool ecFileName::IsFile     () const
@@ -410,7 +414,7 @@ bool ecFileName::SameFile(const ecFileNa
 #endif
 }
 
-ecFileName ecFileName::ExpandEnvironmentStrings(const wxChar* psz)
+ecFileName ecFileName::EC_ExpandEnvironmentStrings(const wxChar* psz)
 {
     // wxExpandEnvVars is from confbase.h
 
@@ -418,9 +422,9 @@ ecFileName ecFileName::ExpandEnvironment
     return f;
 }
 
-const ecFileName& ecFileName::ExpandEnvironmentStrings()
+const ecFileName& ecFileName::EC_ExpandEnvironmentStrings()
 {
-    *this=ecFileName::ExpandEnvironmentStrings(*this);
+    *this=ecFileName::EC_ExpandEnvironmentStrings(*this);
     return *this;
 }
 
@@ -463,7 +467,7 @@ const ecFileName& ecFileName::MakeRelati
 }
 
 
-ecFileName ecFileName::GetCurrentDirectory()
+ecFileName ecFileName::EC_GetCurrentDirectory()
 {
     ecFileName f;
     f = wxGetCwd();
@@ -525,7 +529,7 @@ const wxChar* *ecFileName::Chop()
 }
 #endif
 
-ecFileName ecFileName::GetTempPath()
+ecFileName ecFileName::EC_GetTempPath()
 {
     ecFileName f;
 #ifdef __WXMSW__
@@ -566,7 +570,7 @@ const ecFileName ecFileName::CygPath () 
     return rc;
 }
 
-bool ecFileName::CreateDirectory(bool bParentsToo,bool bFailIfAlreadyExists) const
+bool ecFileName::EC_CreateDirectory(bool bParentsToo,bool bFailIfAlreadyExists) const
 {
     if(bParentsToo)
     {
@@ -633,7 +637,7 @@ const wxString ecFileName::Root() const
     return wxPathOnly(*this);
 }
 
-ecFileName ecFileName::SetCurrentDirectory(const wxChar* pszDir)
+ecFileName ecFileName::EC_SetCurrentDirectory(const wxChar* pszDir)
 {
     const ecFileName strPwd=wxGetCwd();
     if (::wxSetWorkingDirectory(pszDir))