X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1144d24d25ebf729407db27594dd51778f77cec4..f3033278722328d37b98406b45060a2a3b8b1877:/samples/toolbar/test.cpp diff --git a/samples/toolbar/test.cpp b/samples/toolbar/test.cpp index 2403237fc0..9d6232483a 100644 --- a/samples/toolbar/test.cpp +++ b/samples/toolbar/test.cpp @@ -56,10 +56,10 @@ bool MyApp::OnInit(void) // Make a menubar wxMenu *fileMenu = new wxMenu; - fileMenu->Append(wxID_EXIT, "E&xit"); + fileMenu->Append(wxID_EXIT, "E&xit", "Quit toolbar sample" ); wxMenu *helpMenu = new wxMenu; - helpMenu->Append(wxID_HELP, "&About"); + helpMenu->Append(wxID_HELP, "&About", "About toolbar sample"); wxMenuBar* menuBar = new wxMenuBar; @@ -164,7 +164,7 @@ END_EVENT_TABLE() // Define my frame constructor MyFrame::MyFrame(wxFrame* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style): - wxFrame(parent, id, title, pos, size, style), m_timer(this) + wxFrame(parent, id, title, pos, size, style) { m_textWindow = new wxTextCtrl(this, -1, "", wxPoint(0, 0), wxSize(-1, -1), wxTE_MULTILINE); } @@ -176,10 +176,7 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event)) { -// (void)wxMessageBox("wxWindows wxToolBar demo\n", "About wxToolBar"); - wxLogStatus("Started timer."); - - m_timer.Start(500, TRUE); + (void)wxMessageBox("wxWindows toolbar sample", "About wxToolBar"); } // Define the behaviour for the frame closing