remove EVT_STC_POSCHANGED as it's been deprecated in Scintilla for

[wxWidgets.git] / src / msw / regconf.cpp

diff --git a/src/msw/regconf.cpp b/src/msw/regconf.cpp
index c7b7a470e60c3648793b5cf8c65d2f16114c0591..cb302531f976372622a38891e33c5b631be3d806 100644 (file)
--- a/src/msw/regconf.cpp
+++ b/src/msw/regconf.cpp
@@ -33,8 +33,6 @@
 
 #include "wx/config.h"
 
 
 #include "wx/config.h"
 

-#ifndef __WIN16__
-

 #include "wx/msw/registry.h"
 #include "wx/msw/regconf.h"
 
 #include "wx/msw/registry.h"
 #include "wx/msw/regconf.h"
 


@@ -148,8 +146,8 @@ wxRegConfig::wxRegConfig(const wxString& appName, const wxString& vendorName,
   if ( bDoUseGlobal )
   {
     wxLogNull nolog;
   if ( bDoUseGlobal )
   {
     wxLogNull nolog;

-    m_keyGlobalRoot.Open();
-    m_keyGlobal.Open();
+    m_keyGlobalRoot.Open(wxRegKey::Read);
+    m_keyGlobal.Open(wxRegKey::Read);

   }
 }
 
   }
 }
 


@@ -386,13 +384,14 @@ void wxRegConfig::SetPath(const wxString& strPath)
 
     // change current key(s)
     m_keyLocal.SetName(m_keyLocalRoot, strRegPath);
 
     // 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(wxRegKey::Read);
+    }

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -687,7 +686,8 @@ bool wxRegConfig::RenameGroup(const wxString& oldName, const wxString& newName)
 // ----------------------------------------------------------------------------
 // deleting
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // deleting
 // ----------------------------------------------------------------------------

-bool wxRegConfig::DeleteEntry(const wxString& value, bool WXUNUSED(bGroupIfEmptyAlso))
+
+bool wxRegConfig::DeleteEntry(const wxString& value, bool bGroupIfEmptyAlso)

 {
   wxConfigPathChanger path(this, value);
 
 {
   wxConfigPathChanger path(this, value);
 


@@ -695,7 +695,7 @@ bool wxRegConfig::DeleteEntry(const wxString& value, bool WXUNUSED(bGroupIfEmpty
     if ( !m_keyLocal.DeleteValue(path.Name()) )
       return FALSE;
 
     if ( !m_keyLocal.DeleteValue(path.Name()) )
       return FALSE;
 

-    if ( m_keyLocal.IsEmpty() ) {
+    if ( bGroupIfEmptyAlso && m_keyLocal.IsEmpty() ) {

       wxString strKey = GetPath().AfterLast(wxCONFIG_PATH_SEPARATOR);
       SetPath(_T(".."));  // changes m_keyLocal
       return LocalKey().DeleteKey(strKey);
       wxString strKey = GetPath().AfterLast(wxCONFIG_PATH_SEPARATOR);
       SetPath(_T(".."));  // changes m_keyLocal
       return LocalKey().DeleteKey(strKey);


@@ -727,8 +727,5 @@ bool wxRegConfig::DeleteAll()
   return bOk;
 }
 
   return bOk;
 }
 

-#endif
-  // __WIN16__
-

 #endif
   // wxUSE_CONFIG
 #endif
   // wxUSE_CONFIG