// ----------------------------------------------------------------------------
// 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/app.h>
+#include <wx/log.h>
#include <wx/config.h>
-#include <wx/regconf.h>
#include <wx/msw/registry.h>
+#include <wx/msw/regconf.h>
// ----------------------------------------------------------------------------
// constants
// ----------------------------------------------------------------------------
// ctor/dtor
// ----------------------------------------------------------------------------
+
+#if 0
wxRegConfig::wxRegConfig(const wxString& strRoot)
: m_keyLocalRoot(wxRegKey::HKCU, SOFTWARE_KEY + strRoot),
m_keyLocal(m_keyLocalRoot, ""),
// Create() will Open() if key already exists
m_keyLocalRoot.Create();
+ // as it's the same key, Open() shouldn't fail (i.e. no need for Create())
+ m_keyLocal.Open();
+
+ wxLogNull nolog;
+ m_keyGlobalRoot.Open();
+}
+#endif
+
+// TODO: vendor name is ignored, because we can't yet do the test for optional vendor
+// name in the constructor body. We need a wxRegKey::Set that takes the same
+// args as the constructor. Then we'll set m_keyLocalRoot etc. in the constructor body.
+
+wxRegConfig::wxRegConfig(const wxString& appName, const wxString& vendorName,
+ const wxString& strLocal, const wxString& strGlobal, long style)
+ : wxConfigBase(appName, vendorName, strLocal, strGlobal, style),
+
+ m_keyLocalRoot(wxRegKey::HKCU, SOFTWARE_KEY + appName),
+ m_keyLocal(m_keyLocalRoot, ""),
+ m_keyGlobalRoot(wxRegKey::HKLM, SOFTWARE_KEY + appName),
+ m_keyGlobal(m_keyGlobalRoot, "")
+{
+ // TODO: really, we should check and supply an app name if one isn't supplied.
+ // Unfortunately I don't know how to initialise the member wxRegKey
+ // variables from within the constructor body. -- JACS
+ // Vadim - we just need an implementation of wxRegKey::Set,
+ // and then we can uncomment this and remove the constructor lines above.
+/*
+ wxString strRoot(appName);
+ if (appName.IsEmpty() && wxTheApp)
+ {
+ strRoot = wxTheApp->GetAppName();
+ }
+ wxASSERT( !strRoot.IsEmpty() );
+
+ if (!vendorName.IsEmpty())
+ {
+ strRoot += "\\";
+ strRoot += vendorName;
+ }
+
+ m_keyLocalRoot.Set(wxRegKey::HKCU, SOFTWARE_KEY + strRoot),
+ m_keyLocal.Set(m_keyLocalRoot, ""),
+
+ m_keyGlobalRoot.Set(wxRegKey::HKLM, SOFTWARE_KEY + strRoot),
+ m_keyGlobal.Set(m_keyGlobalRoot, "")
+*/
+
+ // Create() will Open() if key already exists
+ m_keyLocalRoot.Create();
+
+ // as it's the same key, Open() shouldn't fail (i.e. no need for Create())
+ m_keyLocal.Open();
+
wxLogNull nolog;
m_keyGlobalRoot.Open();
+
}
wxRegConfig::~wxRegConfig()
// ----------------------------------------------------------------------------
void wxRegConfig::SetPath(const wxString& strPath)
{
- ArrayString aParts;
-
- if ( strPath.IsEmpty() )
- return;
+ wxArrayString aParts;
- if ( strPath[0] == APPCONF_PATH_SEPARATOR ) {
+ // because GetPath() returns "" when we're at root, we must understand
+ // empty string as "/"
+ if ( strPath.IsEmpty() || (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
wxString strRegPath;
m_strPath.Empty();
- for ( uint n = 0; n < aParts.Count(); n++ ) {
+ for ( size_t 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)
#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;
}
+size_t wxRegConfig::GetNumberOfEntries(bool bRecursive) const
+{
+ size_t 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;
+}
+
+size_t wxRegConfig::GetNumberOfGroups(bool bRecursive) const
+{
+ size_t 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
// ----------------------------------------------------------------------------
// reading/writing
// ----------------------------------------------------------------------------
-bool wxRegConfig::Read(wxString& str,
- const char *szKey,
- const char *szDefault) const
+bool wxRegConfig::Read(const wxString& key, wxString *pStr) const
+{
+ wxConfigPathChanger path(this, key);
+
+ bool bQueryGlobal = TRUE;
+
+ // 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(), *pStr) ) {
+ if ( m_keyLocal.HasValue(path.Name()) ) {
+ wxLogWarning("User value for immutable key '%s' ignored.",
+ path.Name().c_str());
+ }
+ *pStr = wxConfigBase::ExpandEnvVars(*pStr);
+ return TRUE;
+ }
+ else {
+ // don't waste time - it's not there anyhow
+ bQueryGlobal = FALSE;
+ }
+ }
+
+ // first try local key
+ if ( TryGetValue(m_keyLocal, path.Name(), *pStr) ||
+ (bQueryGlobal && TryGetValue(m_keyGlobal, path.Name(), *pStr)) ) {
+ // nothing to do
+
+ // TODO: do we return TRUE? Not in original implementation,
+ // but I don't see why not. -- JACS
+ *pStr = wxConfigBase::ExpandEnvVars(*pStr);
+ return TRUE;
+ }
+
+ return FALSE;
+}
+
+bool wxRegConfig::Read(const wxString& key, wxString *pStr,
+ const wxString& szDefault) const
{
- PathChanger path(this, szKey);
+ wxConfigPathChanger path(this, key);
bool bQueryGlobal = TRUE;
// 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.",
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)) ) {
+ *pStr = wxConfigBase::ExpandEnvVars(*pStr);
return TRUE;
}
+ else {
+ if ( IsRecordingDefaults() ) {
+ ((wxRegConfig*)this)->Write(key, szDefault);
+ }
+
+ // default value
+ *pStr = szDefault;
+ }
+
+ *pStr = wxConfigBase::ExpandEnvVars(*pStr);
- // default value
- str = szDefault;
return FALSE;
}
-bool wxRegConfig::Read(long &lValue, const char *szKey, long lDefault) const
+bool wxRegConfig::Read(const wxString& key, long *plResult) const
{
- PathChanger path(this, szKey);
+ wxConfigPathChanger path(this, key);
bool bQueryGlobal = TRUE;
// 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.",
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;
return FALSE;
}
-bool wxRegConfig::Write(const char *szKey, const char *szValue)
+bool wxRegConfig::Write(const wxString& key, const wxString& szValue)
{
- PathChanger path(this, szKey);
+ wxConfigPathChanger path(this, key);
if ( IsImmutable(path.Name()) ) {
wxLogError("Can't change immutable entry '%s'.", path.Name().c_str());
return m_keyLocal.SetValue(path.Name(), szValue);
}
-bool wxRegConfig::Write(const char *szKey, long lValue)
+bool wxRegConfig::Write(const wxString& key, long lValue)
{
- PathChanger path(this, szKey);
+ wxConfigPathChanger path(this, key);
if ( IsImmutable(path.Name()) ) {
wxLogError("Can't change immutable entry '%s'.", path.Name().c_str());
// ----------------------------------------------------------------------------
// deleting
// ----------------------------------------------------------------------------
-bool wxRegConfig::DeleteEntry(const char *szValue, bool bGroupIfEmptyAlso)
+bool wxRegConfig::DeleteEntry(const wxString& value, bool bGroupIfEmptyAlso)
{
- PathChanger path(this, szValue);
+ wxConfigPathChanger path(this, value);
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);
}
return TRUE;
}
-bool wxRegConfig::DeleteGroup(const char *szKey)
+bool wxRegConfig::DeleteGroup(const wxString& key)
{
- PathChanger path(this, szKey);
+ wxConfigPathChanger path(this, key);
return m_keyLocal.DeleteKey(path.Name());
}
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