diff --git a/samples/exec/exec.cpp b/samples/exec/exec.cpp index 06e51aa59d..8f39d8121e 100644 --- a/samples/exec/exec.cpp +++ b/samples/exec/exec.cpp @@ -94,8 +94,7 @@ public: void OnIdle(wxIdleEvent& event); // for MyPipedProcess - void OnProcessTerminated(MyPipedProcess *process) - { m_running.Remove(process); } + void OnProcessTerminated(MyPipedProcess *process); wxListBox *GetLogListBox() const { return m_lbox; } private: @@ -232,11 +231,6 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) wxApp::s_macAboutMenuItemId = Exec_About; #endif - // set the frame icon -#ifndef __WXGTK__ - SetIcon(wxICON(mondrian)); -#endif - // create a menu bar wxMenu *menuFile = new wxMenu(_T(""), wxMENU_TEAROFF); menuFile->Append(Exec_ClearLog, _T("&Clear log\tCtrl-C"), @@ -402,6 +396,8 @@ void MyFrame::OnExecWithRedirect(wxCommandEvent& WXUNUSED(event)) { m_lbox->Append(output[n]); } + + m_lbox->Append(_T("--- End of output ---")); } } else // async exec @@ -477,6 +473,11 @@ void MyFrame::OnIdle(wxIdleEvent& event) } } +void MyFrame::OnProcessTerminated(MyPipedProcess *process) +{ + m_running.Remove(process); +} + // ---------------------------------------------------------------------------- // MyProcess // ----------------------------------------------------------------------------