don't generate an endless stream of asserts for the 0-sized images

[wxWidgets.git] / samples / config / conftest.cpp

diff --git a/samples/config/conftest.cpp b/samples/config/conftest.cpp
index 16ced7f3fe9791ad6f282b715434a31a6640b11b..a3aff05a03f0ae130514b13e17e62721fcb42849 100644 (file)
--- a/samples/config/conftest.cpp
+++ b/samples/config/conftest.cpp
@@ -100,6 +100,11 @@ bool MyApp::OnInit()
 
   wxConfigBase *pConfig = wxConfigBase::Get();
 
 
   wxConfigBase *pConfig = wxConfigBase::Get();
 

+  // uncomment this to force writing back of the defaults for all values
+  // if they're not present in the config - this can give the user an idea
+  // of all possible settings for this program
+  pConfig->SetRecordDefaults();
+

   // or you could also write something like this:
   //  wxFileConfig *pConfig = new wxFileConfig("conftest");
   //  wxConfigBase::Set(pConfig);
   // or you could also write something like this:
   //  wxFileConfig *pConfig = new wxFileConfig("conftest");
   //  wxConfigBase::Set(pConfig);


@@ -194,11 +199,11 @@ MyFrame::MyFrame()
   wxString s;
   if ( pConfig->Read("TestValue", &s) )
   {
   wxString s;
   if ( pConfig->Read("TestValue", &s) )
   {

-      wxLogStatus(this, "TestValue from config is '%s'", s.c_str());
+      wxLogStatus(this, wxT("TestValue from config is '%s'"), s.c_str());

   }
   else
   {
   }
   else
   {

-      wxLogStatus(this, "TestValue not found in the config");
+      wxLogStatus(this, wxT("TestValue not found in the config"));

   }
 }
 
   }
 }
 


@@ -209,7 +214,7 @@ void MyFrame::OnQuit(wxCommandEvent&)
 
 void MyFrame::OnAbout(wxCommandEvent&)
 {
 
 void MyFrame::OnAbout(wxCommandEvent&)
 {

-  wxMessageBox(_T("wxConfig demo\n© Vadim Zeitlin 1998"), _T("About"),
+  wxMessageBox(_T("wxConfig demo\n© 1998-2001 Vadim Zeitlin"), _T("About"),

                wxICON_INFORMATION | wxOK);
 }
 
                wxICON_INFORMATION | wxOK);
 }