Have support for both char* and wchar_t* in wxPGPropArg. Moved wxPGPropArgCls member...

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

diff --git a/samples/config/conftest.cpp b/samples/config/conftest.cpp
index 3a8f0ae114893e74fe68e7101e024a742195f1a0..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()
 {
+  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:
@@ -114,7 +117,7 @@ bool MyApp::OnInit()
 
   // create the main program window
   MyFrame *frame = new MyFrame;
-  frame->Show(TRUE);
+  frame->Show(true);
   SetTopWindow(frame);
 
   // use our config object...
@@ -126,7 +129,7 @@ bool MyApp::OnInit()
                  wxICON_INFORMATION | wxOK);
   }
 
-  return TRUE;
+  return true;
 }
 
 int MyApp::OnExit()
@@ -145,7 +148,7 @@ int MyApp::OnExit()
 
 // main frame ctor
 MyFrame::MyFrame()
-       : wxFrame((wxFrame *) NULL, -1, _T("wxConfig Demo"))
+       : wxFrame((wxFrame *) NULL, wxID_ANY, _T("wxConfig Demo"))
 {
   // menu
   wxMenu *file_menu = new wxMenu;
@@ -159,14 +162,16 @@ MyFrame::MyFrame()
   menu_bar->Append(file_menu, _T("&File"));
   SetMenuBar(menu_bar);
 
+#if wxUSE_STATUSBAR
   CreateStatusBar();
+#endif // wxUSE_STATUSBAR
 
   // child controls
   wxPanel *panel = new wxPanel(this);
-  (void)new wxStaticText(panel, -1, _T("These controls remember their values!"),
+  (void)new wxStaticText(panel, wxID_ANY, _T("These controls remember their values!"),
                          wxPoint(10, 10), wxSize(300, 20));
-  m_text = new wxTextCtrl(panel, -1, _T(""), wxPoint(10, 40), wxSize(300, 20));
-  m_check = new wxCheckBox(panel, -1, _T("show welcome message box at startup"),
+  m_text = new wxTextCtrl(panel, wxID_ANY, _T(""), wxPoint(10, 40), wxSize(300, 20));
+  m_check = new wxCheckBox(panel, wxID_ANY, _T("show welcome message box at startup"),
                            wxPoint(10, 70), wxSize(300, 20));
 
   // restore the control's values from the config
@@ -209,12 +214,12 @@ MyFrame::MyFrame()
 
 void MyFrame::OnQuit(wxCommandEvent&)
 {
-  Close(TRUE);
+  Close(true);
 }
 
 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);
 }