Const casting fix for Vis C.

[wxWidgets.git] / src / msw / regconf.cpp

diff --git a/src/msw/regconf.cpp b/src/msw/regconf.cpp
index 4fb34f240d9a1ff3030e7de0b44b4c3662b4bc8e..9c77482ec94a9d8bfab359f9856683947f9acc55 100644 (file)
--- a/src/msw/regconf.cpp
+++ b/src/msw/regconf.cpp
@@ -27,6 +27,9 @@
 #include "wx/event.h"
 #include "wx/app.h"
 #include "wx/log.h"
+
+#if wxUSE_CONFIG
+
 #include "wx/config.h"
 
 #ifndef __WIN16__
@@ -131,6 +134,7 @@ wxRegConfig::wxRegConfig(const wxString& appName, const wxString& vendorName,
   {
     wxLogNull nolog;
     m_keyGlobalRoot.Open();
+    m_keyGlobal.Open();
   }
 }
 
@@ -160,13 +164,25 @@ void wxRegConfig::SetPath(const wxString& strPath)
   }
 
   // recombine path parts in one variable
-  wxString strRegPath;
+  wxString strOldPath = m_strPath, strRegPath;
   m_strPath.Empty();
   for ( size_t n = 0; n < aParts.Count(); n++ ) {
     strRegPath << '\\' << aParts[n];
     m_strPath << wxCONFIG_PATH_SEPARATOR << aParts[n];
   }
 
+  if ( m_strPath == strOldPath )
+      return;
+
+  // as we create the registry key when SetPath(key) is done, we can be left
+  // with plenty of empty keys if this was only done to try to read some value
+  // which, in fact, doesn't exist - to prevent this from happening we
+  // automatically delete the old key if it was empty
+  if ( m_keyLocal.IsEmpty() )
+  {
+      m_keyLocal.DeleteSelf();
+  }
+
   // change current key(s)
   m_keyLocal.SetName(m_keyLocalRoot, strRegPath);
   m_keyGlobal.SetName(m_keyGlobalRoot, strRegPath);
@@ -202,13 +218,15 @@ bool wxRegConfig::GetNextGroup(wxString& str, long& lIndex) const
   // are we already enumerating local entries?
   if ( m_keyGlobal.IsOpened() && !IS_LOCAL_INDEX(lIndex) ) {
     // try to find a global entry which doesn't appear locally
-    do {
-      if ( !m_keyGlobal.GetNextKey(str, lIndex) ) {
-        // no more global entries
-        lIndex |= LOCAL_MASK;
-        break;
+    while ( m_keyGlobal.GetNextKey(str, lIndex) ) {
+      if ( !m_keyLocal.HasSubKey(str) ) {
+        // ok, found one - return it
+        return TRUE;
       }
-    } while( m_keyLocal.HasSubKey(str) );
+    }
+
+    // no more global entries
+    lIndex |= LOCAL_MASK;
   }
 
   // much easier with local entries: get the next one we find
@@ -231,13 +249,15 @@ bool wxRegConfig::GetNextEntry(wxString& str, long& lIndex) const
   // are we already enumerating local entries?
   if ( m_keyGlobal.IsOpened() && !IS_LOCAL_INDEX(lIndex) ) {
     // try to find a global entry which doesn't appear locally
-    do {
-      if ( !m_keyGlobal.GetNextValue(str, lIndex) ) {
-        // no more global entries
-        lIndex |= LOCAL_MASK;
-        break;
+    while ( m_keyGlobal.GetNextValue(str, lIndex) ) {
+      if ( !m_keyLocal.HasValue(str) ) {
+        // ok, found one - return it
+        return TRUE;
       }
-    } while( m_keyLocal.HasValue(str) );
+    }
+
+    // no more global entries
+    lIndex |= LOCAL_MASK;
   }
 
   // much easier with local entries: get the next one we find
@@ -565,3 +585,5 @@ bool wxRegConfig::DeleteAll()
 #endif
   // __WIN16__
 
+#endif
+  // wxUSE_CONFIG