AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merged wxRegConf rename fix from 2.2

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10229 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2001-05-19 01:04:25 +00:00
parent 18c5099700
commit 442d08ce74
1 changed files with 2 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/msw/regconf.cpp
View File

@ -695,34 +695,7 @@ bool wxRegConfig::RenameEntry(const wxString& oldName, const wxString& newName)
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;
return m_keyLocal.RenameValue(oldName, newName);
}
bool wxRegConfig::RenameGroup(const wxString& oldName, const wxString& newName)
@ -735,11 +708,7 @@ bool wxRegConfig::RenameGroup(const wxString& oldName, const wxString& newName)
if ( HasGroup(newName) )
return FALSE;
// TODO there is no way to rename a registry key - we must do a deep copy
// ourselves
wxFAIL_MSG(wxT("Registry key renaming not implemented"));
return FALSE;
return wxRegKey(m_keyLocal, oldName).Rename(newName);
}
// ----------------------------------------------------------------------------