X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f2b039111621a32fcdc9bee440d1ed42325e99c9..ba681060f36767a2682b8547871af2c6f8159955:/src/msw/regconf.cpp?ds=sidebyside

diff --git a/src/msw/regconf.cpp b/src/msw/regconf.cpp
index c14d3e550c..8943720d8f 100644
--- a/src/msw/regconf.cpp
+++ b/src/msw/regconf.cpp
@@ -24,9 +24,13 @@
   #include  <wx/string.h>
 #endif //WX_PRECOMP
 
+#include <wx/event.h>
 #include <wx/app.h>
 #include <wx/log.h>
 #include <wx/config.h>
+
+#ifndef __WIN16__
+
 #include <wx/msw/registry.h>
 #include <wx/msw/regconf.h>
 
@@ -35,7 +39,7 @@
 // ----------------------------------------------------------------------------
 
 // we put our data in HKLM\SOFTWARE_KEY\appname
-#define SOFTWARE_KEY    wxString("Software\\wxWindows\\")
+#define SOFTWARE_KEY    wxString("Software\\")
 
 // ----------------------------------------------------------------------------
 // global functions
@@ -433,6 +437,67 @@ bool wxRegConfig::Write(const wxString& key, long lValue)
   return m_keyLocal.SetValue(path.Name(), lValue);
 }
 
+// ----------------------------------------------------------------------------
+// renaming
+// ----------------------------------------------------------------------------
+
+bool wxRegConfig::RenameEntry(const wxString& oldName, const wxString& newName)
+{
+    // check that the old entry exists...
+    if ( !HasEntry(oldName) )
+        return FALSE;
+
+    // and that the new one doesn't
+    if ( HasEntry(newName) )
+        return FALSE;
+
+    // delete the old entry and create the new one - but do in the reverse
+    // order to not lose the data if Create() fails
+
+    bool ok;
+    if ( m_keyLocal.IsNumericValue(oldName) )
+    {
+        long val;
+        ok = m_keyLocal.QueryValue(oldName, &val) &&
+             m_keyLocal.SetValue(newName, val);
+    }
+    else
+    {
+        wxString val;
+        ok = m_keyLocal.QueryValue(oldName, val) &&
+             m_keyLocal.SetValue(newName, val);
+    }
+
+    if ( !ok )
+        return FALSE;
+
+    if ( !m_keyLocal.DeleteValue(oldName) )
+    {
+        m_keyLocal.DeleteValue(newName);
+
+        return FALSE;
+    }
+
+    return TRUE;
+}
+
+bool wxRegConfig::RenameGroup(const wxString& oldName, const wxString& newName)
+{
+    // check that the old group exists...
+    if ( !HasGroup(oldName) )
+        return FALSE;
+
+    // and that the new one doesn't
+    if ( HasGroup(newName) )
+        return FALSE;
+
+    // TODO there is no way to rename a registry key - we must do a deep copy
+    //      ourselves
+    wxFAIL_MSG("Registry key renaming not implemented");
+
+    return FALSE;
+}
+
 // ----------------------------------------------------------------------------
 // deleting
 // ----------------------------------------------------------------------------
@@ -444,7 +509,7 @@ bool wxRegConfig::DeleteEntry(const wxString& value, bool bGroupIfEmptyAlso)
     return FALSE;
 
   if ( !m_keyLocal.HasSubkeys() ) {
-    wxString strKey = GetPath().Right(wxCONFIG_PATH_SEPARATOR);
+    wxString strKey = GetPath().AfterLast(wxCONFIG_PATH_SEPARATOR);
     SetPath("..");  // changes m_keyLocal
     return m_keyLocal.DeleteKey(strKey);
   }
@@ -465,8 +530,15 @@ bool wxRegConfig::DeleteAll()
   m_keyGlobal.Close();
 
   bool bOk = m_keyLocalRoot.DeleteSelf();
-  if ( bOk )
+
+  // make sure that we opened m_keyGlobalRoot and so it has a reasonable name:
+  // otherwise we will delete HKEY_CLASSES_ROOT recursively
+  if ( bOk && m_keyGlobalRoot.IsOpened() )
     bOk = m_keyGlobalRoot.DeleteSelf();
 
   return bOk;
 }
+
+#endif
+  // __WIN16__
+