remove MSVC solution files from svn

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

diff --git a/samples/config/conftest.cpp b/samples/config/conftest.cpp
index 40fd36a672c61f890f2fd651fc3d4d784aca25f1..aea01ea493ee927efdeb41e2b7ddd1fe1309d5c3 100644 (file)
--- a/samples/config/conftest.cpp
+++ b/samples/config/conftest.cpp
@@ -85,6 +85,9 @@ IMPLEMENT_APP(MyApp)
 // `Main program' equivalent, creating windows and returning main app frame
 bool MyApp::OnInit()
 {
 // `Main program' equivalent, creating windows and returning main app frame
 bool MyApp::OnInit()
 {

+  if ( !wxApp::OnInit() )
+      return false;
+

   // we're using wxConfig's "create-on-demand" feature: it will create the
   // config object when it's used for the first time. It has a number of
   // advantages compared with explicitly creating our wxConfig:
   // we're using wxConfig's "create-on-demand" feature: it will create the
   // config object when it's used for the first time. It has a number of
   // advantages compared with explicitly creating our wxConfig:


@@ -159,7 +162,9 @@ MyFrame::MyFrame()
   menu_bar->Append(file_menu, _T("&File"));
   SetMenuBar(menu_bar);
 
   menu_bar->Append(file_menu, _T("&File"));
   SetMenuBar(menu_bar);
 

+#if wxUSE_STATUSBAR

   CreateStatusBar();
   CreateStatusBar();

+#endif // wxUSE_STATUSBAR

 
   // child controls
   wxPanel *panel = new wxPanel(this);
 
   // child controls
   wxPanel *panel = new wxPanel(this);


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

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

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