IsModified() function now works correctly

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

diff --git a/src/msw/regconf.cpp b/src/msw/regconf.cpp
index c2d1d8e76be43924dc59211a44f924ff6536fb75..aa17ccc352cb74452a3d2f851a524ab3623765ae 100644 (file)
--- a/src/msw/regconf.cpp
+++ b/src/msw/regconf.cpp
@@ -1,8 +1,8 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        msw/regconf.cpp
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        msw/regconf.cpp

-// Purpose:     
+// Purpose:

 // Author:      Vadim Zeitlin
 // Author:      Vadim Zeitlin

-// Modified by: 
+// Modified by:

 // Created:     27.04.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Created:     27.04.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>


@@ -20,10 +20,25 @@
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------

-#include <wx/wx.h>
+
+#ifdef __GNUG__
+  #pragma implementation "regconf.h"
+#endif
+
+#include  "wx/wxprec.h"
+
+#ifdef    __BORLANDC__
+  #pragma hdrstop
+#endif  //__BORLANDC__
+
+#ifndef WX_PRECOMP
+  #include  <wx/string.h>
+#endif //WX_PRECOMP
+
+#include <wx/log.h>

 #include <wx/config.h>
 #include <wx/config.h>

-#include <wx/regconf.h>
-#include <wx/registry.h>
+#include <wx/msw/registry.h>
+#include <wx/msw/regconf.h>

 
 // ----------------------------------------------------------------------------
 // constants
 
 // ----------------------------------------------------------------------------
 // constants


@@ -55,9 +70,9 @@ bool TryGetValue(const wxRegKey& key, const wxString& str, long *plVal)
 // ctor/dtor
 // ----------------------------------------------------------------------------
 wxRegConfig::wxRegConfig(const wxString& strRoot)
 // ctor/dtor
 // ----------------------------------------------------------------------------
 wxRegConfig::wxRegConfig(const wxString& strRoot)

-           : m_keyLocalRoot(wxRegKey::HKCU, SOFTWARE_KEY + strRoot), 
+           : m_keyLocalRoot(wxRegKey::HKCU, SOFTWARE_KEY + strRoot),

              m_keyLocal(m_keyLocalRoot, ""),
              m_keyLocal(m_keyLocalRoot, ""),

