thread fixes (compiles, but doesn't work yet)

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

diff --git a/src/msw/regconf.cpp b/src/msw/regconf.cpp
index 5fec4bd4be88cf5bf84f92639be046f798e25e7e..99382c2ce2d9ea21a4d13b54729c6827cab97cad 100644 (file)
--- a/src/msw/regconf.cpp
+++ b/src/msw/regconf.cpp
@@ -24,9 +24,13 @@
   #include  <wx/string.h>
 #endif //WX_PRECOMP
 
+#include <wx/event.h>
 #include <wx/app.h>
 #include <wx/log.h>
 #include <wx/config.h>
+
+#ifndef __WIN16__
+
 #include <wx/msw/registry.h>
 #include <wx/msw/regconf.h>
 
@@ -444,7 +448,7 @@ bool wxRegConfig::DeleteEntry(const wxString& value, bool bGroupIfEmptyAlso)
     return FALSE;
 
   if ( !m_keyLocal.HasSubkeys() ) {
-    wxString strKey = GetPath().Right(wxCONFIG_PATH_SEPARATOR);
+    wxString strKey = GetPath().AfterLast(wxCONFIG_PATH_SEPARATOR);
     SetPath("..");  // changes m_keyLocal
     return m_keyLocal.DeleteKey(strKey);
   }
@@ -463,10 +467,18 @@ bool wxRegConfig::DeleteAll()
 {
   m_keyLocal.Close();
   m_keyGlobal.Close();
-
+#if 1
+  wxFAIL_MSG("wxRegConfig::DeleteAll will wipe out your entire registry, so please do not use until it's fixed!");
+  return FALSE;
+#else
   bool bOk = m_keyLocalRoot.DeleteSelf();
   if ( bOk )
     bOk = m_keyGlobalRoot.DeleteSelf();
 
   return bOk;
+#endif
 }
+
+#endif
+  // __WIN16__
+