some little doc tweaks

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

diff --git a/samples/config/conftest.cpp b/samples/config/conftest.cpp
index 6c47dc4bd61c551abe6ec20c01451ba31ff3ab66..0dbc6cd1488b48512268922cb93601bb626be2db 100644 (file)
--- a/samples/config/conftest.cpp
+++ b/samples/config/conftest.cpp
@@ -46,7 +46,7 @@ public:
   void OnQuit(wxCommandEvent& event);
   void OnAbout(wxCommandEvent& event);
   void OnDelete(wxCommandEvent& event);
   void OnQuit(wxCommandEvent& event);
   void OnAbout(wxCommandEvent& event);
   void OnDelete(wxCommandEvent& event);

-  bool OnClose() { return TRUE; }
+  void OnCloseWindow(wxCloseEvent& event);

 
 private:
   wxTextCtrl *m_text;
 
 private:
   wxTextCtrl *m_text;


@@ -69,6 +69,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
   EVT_MENU(Minimal_Quit, MyFrame::OnQuit)
   EVT_MENU(Minimal_About, MyFrame::OnAbout)
   EVT_MENU(Minimal_Delete, MyFrame::OnDelete)
   EVT_MENU(Minimal_Quit, MyFrame::OnQuit)
   EVT_MENU(Minimal_About, MyFrame::OnAbout)
   EVT_MENU(Minimal_Delete, MyFrame::OnDelete)

+  EVT_CLOSE(MyFrame::OnCloseWindow)

 END_EVENT_TABLE()
 
 // ============================================================================
 END_EVENT_TABLE()
 
 // ============================================================================


@@ -140,6 +141,12 @@ int MyApp::OnExit()
 MyFrame::MyFrame()
        : wxFrame((wxFrame *) NULL, -1, "wxConfig Demo")
 {
 MyFrame::MyFrame()
        : wxFrame((wxFrame *) NULL, -1, "wxConfig Demo")
 {

+  // submenu
+  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");
+

   // menu
   wxMenu *file_menu = new wxMenu;
 
   // menu
   wxMenu *file_menu = new wxMenu;
 


@@ -189,6 +196,11 @@ MyFrame::MyFrame()
   SetClientSize(w, h);
 }
 
   SetClientSize(w, h);
 }
 

+void MyFrame::OnCloseWindow(wxCloseEvent& event)
+{
+    this->Destroy();
+}
+

 void MyFrame::OnQuit(wxCommandEvent&)
 {
   Close(TRUE);
 void MyFrame::OnQuit(wxCommandEvent&)
 {
   Close(TRUE);


@@ -196,21 +208,21 @@ void MyFrame::OnQuit(wxCommandEvent&)
 
 void MyFrame::OnAbout(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() ) {
                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
     {
 
         delete wxConfigBase::Set((wxConfigBase *) NULL);
         wxConfigBase::DontCreateOnDemand();
     }
     else
     {

-        wxLogError("Deleting config file/registry key failed.");
+        wxLogError(_T("Deleting config file/registry key failed."));

     }
 }
 
     }
 }