Mercurial > ecos

diff host/tools/configtool/standalone/wxwin/appsettings.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 8f4717f85ff4
children 24c0267fbb70
line wrap: on
line diff
--- a/host/tools/configtool/standalone/wxwin/appsettings.cpp
+++ b/host/tools/configtool/standalone/wxwin/appsettings.cpp
@@ -70,6 +70,7 @@
 #include "outputwin.h"
 #include "shortdescrwin.h"
 #include "mainwin.h"
+#include "filename.h"
 
 // For SystemInfo
 #ifdef __WXMSW__
@@ -514,7 +515,11 @@ bool ecSettings::LoadConfig()
                 m_userToolPaths[i] = str;
             } else
             {
+#if wxCHECK_VERSION(2, 6, 0)
+                m_userToolPaths.RemoveAt(i);
+#else
                 m_userToolPaths.Remove(i);
+#endif
                 i--;
             }
         }
@@ -532,7 +537,11 @@ bool ecSettings::LoadConfig()
                 m_userToolPaths[i] = str;
             } else
             {
+#if wxCHECK_VERSION(2, 6, 0)
+                m_userToolPaths.RemoveAt(i);
+#else
                 m_userToolPaths.Remove(i);
+#endif
                 i--;
             }
         }
@@ -767,7 +776,7 @@ const ecFileName& ecSettings::DefaultExt
 #ifdef __WXMSW__
     static bool bFirstTime=TRUE;
     if(bFirstTime){
-        const ecFileName strFile(ecFileName::GetTempPath()+wxT("index.html"));
+        const ecFileName strFile(ecFileName::EC_GetTempPath()+wxT("index.html"));
         wxFile f;
         if(f.Create(strFile, TRUE))
         {