moved Destroy() to the beginning

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

diff --git a/samples/config/conftest.cpp b/samples/config/conftest.cpp
index fe26c3b968a200a14721c7c9ec8538d4a393d9e1..0dbc6cd1488b48512268922cb93601bb626be2db 100644 (file)
--- a/samples/config/conftest.cpp
+++ b/samples/config/conftest.cpp
@@ -142,7 +142,7 @@ MyFrame::MyFrame()
        : wxFrame((wxFrame *) NULL, -1, "wxConfig Demo")
 {
   // submenu
-  wxMenu *sub_menu = new wxMenu( wxMENU_TEAROFF );
+  wxMenu *sub_menu = new wxMenu( wxEmptyString, wxMENU_TEAROFF );
   sub_menu->Append(Minimal_About, "&About", "About this sample");
   sub_menu->Append(Minimal_About, "&About", "About this sample");
   sub_menu->Append(Minimal_About, "&About", "About this sample");
@@ -208,21 +208,21 @@ void MyFrame::OnQuit(wxCommandEvent&)
 
 void MyFrame::OnAbout(wxCommandEvent&)
 {
-  wxMessageBox("wxConfig demo\n© Vadim Zeitlin 1998", "About",
+  wxMessageBox(_T("wxConfig demo\n© Vadim Zeitlin 1998"), _T("About"),
                wxICON_INFORMATION | wxOK);
 }
 
 void MyFrame::OnDelete(wxCommandEvent&)
 {
     if ( wxConfigBase::Get()->DeleteAll() ) {
-        wxLogMessage("Config file/registry key successfully deleted.");
+        wxLogMessage(_T("Config file/registry key successfully deleted."));
 
         delete wxConfigBase::Set((wxConfigBase *) NULL);
         wxConfigBase::DontCreateOnDemand();
     }
     else
     {
-        wxLogError("Deleting config file/registry key failed.");
+        wxLogError(_T("Deleting config file/registry key failed."));
     }
 }