fixed enumerating of entries/groups under '/' in wxRegConfig

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24130 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/changes.txt b/docs/changes.txt
index aa59ed5a0942ea8bbe6518350f1c5ba73d8623ca..35ded0dfc05c4e92a08452f7913a19ddacfa1534 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -94,6 +94,7 @@ wxMSW:
 - wxGauge now supports full 32 bit range (Miroslav Rajcic)
 - make it possible to give focus to the notebook tabs (Hajo Kirchhoff)
 - MDI child frames are not always resizeable any more (Andrei Fortuna)
+- fixed enumerating of entries/groups under '/' in wxRegConfig
 
 wxGTK:
 

diff --git a/src/msw/regconf.cpp b/src/msw/regconf.cpp
index c7b7a470e60c3648793b5cf8c65d2f16114c0591..af4dc5ab68f01c6e29702dd0144ce4f483dfeefa 100644 (file)
--- a/src/msw/regconf.cpp
+++ b/src/msw/regconf.cpp
@@ -386,13 +386,14 @@ void wxRegConfig::SetPath(const wxString& strPath)
 
     // change current key(s)
     m_keyLocal.SetName(m_keyLocalRoot, strRegPath);
-    m_keyGlobal.SetName(m_keyGlobalRoot, strRegPath);
 
-    // don't create it right now, wait until it is accessed
-    //m_keyLocal.Create();
+    if ( GetStyle() & wxCONFIG_USE_GLOBAL_FILE )
+    {
+      m_keyGlobal.SetName(m_keyGlobalRoot, strRegPath);
 
-    wxLogNull nolog;
-    m_keyGlobal.Open();
+      wxLogNull nolog;
+      m_keyGlobal.Open();
+    }
 }
 
 // ----------------------------------------------------------------------------