Unused warning fix.

[wxWidgets.git] / src / common / config.cpp

diff --git a/src/common/config.cpp b/src/common/config.cpp
index 80b43e4b9a5c5a38cfdf2278c727aabc370193c2..4cc55702a7926d31e046647e3c4587ff6ed33cd8 100644 (file)
--- a/src/common/config.cpp
+++ b/src/common/config.cpp
@@ -75,6 +75,7 @@ wxConfigBase::wxConfigBase(const wxString& appName,
 
 wxConfigBase::~wxConfigBase()
 {
 
 wxConfigBase::~wxConfigBase()
 {

+    // required here for Darwin

 }
 
 wxConfigBase *wxConfigBase::Set(wxConfigBase *pConfig)
 }
 
 wxConfigBase *wxConfigBase::Set(wxConfigBase *pConfig)


@@ -239,15 +240,20 @@ wxConfigPathChanger::wxConfigPathChanger(const wxConfigBase *pContainer,
     strPath = wxCONFIG_PATH_SEPARATOR;
   }
 
     strPath = wxCONFIG_PATH_SEPARATOR;
   }
 

-  if ( !strPath.IsEmpty() && m_pContainer->GetPath() != strPath ) {
-    // do change the path
-    m_bChanged = true;
+  if ( !strPath.IsEmpty() )
+  {
+    if ( m_pContainer->GetPath() != strPath )
+    {
+        // do change the path
+        m_bChanged = true;
+        m_strOldPath = m_pContainer->GetPath();
+        if ( *m_strOldPath.c_str() != wxCONFIG_PATH_SEPARATOR )
+          m_strOldPath += wxCONFIG_PATH_SEPARATOR;
+        m_pContainer->SetPath(strPath);
+    }
+
+    // in any case, use the just the name, not full path

     m_strName = strEntry.AfterLast(wxCONFIG_PATH_SEPARATOR);
     m_strName = strEntry.AfterLast(wxCONFIG_PATH_SEPARATOR);

-    m_strOldPath = m_pContainer->GetPath();
-    if ( m_strOldPath.Len() == 0 ||
-         m_strOldPath.Last() != wxCONFIG_PATH_SEPARATOR )
-        m_strOldPath += wxCONFIG_PATH_SEPARATOR;
-    m_pContainer->SetPath(strPath);

   }
   else {
     // it's a name only, without path - nothing to do
   }
   else {
     // it's a name only, without path - nothing to do