Renamed m_clientData member variable to avoid clash with variable with same

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

diff --git a/src/msw/regconf.cpp b/src/msw/regconf.cpp
index 1c9892c0b9e539b8f6387e74ed3576b2dd7e4325..1777569b8885c45327a362bba52d69ef9e383670 100644 (file)
--- a/src/msw/regconf.cpp
+++ b/src/msw/regconf.cpp
@@ -24,11 +24,10 @@
     #include  "wx/string.h"
     #include  "wx/intl.h"
     #include "wx/log.h"
+    #include "wx/event.h"
+    #include "wx/app.h"
 #endif //WX_PRECOMP
 
-#include "wx/event.h"
-#include "wx/app.h"
-
 #include "wx/msw/registry.h"
 #include "wx/msw/regconf.h"
 
@@ -700,7 +699,18 @@ bool wxRegConfig::DeleteGroup(const wxString& key)
 {
   wxConfigPathChanger path(this, key);
 
-  return m_keyLocal.Exists() ? LocalKey().DeleteKey(path.Name()) : true;
+  if ( !m_keyLocal.Exists() )
+  {
+      // nothing to do
+      return true;
+  }
+
+  if ( !LocalKey().DeleteKey(path.Name()) )
+      return false;
+
+  path.UpdateIfDeleted();
+
+  return true;
 }
 
 bool wxRegConfig::DeleteAll()
@@ -718,5 +728,4 @@ bool wxRegConfig::DeleteAll()
   return bOk;
 }
 
-#endif
-  // wxUSE_CONFIG
+#endif // wxUSE_CONFIG