-             m_keyGlobalRoot(wxRegKey::HKLM, SOFTWARE_KEY + strRoot), 
+             m_keyGlobalRoot(wxRegKey::HKLM, SOFTWARE_KEY + strRoot),

              m_keyGlobal(m_keyGlobalRoot, "")
 {
   // Create() will Open() if key already exists
              m_keyGlobal(m_keyGlobalRoot, "")
 {
   // Create() will Open() if key already exists


@@ -77,20 +92,20 @@ wxRegConfig::~wxRegConfig()
 // ----------------------------------------------------------------------------
 void wxRegConfig::SetPath(const wxString& strPath)
 {
 // ----------------------------------------------------------------------------
 void wxRegConfig::SetPath(const wxString& strPath)
 {

-  ArrayString aParts;
+  wxArrayString aParts;

 
   if ( strPath.IsEmpty() )
     return;
 
   if ( strPath[0] == APPCONF_PATH_SEPARATOR ) {
     // absolute path
 
   if ( strPath.IsEmpty() )
     return;
 
   if ( strPath[0] == APPCONF_PATH_SEPARATOR ) {
     // absolute path

-    SplitPath(aParts, strPath);
+    wxSplitPath(aParts, strPath);

   }
   else {
     // relative path, combine with current one
     wxString strFullPath = GetPath();
     strFullPath << APPCONF_PATH_SEPARATOR << strPath;
   }
   else {
     // relative path, combine with current one
     wxString strFullPath = GetPath();
     strFullPath << APPCONF_PATH_SEPARATOR << strPath;

-    SplitPath(aParts, strFullPath);
+    wxSplitPath(aParts, strFullPath);

   }
 
   // recombine path parts in one variable
   }
 
   // recombine path parts in one variable


@@ -115,7 +130,7 @@ void wxRegConfig::SetPath(const wxString& strPath)
 // ----------------------------------------------------------------------------
 
 /*
 // ----------------------------------------------------------------------------
 
 /*

-  We want to enumerate all local keys/values after the global ones, but, of 
+  We want to enumerate all local keys/values after the global ones, but, of

   course, we don't want to repeat a key which appears locally as well as
   globally twice.
 
   course, we don't want to repeat a key which appears locally as well as
   globally twice.
 


@@ -125,13 +140,13 @@ void wxRegConfig::SetPath(const wxString& strPath)
 #define LOCAL_MASK        0x8000
 #define IS_LOCAL_INDEX(l) (((l) & LOCAL_MASK) != 0)
 
 #define LOCAL_MASK        0x8000
 #define IS_LOCAL_INDEX(l) (((l) & LOCAL_MASK) != 0)
 

-bool wxRegConfig::GetFirstGroup(wxString& str, long& lIndex)
+bool wxRegConfig::GetFirstGroup(wxString& str, long& lIndex) const

 {
   lIndex = 0;
   return GetNextGroup(str, lIndex);
 }
 
 {
   lIndex = 0;
   return GetNextGroup(str, lIndex);
 }
 

-bool wxRegConfig::GetNextGroup (wxString& str, long& lIndex)
+bool wxRegConfig::GetNextGroup(wxString& str, long& lIndex) const

 {
   // are we already enumerating local entries?
   if ( m_keyGlobal.IsOpened() && !IS_LOCAL_INDEX(lIndex) ) {
 {
   // are we already enumerating local entries?
   if ( m_keyGlobal.IsOpened() && !IS_LOCAL_INDEX(lIndex) ) {


@@ -154,35 +169,83 @@ bool wxRegConfig::GetNextGroup (wxString& str, long& lIndex)
   return bOk;
 }
 
   return bOk;
 }
 

-bool wxRegConfig::GetFirstEntry(wxString& str, long& lIndex)
+bool wxRegConfig::GetFirstEntry(wxString& str, long& lIndex) const

 {
   lIndex = 0;
 {
   lIndex = 0;

-  return GetNextGroup(str, lIndex);
+  return GetNextEntry(str, lIndex);

 }
 
 }
 

-bool wxRegConfig::GetNextEntry (wxString& str, long& lIndex)
+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 {
 {
   // 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) ) {
+      if ( !m_keyGlobal.GetNextValue(str, lIndex) ) {

         // no more global entries
         lIndex |= LOCAL_MASK;
         break;
       }
         // no more global entries
         lIndex |= LOCAL_MASK;
         break;
       }

-    } while( m_keyLocal.HasSubKey(str) );
+    } while( m_keyLocal.HasValue(str) );

   }
 
   // much easier with local entries: get the next one we find
   // (don't forget to clear our flag bit and set it again later)
   lIndex &= ~LOCAL_MASK;
   }
 
   // much easier with local entries: get the next one we find
   // (don't forget to clear our flag bit and set it again later)
   lIndex &= ~LOCAL_MASK;

-  bool bOk = m_keyLocal.GetNextKey(str, lIndex);
+  bool bOk = m_keyLocal.GetNextValue(str, lIndex);

   lIndex |= LOCAL_MASK;
 
   return bOk;
 }
 
   lIndex |= LOCAL_MASK;
 
   return bOk;
 }
 

+uint wxRegConfig::GetNumberOfEntries() const
+{
+  uint nEntries = 0;
+
+  // dummy vars
+  wxString str;
+  long l;
+  bool bCont = GetFirstEntry(str, l);
+  while ( bCont ) {
+    nEntries++;
+
+    bCont = GetNextEntry(str, l);
+  }
+
+  return nEntries;
+}
+
+uint wxRegConfig::GetNumberOfGroups() const
+{
+  uint nGroups = 0;
+
+  // dummy vars
+  wxString str;
+  long l;
+  bool bCont = GetFirstGroup(str, l);
+  while ( bCont ) {
+    nGroups++;
+
+    bCont = GetNextGroup(str, l);
+  }
+
+  return nGroups;
+}
+
+// ----------------------------------------------------------------------------
+// tests for existence
+// ----------------------------------------------------------------------------
+
+bool wxRegConfig::HasGroup(const wxString& strName) const
+{
+  return m_keyLocal.HasSubKey(strName) || m_keyGlobal.HasSubKey(strName);
+}
+
+bool wxRegConfig::HasEntry(const wxString& strName) const
+{
+  return m_keyLocal.HasValue(strName) || m_keyGlobal.HasValue(strName);
+}
+

 // ----------------------------------------------------------------------------
 // reading/writing
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // reading/writing
 // ----------------------------------------------------------------------------


@@ -200,7 +263,7 @@ bool wxRegConfig::Read(wxString& str,
   if ( IsImmutable(path.Name()) ) {
     if ( TryGetValue(m_keyGlobal, path.Name(), str) ) {
       if ( m_keyLocal.HasValue(path.Name()) ) {
   if ( IsImmutable(path.Name()) ) {
     if ( TryGetValue(m_keyGlobal, path.Name(), str) ) {
       if ( m_keyLocal.HasValue(path.Name()) ) {

-        wxLogWarning("User value for immutable key '%s' ignored.", 
+        wxLogWarning("User value for immutable key '%s' ignored.",

                    path.Name().c_str());
       }
 
                    path.Name().c_str());
       }
 


@@ -234,7 +297,7 @@ bool wxRegConfig::Read(long &lValue, const char *szKey, long lDefault) const
   if ( IsImmutable(path.Name()) ) {
     if ( TryGetValue(m_keyGlobal, path.Name(), &lValue) ) {
       if ( m_keyLocal.HasValue(path.Name()) ) {
   if ( IsImmutable(path.Name()) ) {
     if ( TryGetValue(m_keyGlobal, path.Name(), &lValue) ) {
       if ( m_keyLocal.HasValue(path.Name()) ) {

-        wxLogWarning("User value for immutable key '%s' ignored.", 
+        wxLogWarning("User value for immutable key '%s' ignored.",

                      path.Name().c_str());
       }
 
                      path.Name().c_str());
       }
 


@@ -291,7 +354,7 @@ bool wxRegConfig::DeleteEntry(const char *szValue, bool bGroupIfEmptyAlso)
   if ( !m_keyLocal.DeleteValue(path.Name()) )
     return FALSE;
 
   if ( !m_keyLocal.DeleteValue(path.Name()) )
     return FALSE;
 

-  if ( m_keyLocal.IsEmpty() ) {
+  if ( !m_keyLocal.HasSubkeys() ) {

     wxString strKey = GetPath().Right(APPCONF_PATH_SEPARATOR);
     SetPath("..");  // changes m_keyLocal
     return m_keyLocal.DeleteKey(strKey);
     wxString strKey = GetPath().Right(APPCONF_PATH_SEPARATOR);
     SetPath("..");  // changes m_keyLocal
     return m_keyLocal.DeleteKey(strKey);


@@ -309,9 +372,6 @@ bool wxRegConfig::DeleteGroup(const char *szKey)
 
 bool wxRegConfig::DeleteAll()
 {
 
 bool wxRegConfig::DeleteAll()
 {

-  // first of all, prevent the creation of new registry entries
-  Config::EnableAutosave(FALSE);
-

   m_keyLocal.Close();
   m_keyGlobal.Close();
 
   m_keyLocal.Close();
   m_keyGlobal.Close();