disabled DeleteAll()

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

diff --git a/samples/config/conftest.cpp b/samples/config/conftest.cpp
index 3d0b4b5217b26ce6704157fceffa7506ab849a2f..4626dd0122c8f607c78409a836d73a5a4bc5d9f3 100644 (file)
--- a/samples/config/conftest.cpp
+++ b/samples/config/conftest.cpp
@@ -2,7 +2,7 @@
 // Name:        conftest.cpp
 // Purpose:     demo of wxConfig and related classes
 // Author:      Vadim Zeitlin
 // Name:        conftest.cpp
 // Purpose:     demo of wxConfig and related classes
 // Author:      Vadim Zeitlin

-// Modified by: 
+// Modified by:

 // Created:     03.08.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Created:     03.08.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>


@@ -41,7 +41,7 @@ class MyFrame: public wxFrame
 public:
   MyFrame();
   virtual ~MyFrame();
 public:
   MyFrame();
   virtual ~MyFrame();

-    
+

   // callbacks
   void OnQuit(wxCommandEvent& event);
   void OnAbout(wxCommandEvent& event);
   // callbacks
   void OnQuit(wxCommandEvent& event);
   void OnAbout(wxCommandEvent& event);


@@ -202,6 +202,9 @@ void MyFrame::OnAbout(wxCommandEvent&)
 
 void MyFrame::OnDelete(wxCommandEvent&)
 {
 
 void MyFrame::OnDelete(wxCommandEvent&)
 {

+  // VZ: it seems that DeleteAll() wreaks havoc on NT. Disabled until I
+  // investigate it further, do _not_ compile this code in meanwhile!
+#if 0

   if ( wxConfigBase::Get()->DeleteAll() ) {
     wxLogMessage("Config file/registry key successfully deleted.");
 
   if ( wxConfigBase::Get()->DeleteAll() ) {
     wxLogMessage("Config file/registry key successfully deleted.");
 


@@ -209,6 +212,7 @@ void MyFrame::OnDelete(wxCommandEvent&)
     wxConfigBase::DontCreateOnDemand();
   }
   else
     wxConfigBase::DontCreateOnDemand();
   }
   else

+#endif // 0

     wxLogError("Deleting config file/registry key failed.");
 }
 
     wxLogError("Deleting config file/registry key failed.");
 }