///////////////////////////////////////////////////////////////////////////////
// Name: msw/regconf.cpp
-// Purpose:
+// Purpose:
// Author: Vadim Zeitlin
-// Modified by:
+// Modified by:
// Created: 27.04.98
// RCS-ID: $Id$
// Copyright: (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
// ----------------------------------------------------------------------------
// 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/regconf.h>
-#include <wx/registry.h>
+#include <wx/msw/registry.h>
+#include <wx/msw/regconf.h>
// ----------------------------------------------------------------------------
// constants
// 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_keyGlobalRoot(wxRegKey::HKLM, SOFTWARE_KEY + strRoot),
+ m_keyGlobalRoot(wxRegKey::HKLM, SOFTWARE_KEY + strRoot),
m_keyGlobal(m_keyGlobalRoot, "")
{
// Create() will Open() if key already exists
// ----------------------------------------------------------------------------
void wxRegConfig::SetPath(const wxString& strPath)
{
- ArrayString aParts;
+ wxArrayString aParts;
if ( strPath.IsEmpty() )
return;
- if ( strPath[0] == APPCONF_PATH_SEPARATOR ) {
+ if ( strPath[0] == wxCONFIG_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;
- SplitPath(aParts, strFullPath);
+ strFullPath << wxCONFIG_PATH_SEPARATOR << strPath;
+ wxSplitPath(aParts, strFullPath);
}
// recombine path parts in one variable
m_strPath.Empty();
for ( uint n = 0; n < aParts.Count(); n++ ) {
strRegPath << '\\' << aParts[n];
- m_strPath << APPCONF_PATH_SEPARATOR << aParts[n];
+ m_strPath << wxCONFIG_PATH_SEPARATOR << aParts[n];
}
// change current key(s)
// ----------------------------------------------------------------------------
/*
- 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.
#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);
}
-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) ) {
return bOk;
}
-bool wxRegConfig::GetFirstEntry(wxString& str, long& lIndex)
+bool wxRegConfig::GetFirstEntry(wxString& str, long& lIndex) const
{
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 {
- if ( !m_keyGlobal.GetNextKey(str, lIndex) ) {
+ if ( !m_keyGlobal.GetNextValue(str, lIndex) ) {
// 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;
- bool bOk = m_keyLocal.GetNextKey(str, lIndex);
+ bool bOk = m_keyLocal.GetNextValue(str, lIndex);
lIndex |= LOCAL_MASK;
return bOk;
}
+uint wxRegConfig::GetNumberOfEntries(bool bRecursive) const
+{
+ uint nEntries = 0;
+
+ // dummy vars
+ wxString str;
+ long l;
+ bool bCont = ((wxRegConfig*)this)->GetFirstEntry(str, l);
+ while ( bCont ) {
+ nEntries++;
+
+ bCont = ((wxRegConfig*)this)->GetNextEntry(str, l);
+ }
+
+ return nEntries;
+}
+
+uint wxRegConfig::GetNumberOfGroups(bool bRecursive) const
+{
+ uint nGroups = 0;
+
+ // dummy vars
+ wxString str;
+ long l;
+ bool bCont = ((wxRegConfig*)this)->GetFirstGroup(str, l);
+ while ( bCont ) {
+ nGroups++;
+
+ bCont = ((wxRegConfig*)this)->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
// ----------------------------------------------------------------------------
-bool wxRegConfig::Read(wxString& str,
- const char *szKey,
- const char *szDefault) const
+bool wxRegConfig::Read(wxString *pStr,
+ const char *szKey,
+ const char *szDefault) const
{
PathChanger path(this, szKey);
// if immutable key exists in global key we must check that it's not
// overriden by the local key with the same name
if ( IsImmutable(path.Name()) ) {
- if ( TryGetValue(m_keyGlobal, path.Name(), str) ) {
+ if ( TryGetValue(m_keyGlobal, path.Name(), *pStr) ) {
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());
}
}
// first try local key
- if ( TryGetValue(m_keyLocal, path.Name(), str) ||
- (bQueryGlobal && TryGetValue(m_keyGlobal, path.Name(), str)) ) {
+ if ( TryGetValue(m_keyLocal, path.Name(), *pStr) ||
+ (bQueryGlobal && TryGetValue(m_keyGlobal, path.Name(), *pStr)) ) {
return TRUE;
}
+ if(IsRecordingDefaults())
+ ((wxRegConfig*)this)->Write(szKey,szDefault);
+
// default value
- str = szDefault;
+ *pStr = szDefault;
return FALSE;
}
-bool wxRegConfig::Read(long &lValue, const char *szKey, long lDefault) const
+bool wxRegConfig::Read(long *plResult, const char *szKey, long lDefault) const
{
PathChanger path(this, szKey);
// if immutable key exists in global key we must check that it's not
// overriden by the local key with the same name
if ( IsImmutable(path.Name()) ) {
- if ( TryGetValue(m_keyGlobal, path.Name(), &lValue) ) {
+ if ( TryGetValue(m_keyGlobal, path.Name(), plResult) ) {
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());
}
}
// first try local key
- if ( TryGetValue(m_keyLocal, path.Name(), &lValue) ||
- (bQueryGlobal && TryGetValue(m_keyGlobal, path.Name(), &lValue)) ) {
+ if ( TryGetValue(m_keyLocal, path.Name(), plResult) ||
+ (bQueryGlobal && TryGetValue(m_keyGlobal, path.Name(), plResult)) ) {
return TRUE;
}
// default
- lValue = lDefault;
+ *plResult = lDefault;
return FALSE;
}
if ( !m_keyLocal.DeleteValue(path.Name()) )
return FALSE;
- if ( m_keyLocal.IsEmpty() ) {
- wxString strKey = GetPath().Right(APPCONF_PATH_SEPARATOR);
+ if ( !m_keyLocal.HasSubkeys() ) {
+ wxString strKey = GetPath().Right(wxCONFIG_PATH_SEPARATOR);
SetPath(".."); // changes m_keyLocal
return m_keyLocal.DeleteKey(strKey);
}
bool wxRegConfig::DeleteAll()
{
- // first of all, prevent the creation of new registry entries
- Config::EnableAutosave(FALSE);
-
m_keyLocal.Close();
m_keyGlobal.Close();
projects / wxWidgets.git / blobdiff