fix sizing of extra control

[wxWidgets.git] / samples / exec / exec.cpp

diff --git a/samples/exec/exec.cpp b/samples/exec/exec.cpp
index 30bed13776ad02a6eb1fd10764717740e5ca726c..ee51fbdf7430b5f3ff86e6f3d8ad96663464a7f7 100644 (file)
--- a/samples/exec/exec.cpp
+++ b/samples/exec/exec.cpp
@@ -17,11 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(__APPLE__)
-    #pragma implementation "exec.cpp"
-    #pragma interface "exec.cpp"
-#endif
-

 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 


@@ -30,7 +25,7 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
 #endif
 
 // for all others, include the necessary headers (this file is usually all you

-// need because it includes almost all "standard" wxWindows headers
+// need because it includes almost all "standard" wxWidgets headers

 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/log.h"
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/log.h"


@@ -55,6 +50,10 @@
 #endif
 
 #include "wx/txtstrm.h"
 #endif
 
 #include "wx/txtstrm.h"

+#include "wx/numdlg.h"
+#include "wx/textdlg.h"
+#include "wx/ffile.h"
+#include "wx/stopwatch.h"

 
 #include "wx/process.h"
 
 
 #include "wx/process.h"
 


@@ -83,14 +82,18 @@ public:
 
 // Define an array of process pointers used by MyFrame
 class MyPipedProcess;
 
 // Define an array of process pointers used by MyFrame
 class MyPipedProcess;

-WX_DEFINE_ARRAY(MyPipedProcess *, MyProcessesArray);
+WX_DEFINE_ARRAY_PTR(MyPipedProcess *, MyPipedProcessesArray);
+
+class MyProcess;
+WX_DEFINE_ARRAY_PTR(MyProcess *, MyProcessesArray);

 
 // Define a new frame type: this is going to be our main frame
 class MyFrame : public wxFrame
 {
 public:
 
 // Define a new frame type: this is going to be our main frame
 class MyFrame : public wxFrame
 {
 public:

-    // ctor(s)
+    // ctor and dtor

     MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size);
     MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size);

+    virtual ~MyFrame();

 
     // event handlers (these functions should _not_ be virtual)
     void OnQuit(wxCommandEvent& event);
 
     // event handlers (these functions should _not_ be virtual)
     void OnQuit(wxCommandEvent& event);


@@ -99,7 +102,11 @@ public:
 
     void OnClear(wxCommandEvent& event);
 
 
     void OnClear(wxCommandEvent& event);
 

+    void OnBeginBusyCursor(wxCommandEvent& event);
+    void OnEndBusyCursor(wxCommandEvent& event);
+

     void OnSyncExec(wxCommandEvent& event);
     void OnSyncExec(wxCommandEvent& event);

+    void OnSyncNoEventsExec(wxCommandEvent& event);

     void OnAsyncExec(wxCommandEvent& event);
     void OnShell(wxCommandEvent& event);
     void OnExecWithRedirect(wxCommandEvent& event);
     void OnAsyncExec(wxCommandEvent& event);
     void OnShell(wxCommandEvent& event);
     void OnExecWithRedirect(wxCommandEvent& event);


@@ -108,6 +115,8 @@ public:
     void OnPOpen(wxCommandEvent& event);
 
     void OnFileExec(wxCommandEvent& event);
     void OnPOpen(wxCommandEvent& event);
 
     void OnFileExec(wxCommandEvent& event);

+    void OnFileLaunch(wxCommandEvent& event);
+    void OnOpenURL(wxCommandEvent& event);

 
     void OnAbout(wxCommandEvent& event);
 
 
     void OnAbout(wxCommandEvent& event);
 


@@ -119,6 +128,9 @@ public:
     void OnProcessTerminated(MyPipedProcess *process);
     wxListBox *GetLogListBox() const { return m_lbox; }
 
     void OnProcessTerminated(MyPipedProcess *process);
     wxListBox *GetLogListBox() const { return m_lbox; }
 

+    // for MyProcess
+    void OnAsyncTermination(MyProcess *process);
+

 private:
     void ShowOutput(const wxString& cmd,
                     const wxArrayString& output,
 private:
     void ShowOutput(const wxString& cmd,
                     const wxArrayString& output,


@@ -126,30 +138,11 @@ private:
 
     void DoAsyncExec(const wxString& cmd);
 
 
     void DoAsyncExec(const wxString& cmd);
 

-    void AddAsyncProcess(MyPipedProcess *process)
-    {
-        if ( m_running.IsEmpty() )
-        {
-            // we want to start getting the timer events to ensure that a
-            // steady stream of idle events comes in -- otherwise we
-            // wouldn't be able to poll the child process input
-            m_timerIdleWakeUp.Start(100);
-        }
-        //else: the timer is already running
+    void AddAsyncProcess(MyProcess *process) { m_allAsync.push_back(process); }

 
 

-        m_running.Add(process);
-    }
+    void AddPipedProcess(MyPipedProcess *process);
+    void RemovePipedProcess(MyPipedProcess *process);

 
 

-    void RemoveAsyncProcess(MyPipedProcess *process)
-    {
-        m_running.Remove(process);
-
-        if ( m_running.IsEmpty() )
-        {
-            // we don't need to get idle events all the time any more
-            m_timerIdleWakeUp.Stop();
-        }
-    }

 
     // the PID of the last process we launched asynchronously
     long m_pidLast;
 
     // the PID of the last process we launched asynchronously
     long m_pidLast;


@@ -171,12 +164,16 @@ private:
 
     wxListBox *m_lbox;
 
 
     wxListBox *m_lbox;
 

-    MyProcessesArray m_running;
+    // array of running processes with redirected IO
+    MyPipedProcessesArray m_running;
+
+    // array of all asynchrously running processes
+    MyProcessesArray m_allAsync;

 
     // the idle event wake up timer
     wxTimer m_timerIdleWakeUp;
 
 
     // the idle event wake up timer
     wxTimer m_timerIdleWakeUp;
 

-    // any class wishing to process wxWindows events must use this macro
+    // any class wishing to process wxWidgets events must use this macro

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 


@@ -192,9 +189,11 @@ public:
                 wxProcess *process);
 
 protected:
                 wxProcess *process);
 
 protected:

-    void OnTextEnter(wxCommandEvent& event) { DoSend(); }
-    void OnBtnSend(wxCommandEvent& event) { DoSend(); }
-    void OnBtnGet(wxCommandEvent& event) { DoGet(); }
+    void OnTextEnter(wxCommandEvent& WXUNUSED(event)) { DoSend(); }
+    void OnBtnSend(wxCommandEvent& WXUNUSED(event)) { DoSend(); }
+    void OnBtnSendFile(wxCommandEvent& WXUNUSED(event));
+    void OnBtnGet(wxCommandEvent& WXUNUSED(event)) { DoGet(); }
+    void OnBtnClose(wxCommandEvent& WXUNUSED(event)) { DoClose(); }

 
     void OnClose(wxCloseEvent& event);
 
 
     void OnClose(wxCloseEvent& event);
 


@@ -202,22 +201,32 @@ protected:
 
     void DoSend()
     {
 
     void DoSend()
     {

-        m_out.WriteString(m_textIn->GetValue() + '\n');
-        m_textIn->Clear();
+        wxString s(m_textOut->GetValue());
+        s += _T('\n');
+        m_out.Write(s.c_str(), s.length());
+        m_textOut->Clear();

 
         DoGet();
     }
 
     void DoGet();
 
         DoGet();
     }
 
     void DoGet();

+    void DoClose();

 
 private:
 
 private:

+    void DoGetFromStream(wxTextCtrl *text, wxInputStream& in);
+    void DisableInput();
+    void DisableOutput();
+
+

     wxProcess *m_process;
 
     wxProcess *m_process;
 

-    wxTextInputStream m_in;
-    wxTextOutputStream m_out;
+    wxOutputStream &m_out;
+    wxInputStream &m_in,
+                  &m_err;

 
 

-    wxTextCtrl *m_textIn,
-               *m_textOut;
+    wxTextCtrl *m_textOut,
+               *m_textIn,
+               *m_textErr;

 
     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };


@@ -288,11 +297,16 @@ enum
     Exec_Quit = 100,
     Exec_Kill,
     Exec_ClearLog,
     Exec_Quit = 100,
     Exec_Kill,
     Exec_ClearLog,

+    Exec_BeginBusyCursor,
+    Exec_EndBusyCursor,

     Exec_SyncExec = 200,
     Exec_SyncExec = 200,

+    Exec_SyncNoEventsExec,

     Exec_AsyncExec,
     Exec_Shell,
     Exec_POpen,
     Exec_OpenFile,
     Exec_AsyncExec,
     Exec_Shell,
     Exec_POpen,
     Exec_OpenFile,

+    Exec_LaunchFile,
+    Exec_OpenURL,

     Exec_DDEExec,
     Exec_DDERequest,
     Exec_Redirect,
     Exec_DDEExec,
     Exec_DDERequest,
     Exec_Redirect,


@@ -301,24 +315,29 @@ enum
 
     // control ids
     Exec_Btn_Send = 1000,
 
     // control ids
     Exec_Btn_Send = 1000,

-    Exec_Btn_Get
+    Exec_Btn_SendFile,
+    Exec_Btn_Get,
+    Exec_Btn_Close

 };
 
 static const wxChar *DIALOG_TITLE = _T("Exec sample");
 
 // ----------------------------------------------------------------------------
 };
 
 static const wxChar *DIALOG_TITLE = _T("Exec sample");
 
 // ----------------------------------------------------------------------------

-// event tables and other macros for wxWindows
+// event tables and other macros for wxWidgets

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-// the event tables connect the wxWindows events with the functions (event
+// the event tables connect the wxWidgets events with the functions (event

 // handlers) which process them. It can be also done at run-time, but for the
 // simple menu events like this the static method is much simpler.
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(Exec_Quit,  MyFrame::OnQuit)
     EVT_MENU(Exec_Kill,  MyFrame::OnKill)
     EVT_MENU(Exec_ClearLog,  MyFrame::OnClear)
 // handlers) which process them. It can be also done at run-time, but for the
 // simple menu events like this the static method is much simpler.
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(Exec_Quit,  MyFrame::OnQuit)
     EVT_MENU(Exec_Kill,  MyFrame::OnKill)
     EVT_MENU(Exec_ClearLog,  MyFrame::OnClear)

+    EVT_MENU(Exec_BeginBusyCursor,  MyFrame::OnBeginBusyCursor)
+    EVT_MENU(Exec_EndBusyCursor,  MyFrame::OnEndBusyCursor)

 
     EVT_MENU(Exec_SyncExec, MyFrame::OnSyncExec)
 
     EVT_MENU(Exec_SyncExec, MyFrame::OnSyncExec)

+    EVT_MENU(Exec_SyncNoEventsExec, MyFrame::OnSyncNoEventsExec)

     EVT_MENU(Exec_AsyncExec, MyFrame::OnAsyncExec)
     EVT_MENU(Exec_Shell, MyFrame::OnShell)
     EVT_MENU(Exec_Redirect, MyFrame::OnExecWithRedirect)
     EVT_MENU(Exec_AsyncExec, MyFrame::OnAsyncExec)
     EVT_MENU(Exec_Shell, MyFrame::OnShell)
     EVT_MENU(Exec_Redirect, MyFrame::OnExecWithRedirect)


@@ -327,6 +346,8 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(Exec_POpen, MyFrame::OnPOpen)
 
     EVT_MENU(Exec_OpenFile, MyFrame::OnFileExec)
     EVT_MENU(Exec_POpen, MyFrame::OnPOpen)
 
     EVT_MENU(Exec_OpenFile, MyFrame::OnFileExec)

+    EVT_MENU(Exec_LaunchFile, MyFrame::OnFileLaunch)
+    EVT_MENU(Exec_OpenURL, MyFrame::OnOpenURL)

 
 #ifdef __WINDOWS__
     EVT_MENU(Exec_DDEExec, MyFrame::OnDDEExec)
 
 #ifdef __WINDOWS__
     EVT_MENU(Exec_DDEExec, MyFrame::OnDDEExec)


@@ -337,21 +358,23 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 
     EVT_IDLE(MyFrame::OnIdle)
 
 
     EVT_IDLE(MyFrame::OnIdle)
 

-    EVT_TIMER(-1, MyFrame::OnTimer)
+    EVT_TIMER(wxID_ANY, MyFrame::OnTimer)

 END_EVENT_TABLE()
 
 BEGIN_EVENT_TABLE(MyPipeFrame, wxFrame)
     EVT_BUTTON(Exec_Btn_Send, MyPipeFrame::OnBtnSend)
 END_EVENT_TABLE()
 
 BEGIN_EVENT_TABLE(MyPipeFrame, wxFrame)
     EVT_BUTTON(Exec_Btn_Send, MyPipeFrame::OnBtnSend)

+    EVT_BUTTON(Exec_Btn_SendFile, MyPipeFrame::OnBtnSendFile)

     EVT_BUTTON(Exec_Btn_Get, MyPipeFrame::OnBtnGet)
     EVT_BUTTON(Exec_Btn_Get, MyPipeFrame::OnBtnGet)

+    EVT_BUTTON(Exec_Btn_Close, MyPipeFrame::OnBtnClose)

 
 

-    EVT_TEXT_ENTER(-1, MyPipeFrame::OnTextEnter)
+    EVT_TEXT_ENTER(wxID_ANY, MyPipeFrame::OnTextEnter)

 
     EVT_CLOSE(MyPipeFrame::OnClose)
 
 
     EVT_CLOSE(MyPipeFrame::OnClose)
 

-    EVT_END_PROCESS(-1, MyPipeFrame::OnProcessTerm)
+    EVT_END_PROCESS(wxID_ANY, MyPipeFrame::OnProcessTerm)

 END_EVENT_TABLE()
 
 END_EVENT_TABLE()
 

-// Create a new application object: this macro will allow wxWindows to create
+// Create a new application object: this macro will allow wxWidgets to create

 // the application object during program execution (it's better than using a
 // static object for many reasons) and also declares the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. MyApp and
 // the application object during program execution (it's better than using a
 // static object for many reasons) and also declares the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. MyApp and


@@ -369,27 +392,34 @@ IMPLEMENT_APP(MyApp)
 // `Main program' equivalent: the program execution "starts" here
 bool MyApp::OnInit()
 {
 // `Main program' equivalent: the program execution "starts" here
 bool MyApp::OnInit()
 {

+    if ( !wxApp::OnInit() )
+        return false;
+

     // Create the main application window
     // Create the main application window

-    MyFrame *frame = new MyFrame(_T("Exec wxWindows sample"),
+    MyFrame *frame = new MyFrame(_T("Exec wxWidgets sample"),

                                  wxDefaultPosition, wxSize(500, 140));
 
     // Show it and tell the application that it's our main window
                                  wxDefaultPosition, wxSize(500, 140));
 
     // Show it and tell the application that it's our main window

-    frame->Show(TRUE);
+    frame->Show(true);

     SetTopWindow(frame);
 
     // success: wxApp::OnRun() will be called which will enter the main message
     SetTopWindow(frame);
 
     // success: wxApp::OnRun() will be called which will enter the main message

-    // loop and the application will run. If we returned FALSE here, the
+    // loop and the application will run. If we returned false here, the

     // application would exit immediately.
     // application would exit immediately.

-    return TRUE;
+    return true;

 }
 
 // ----------------------------------------------------------------------------
 // main frame
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // main frame
 // ----------------------------------------------------------------------------
 

+#ifdef __VISUALC__
+#pragma warning(disable: 4355) // this used in base member initializer list
+#endif
+

 // frame constructor
 MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
 // frame constructor
 MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)

-       : wxFrame((wxFrame *)NULL, -1, title, pos, size),
+       : wxFrame((wxFrame *)NULL, wxID_ANY, title, pos, size),

          m_timerIdleWakeUp(this)
 {
     m_pidLast = 0;
          m_timerIdleWakeUp(this)
 {
     m_pidLast = 0;


@@ -401,18 +431,23 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
 #endif
 
     // create a menu bar
 #endif
 
     // create a menu bar

-    wxMenu *menuFile = new wxMenu(_T(""), wxMENU_TEAROFF);
+    wxMenu *menuFile = new wxMenu(wxEmptyString, wxMENU_TEAROFF);

     menuFile->Append(Exec_Kill, _T("&Kill process...\tCtrl-K"),
                      _T("Kill a process by PID"));
     menuFile->AppendSeparator();
     menuFile->Append(Exec_Kill, _T("&Kill process...\tCtrl-K"),
                      _T("Kill a process by PID"));
     menuFile->AppendSeparator();

-    menuFile->Append(Exec_ClearLog, _T("&Clear log\tCtrl-C"),
+    menuFile->Append(Exec_ClearLog, _T("&Clear log\tCtrl-L"),

                      _T("Clear the log window"));
     menuFile->AppendSeparator();
                      _T("Clear the log window"));
     menuFile->AppendSeparator();

+    menuFile->Append(Exec_BeginBusyCursor, _T("Show &busy cursor\tCtrl-C"));
+    menuFile->Append(Exec_EndBusyCursor, _T("Show &normal cursor\tShift-Ctrl-C"));
+    menuFile->AppendSeparator();

     menuFile->Append(Exec_Quit, _T("E&xit\tAlt-X"), _T("Quit this program"));
 
     wxMenu *execMenu = new wxMenu;
     execMenu->Append(Exec_SyncExec, _T("Sync &execution...\tCtrl-E"),
                      _T("Launch a program and return when it terminates"));
     menuFile->Append(Exec_Quit, _T("E&xit\tAlt-X"), _T("Quit this program"));
 
     wxMenu *execMenu = new wxMenu;
     execMenu->Append(Exec_SyncExec, _T("Sync &execution...\tCtrl-E"),
                      _T("Launch a program and return when it terminates"));

+    execMenu->Append(Exec_SyncNoEventsExec, _T("Sync execution and &block...\tCtrl-B"),
+                     _T("Launch a program and block until it terminates"));

     execMenu->Append(Exec_AsyncExec, _T("&Async execution...\tCtrl-A"),
                      _T("Launch a program and return immediately"));
     execMenu->Append(Exec_Shell, _T("Execute &shell command...\tCtrl-S"),
     execMenu->Append(Exec_AsyncExec, _T("&Async execution...\tCtrl-A"),
                      _T("Launch a program and return immediately"));
     execMenu->Append(Exec_Shell, _T("Execute &shell command...\tCtrl-S"),


@@ -428,13 +463,17 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     execMenu->AppendSeparator();
     execMenu->Append(Exec_OpenFile, _T("Open &file...\tCtrl-F"),
                      _T("Launch the command to open this kind of files"));
     execMenu->AppendSeparator();
     execMenu->Append(Exec_OpenFile, _T("Open &file...\tCtrl-F"),
                      _T("Launch the command to open this kind of files"));

+    execMenu->Append(Exec_LaunchFile, _T("La&unch file...\tShift-Ctrl-F"),
+                     _T("Launch the default application associated with the file"));
+    execMenu->Append(Exec_OpenURL, _T("Open &URL...\tCtrl-U"),
+                     _T("Launch the default browser with the given URL"));

 #ifdef __WINDOWS__
     execMenu->AppendSeparator();
     execMenu->Append(Exec_DDEExec, _T("Execute command via &DDE...\tCtrl-D"));
     execMenu->Append(Exec_DDERequest, _T("Send DDE &request...\tCtrl-R"));
 #endif
 
 #ifdef __WINDOWS__
     execMenu->AppendSeparator();
     execMenu->Append(Exec_DDEExec, _T("Execute command via &DDE...\tCtrl-D"));
     execMenu->Append(Exec_DDERequest, _T("Send DDE &request...\tCtrl-R"));
 #endif
 

-    wxMenu *helpMenu = new wxMenu(_T(""), wxMENU_TEAROFF);
+    wxMenu *helpMenu = new wxMenu(wxEmptyString, wxMENU_TEAROFF);

     helpMenu->Append(Exec_About, _T("&About...\tF1"), _T("Show about dialog"));
 
     // now append the freshly created menu to the menu bar...
     helpMenu->Append(Exec_About, _T("&About...\tF1"), _T("Show about dialog"));
 
     // now append the freshly created menu to the menu bar...


@@ -447,7 +486,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     SetMenuBar(menuBar);
 
     // create the listbox in which we will show misc messages as they come
     SetMenuBar(menuBar);
 
     // create the listbox in which we will show misc messages as they come

-    m_lbox = new wxListBox(this, -1);
+    m_lbox = new wxListBox(this, wxID_ANY);

     wxFont font(12, wxFONTFAMILY_TELETYPE, wxFONTSTYLE_NORMAL,
                 wxFONTWEIGHT_NORMAL);
     if ( font.Ok() )
     wxFont font(12, wxFONTFAMILY_TELETYPE, wxFONTSTYLE_NORMAL,
                 wxFONTWEIGHT_NORMAL);
     if ( font.Ok() )


@@ -456,18 +495,29 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
 #if wxUSE_STATUSBAR
     // create a status bar just for fun (by default with 1 pane only)
     CreateStatusBar();
 #if wxUSE_STATUSBAR
     // create a status bar just for fun (by default with 1 pane only)
     CreateStatusBar();

-    SetStatusText(_T("Welcome to wxWindows exec sample!"));
+    SetStatusText(_T("Welcome to wxWidgets exec sample!"));

 #endif // wxUSE_STATUSBAR
 }
 
 #endif // wxUSE_STATUSBAR
 }
 

+MyFrame::~MyFrame()
+{
+    // any processes left until now must be deleted manually: normally this is
+    // done when the associated process terminates but it must be still running
+    // if this didn't happen until now
+    for ( size_t n = 0; n < m_allAsync.size(); n++ )
+    {
+        delete m_allAsync[n];
+    }
+}
+

 // ----------------------------------------------------------------------------
 // event handlers: file and help menu
 // ----------------------------------------------------------------------------
 
 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {
 // ----------------------------------------------------------------------------
 // event handlers: file and help menu
 // ----------------------------------------------------------------------------
 
 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {

-    // TRUE is to force the frame to close
-    Close(TRUE);
+    // true is to force the frame to close
+    Close(true);

 }
 
 void MyFrame::OnClear(wxCommandEvent& WXUNUSED(event))
 }
 
 void MyFrame::OnClear(wxCommandEvent& WXUNUSED(event))


@@ -475,9 +525,19 @@ void MyFrame::OnClear(wxCommandEvent& WXUNUSED(event))
     m_lbox->Clear();
 }
 
     m_lbox->Clear();
 }
 

+void MyFrame::OnBeginBusyCursor(wxCommandEvent& WXUNUSED(event))
+{
+    wxBeginBusyCursor();
+}
+
+void MyFrame::OnEndBusyCursor(wxCommandEvent& WXUNUSED(event))
+{
+    wxEndBusyCursor();
+}
+

 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {

-    wxMessageBox(_T("Exec wxWindows Sample\n© 2000-2002 Vadim Zeitlin"),
+    wxMessageBox(_T("Exec wxWidgets Sample\n(c) 2000-2002 Vadim Zeitlin"),

                  _T("About Exec"), wxOK | wxICON_INFORMATION, this);
 }
 
                  _T("About Exec"), wxOK | wxICON_INFORMATION, this);
 }
 


@@ -586,20 +646,23 @@ void MyFrame::OnKill(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::DoAsyncExec(const wxString& cmd)
 {
 
 void MyFrame::DoAsyncExec(const wxString& cmd)
 {

-    wxProcess *process = new MyProcess(this, cmd);
+    MyProcess * const process = new MyProcess(this, cmd);

     m_pidLast = wxExecute(cmd, wxEXEC_ASYNC, process);
     if ( !m_pidLast )
     {
     m_pidLast = wxExecute(cmd, wxEXEC_ASYNC, process);
     if ( !m_pidLast )
     {

-        wxLogError( _T("Execution of '%s' failed."), cmd.c_str() );
+        wxLogError(_T("Execution of '%s' failed."), cmd.c_str());

 
         delete process;
     }
     else
     {
 
         delete process;
     }
     else
     {

-        wxLogStatus( _T("Process %ld (%s) launched."),
-            m_pidLast, cmd.c_str() );
+        wxLogStatus(_T("Process %ld (%s) launched."), m_pidLast, cmd.c_str());

 
         m_cmdLast = cmd;
 
         m_cmdLast = cmd;

+
+        // the parent frame keeps track of all async processes as it needs to
+        // free them if we exit before the child process terminates
+        AddAsyncProcess(process);

     }
 }
 
     }
 }
 


@@ -622,6 +685,25 @@ void MyFrame::OnSyncExec(wxCommandEvent& WXUNUSED(event))
     m_cmdLast = cmd;
 }
 
     m_cmdLast = cmd;
 }
 

+void MyFrame::OnSyncNoEventsExec(wxCommandEvent& WXUNUSED(event))
+{
+    wxString cmd = wxGetTextFromUser(_T("Enter the command: "),
+                                     DIALOG_TITLE,
+                                     m_cmdLast);
+
+    if ( !cmd )
+        return;
+
+    wxLogStatus( _T("'%s' is running please wait..."), cmd.c_str() );
+
+    int code = wxExecute(cmd, wxEXEC_BLOCK);
+
+    wxLogStatus(_T("Process '%s' terminated with exit code %d."),
+        cmd.c_str(), code);
+
+    m_cmdLast = cmd;
+}
+

 void MyFrame::OnAsyncExec(wxCommandEvent& WXUNUSED(event))
 {
     wxString cmd = wxGetTextFromUser(_T("Enter the command: "),
 void MyFrame::OnAsyncExec(wxCommandEvent& WXUNUSED(event))
 {
     wxString cmd = wxGetTextFromUser(_T("Enter the command: "),


@@ -651,6 +733,15 @@ void MyFrame::OnShell(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnExecWithRedirect(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyFrame::OnExecWithRedirect(wxCommandEvent& WXUNUSED(event))
 {

+    if ( !m_cmdLast )
+    {
+#ifdef __WXMSW__
+        m_cmdLast = "type Makefile.in";
+#else
+        m_cmdLast = "cat -n Makefile";
+#endif
+    }
+

     wxString cmd = wxGetTextFromUser(_T("Enter the command: "),
                                      DIALOG_TITLE,
                                      m_cmdLast);
     wxString cmd = wxGetTextFromUser(_T("Enter the command: "),
                                      DIALOG_TITLE,
                                      m_cmdLast);


@@ -664,11 +755,11 @@ void MyFrame::OnExecWithRedirect(wxCommandEvent& WXUNUSED(event))
                           wxYES_NO | wxCANCEL | wxICON_QUESTION, this) )
     {
         case wxYES:
                           wxYES_NO | wxCANCEL | wxICON_QUESTION, this) )
     {
         case wxYES:

-            sync = TRUE;
+            sync = true;

             break;
 
         case wxNO:
             break;
 
         case wxNO:

-            sync = FALSE;
+            sync = false;

             break;
 
         default:
             break;
 
         default:


@@ -677,10 +768,15 @@ void MyFrame::OnExecWithRedirect(wxCommandEvent& WXUNUSED(event))
 
     if ( sync )
     {
 
     if ( sync )
     {

+        wxLogStatus("\"%s\" is running please wait...", cmd);
+
+        wxStopWatch sw;
+

         wxArrayString output, errors;
         int code = wxExecute(cmd, output, errors);
         wxArrayString output, errors;
         int code = wxExecute(cmd, output, errors);

-        wxLogStatus(_T("command '%s' terminated with exit code %d."),
-                    cmd.c_str(), code);
+
+        wxLogStatus("Command \"%s\" terminated after %ldms; exit code %d.",
+                    cmd, sw.Time(), code);

 
         if ( code != -1 )
         {
 
         if ( code != -1 )
         {


@@ -699,7 +795,7 @@ void MyFrame::OnExecWithRedirect(wxCommandEvent& WXUNUSED(event))
         }
         else
         {
         }
         else
         {

-            AddAsyncProcess(process);
+            AddPipedProcess(process);

         }
     }
 
         }
     }
 


@@ -728,9 +824,9 @@ void MyFrame::OnExecWithPipe(wxCommandEvent& WXUNUSED(event))
     long pid = wxExecute(cmd, wxEXEC_ASYNC, process);
     if ( pid )
     {
     long pid = wxExecute(cmd, wxEXEC_ASYNC, process);
     if ( pid )
     {

-        wxLogStatus( _T("Process %ld (%s) launched."), pid, cmd.c_str() );
+        wxLogStatus(_T("Process %ld (%s) launched."), pid, cmd.c_str());

 
 

-        AddAsyncProcess(process);
+        AddPipedProcess(process);

     }
     else
     {
     }
     else
     {


@@ -742,7 +838,7 @@ void MyFrame::OnExecWithPipe(wxCommandEvent& WXUNUSED(event))
     m_cmdLast = cmd;
 }
 
     m_cmdLast = cmd;
 }
 

-void MyFrame::OnPOpen(wxCommandEvent& event)
+void MyFrame::OnPOpen(wxCommandEvent& WXUNUSED(event))

 {
     wxString cmd = wxGetTextFromUser(_T("Enter the command to launch: "),
                                      DIALOG_TITLE,
 {
     wxString cmd = wxGetTextFromUser(_T("Enter the command to launch: "),
                                      DIALOG_TITLE,


@@ -757,6 +853,8 @@ void MyFrame::OnPOpen(wxCommandEvent& event)
         return;
     }
 
         return;
     }
 

+    wxLogVerbose(_T("PID of the new process: %ld"), process->GetPid());
+

     wxOutputStream *out = process->GetOutputStream();
     if ( !out )
     {
     wxOutputStream *out = process->GetOutputStream();
     if ( !out )
     {


@@ -774,17 +872,33 @@ void MyFrame::OnPOpen(wxCommandEvent& event)
     new MyPipeFrame(this, cmd, process);
 }
 
     new MyPipeFrame(this, cmd, process);
 }
 

-void MyFrame::OnFileExec(wxCommandEvent& event)
+static wxString gs_lastFile;
+
+static bool AskUserForFileName()

 {
 {

-    static wxString s_filename;
+    wxString filename;

 
 

-    wxString filename = wxLoadFileSelector(_T(""), _T(""), s_filename);
-    if ( !filename )
-        return;
+#if wxUSE_FILEDLG
+    filename = wxLoadFileSelector(_T("any file"), wxEmptyString, gs_lastFile);
+#else // !wxUSE_FILEDLG
+    filename = wxGetTextFromUser(_T("Enter the file name"), _T("exec sample"),
+                                 gs_lastFile);
+#endif // wxUSE_FILEDLG/!wxUSE_FILEDLG
+
+    if ( filename.empty() )
+        return false;
+
+    gs_lastFile = filename;

 
 

-    s_filename = filename;
+    return true;
+}

 
 

-    wxString ext = filename.AfterFirst(_T('.'));
+void MyFrame::OnFileExec(wxCommandEvent& WXUNUSED(event))
+{
+    if ( !AskUserForFileName() )
+        return;
+
+    wxString ext = gs_lastFile.AfterLast(_T('.'));

     wxFileType *ft = wxTheMimeTypesManager->GetFileTypeFromExtension(ext);
     if ( !ft )
     {
     wxFileType *ft = wxTheMimeTypesManager->GetFileTypeFromExtension(ext);
     if ( !ft )
     {


@@ -795,7 +909,7 @@ void MyFrame::OnFileExec(wxCommandEvent& event)
 
     wxString cmd;
     bool ok = ft->GetOpenCommand(&cmd,
 
     wxString cmd;
     bool ok = ft->GetOpenCommand(&cmd,

-                                 wxFileType::MessageParameters(filename, _T("")));
+                                 wxFileType::MessageParameters(gs_lastFile));

     delete ft;
     if ( !ok )
     {
     delete ft;
     if ( !ok )
     {


@@ -807,6 +921,38 @@ void MyFrame::OnFileExec(wxCommandEvent& event)
     DoAsyncExec(cmd);
 }
 
     DoAsyncExec(cmd);
 }
 

+void MyFrame::OnFileLaunch(wxCommandEvent& WXUNUSED(event))
+{
+    if ( !AskUserForFileName() )
+        return;
+
+    if ( !wxLaunchDefaultApplication(gs_lastFile) )
+    {
+        wxLogError("Opening \"%s\" in default application failed.", gs_lastFile);
+    }
+}
+
+void MyFrame::OnOpenURL(wxCommandEvent& WXUNUSED(event))
+{
+    static wxString s_url(_T("http://www.wxwidgets.org/"));
+
+    wxString filename = wxGetTextFromUser
+                        (
+                            _T("Enter the URL"),
+                            _T("exec sample"),
+                            s_url,
+                            this
+                        );
+
+    if ( filename.empty() )
+        return;
+
+    s_url = filename;
+
+    if ( !wxLaunchDefaultBrowser(s_url) )
+        wxLogError(_T("Failed to open URL \"%s\""), s_url.c_str());
+}
+

 // ----------------------------------------------------------------------------
 // DDE stuff
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // DDE stuff
 // ----------------------------------------------------------------------------


@@ -818,23 +964,23 @@ bool MyFrame::GetDDEServer()
     wxString server = wxGetTextFromUser(_T("Server to connect to:"),
                                         DIALOG_TITLE, m_server);
     if ( !server )
     wxString server = wxGetTextFromUser(_T("Server to connect to:"),
                                         DIALOG_TITLE, m_server);
     if ( !server )

-        return FALSE;
+        return false;

 
     m_server = server;
 
     wxString topic = wxGetTextFromUser(_T("DDE topic:"), DIALOG_TITLE, m_topic);
     if ( !topic )
 
     m_server = server;
 
     wxString topic = wxGetTextFromUser(_T("DDE topic:"), DIALOG_TITLE, m_topic);
     if ( !topic )

-        return FALSE;
+        return false;

 
     m_topic = topic;
 
     wxString cmd = wxGetTextFromUser(_T("DDE command:"), DIALOG_TITLE, m_cmdDde);
     if ( !cmd )
 
     m_topic = topic;
 
     wxString cmd = wxGetTextFromUser(_T("DDE command:"), DIALOG_TITLE, m_cmdDde);
     if ( !cmd )

-        return FALSE;
+        return false;

 
     m_cmdDde = cmd;
 
 
     m_cmdDde = cmd;
 

-    return TRUE;
+    return true;

 }
 
 void MyFrame::OnDDEExec(wxCommandEvent& WXUNUSED(event))
 }
 
 void MyFrame::OnDDEExec(wxCommandEvent& WXUNUSED(event))


@@ -843,7 +989,7 @@ void MyFrame::OnDDEExec(wxCommandEvent& WXUNUSED(event))
         return;
 
     wxDDEClient client;
         return;
 
     wxDDEClient client;

-    wxConnectionBase *conn = client.MakeConnection("", m_server, m_topic);
+    wxConnectionBase *conn = client.MakeConnection(wxEmptyString, m_server, m_topic);

     if ( !conn )
     {
         wxLogError(_T("Failed to connect to the DDE server '%s'."),
     if ( !conn )
     {
         wxLogError(_T("Failed to connect to the DDE server '%s'."),


@@ -869,7 +1015,7 @@ void MyFrame::OnDDERequest(wxCommandEvent& WXUNUSED(event))
         return;
 
     wxDDEClient client;
         return;
 
     wxDDEClient client;

-    wxConnectionBase *conn = client.MakeConnection("", m_server, m_topic);
+    wxConnectionBase *conn = client.MakeConnection(wxEmptyString, m_server, m_topic);

     if ( !conn )
     {
         wxLogError(_T("Failed to connect to the DDE server '%s'."),
     if ( !conn )
     {
         wxLogError(_T("Failed to connect to the DDE server '%s'."),


@@ -915,9 +1061,41 @@ void MyFrame::OnTimer(wxTimerEvent& WXUNUSED(event))
 
 void MyFrame::OnProcessTerminated(MyPipedProcess *process)
 {
 
 void MyFrame::OnProcessTerminated(MyPipedProcess *process)
 {

-    RemoveAsyncProcess(process);
+    RemovePipedProcess(process);
+}
+
+void MyFrame::OnAsyncTermination(MyProcess *process)
+{
+    m_allAsync.Remove(process);
+
+    delete process;
+}
+
+void MyFrame::AddPipedProcess(MyPipedProcess *process)
+{
+    if ( m_running.IsEmpty() )
+    {
+        // we want to start getting the timer events to ensure that a
+        // steady stream of idle events comes in -- otherwise we
+        // wouldn't be able to poll the child process input
+        m_timerIdleWakeUp.Start(100);
+    }
+    //else: the timer is already running
+
+    m_running.Add(process);
+    m_allAsync.Add(process);

 }
 
 }
 

+void MyFrame::RemovePipedProcess(MyPipedProcess *process)
+{
+    m_running.Remove(process);
+
+    if ( m_running.IsEmpty() )
+    {
+        // we don't need to get idle events all the time any more
+        m_timerIdleWakeUp.Stop();
+    }
+}

 
 void MyFrame::ShowOutput(const wxString& cmd,
                          const wxArrayString& output,
 
 void MyFrame::ShowOutput(const wxString& cmd,
                          const wxArrayString& output,


@@ -948,8 +1126,7 @@ void MyProcess::OnTerminate(int pid, int status)
     wxLogStatus(m_parent, _T("Process %u ('%s') terminated with exit code %d."),
                 pid, m_cmd.c_str(), status);
 
     wxLogStatus(m_parent, _T("Process %u ('%s') terminated with exit code %d."),
                 pid, m_cmd.c_str(), status);
 

-    // we're not needed any more
-    delete this;
+    m_parent->OnAsyncTermination(this);

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -958,7 +1135,7 @@ void MyProcess::OnTerminate(int pid, int status)
 
 bool MyPipedProcess::HasInput()
 {
 
 bool MyPipedProcess::HasInput()
 {

-    bool hasInput = FALSE;
+    bool hasInput = false;

 
     if ( IsInputAvailable() )
     {
 
     if ( IsInputAvailable() )
     {


@@ -970,7 +1147,7 @@ bool MyPipedProcess::HasInput()
 
         m_parent->GetLogListBox()->Append(msg);
 
 
         m_parent->GetLogListBox()->Append(msg);
 

-        hasInput = TRUE;
+        hasInput = true;

     }
 
     if ( IsErrorAvailable() )
     }
 
     if ( IsErrorAvailable() )


@@ -983,7 +1160,7 @@ bool MyPipedProcess::HasInput()
 
         m_parent->GetLogListBox()->Append(msg);
 
 
         m_parent->GetLogListBox()->Append(msg);
 

-        hasInput = TRUE;
+        hasInput = true;

     }
 
     return hasInput;
     }
 
     return hasInput;


@@ -1006,7 +1183,7 @@ void MyPipedProcess::OnTerminate(int pid, int status)
 
 bool MyPipedProcess2::HasInput()
 {
 
 bool MyPipedProcess2::HasInput()
 {

-    if ( !!m_input )
+    if ( !m_input.empty() )

     {
         wxTextOutputStream os(*GetOutputStream());
         os.WriteString(m_input);
     {
         wxTextOutputStream os(*GetOutputStream());
         os.WriteString(m_input);


@@ -1015,7 +1192,7 @@ bool MyPipedProcess2::HasInput()
         m_input.clear();
 
         // call us once again - may be we'll have output
         m_input.clear();
 
         // call us once again - may be we'll have output

-        return TRUE;
+        return true;

     }
 
     return MyPipedProcess::HasInput();
     }
 
     return MyPipedProcess::HasInput();


@@ -1028,33 +1205,45 @@ bool MyPipedProcess2::HasInput()
 MyPipeFrame::MyPipeFrame(wxFrame *parent,
                          const wxString& cmd,
                          wxProcess *process)
 MyPipeFrame::MyPipeFrame(wxFrame *parent,
                          const wxString& cmd,
                          wxProcess *process)

-           : wxFrame(parent, -1, cmd),
+           : wxFrame(parent, wxID_ANY, cmd),

              m_process(process),
              // in a real program we'd check that the streams are !NULL here
              m_process(process),
              // in a real program we'd check that the streams are !NULL here

+             m_out(*process->GetOutputStream()),

              m_in(*process->GetInputStream()),
              m_in(*process->GetInputStream()),

-             m_out(*process->GetOutputStream())
+             m_err(*process->GetErrorStream())

 {
     m_process->SetNextHandler(this);
 
 {
     m_process->SetNextHandler(this);
 

-    wxPanel *panel = new wxPanel(this, -1);
+    wxPanel *panel = new wxPanel(this, wxID_ANY);

 
 

-    m_textIn = new wxTextCtrl(panel, -1, _T(""),
+    m_textOut = new wxTextCtrl(panel, wxID_ANY, wxEmptyString,

                               wxDefaultPosition, wxDefaultSize,
                               wxTE_PROCESS_ENTER);
                               wxDefaultPosition, wxDefaultSize,
                               wxTE_PROCESS_ENTER);

-    m_textOut = new wxTextCtrl(panel, -1, _T(""));
-    m_textOut->SetEditable(FALSE);
+    m_textIn = new wxTextCtrl(panel, wxID_ANY, wxEmptyString,
+                               wxDefaultPosition, wxDefaultSize,
+                               wxTE_MULTILINE | wxTE_RICH);
+    m_textIn->SetEditable(false);
+    m_textErr = new wxTextCtrl(panel, wxID_ANY, wxEmptyString,
+                               wxDefaultPosition, wxDefaultSize,
+                               wxTE_MULTILINE | wxTE_RICH);
+    m_textErr->SetEditable(false);

 
     wxSizer *sizerTop = new wxBoxSizer(wxVERTICAL);
 
     wxSizer *sizerTop = new wxBoxSizer(wxVERTICAL);

-    sizerTop->Add(m_textIn, 0, wxGROW | wxALL, 5);
+    sizerTop->Add(m_textOut, 0, wxGROW | wxALL, 5);

 
     wxSizer *sizerBtns = new wxBoxSizer(wxHORIZONTAL);
 
     wxSizer *sizerBtns = new wxBoxSizer(wxHORIZONTAL);

-    sizerBtns->Add(new wxButton(panel, Exec_Btn_Send, _T("&Send")), 0,
-                   wxALL, 10);
-    sizerBtns->Add(new wxButton(panel, Exec_Btn_Get, _T("&Get")), 0,
-                   wxALL, 10);
+    sizerBtns->
+        Add(new wxButton(panel, Exec_Btn_Send, _T("&Send")), 0, wxALL, 5);
+    sizerBtns->
+        Add(new wxButton(panel, Exec_Btn_SendFile, _T("&File...")), 0, wxALL, 5);
+    sizerBtns->
+        Add(new wxButton(panel, Exec_Btn_Get, _T("&Get")), 0, wxALL, 5);
+    sizerBtns->
+        Add(new wxButton(panel, Exec_Btn_Close, _T("&Close")), 0, wxALL, 5);

 
     sizerTop->Add(sizerBtns, 0, wxCENTRE | wxALL, 5);
 
     sizerTop->Add(sizerBtns, 0, wxCENTRE | wxALL, 5);

-    sizerTop->Add(m_textOut, 0, wxGROW | wxALL, 5);
+    sizerTop->Add(m_textIn, 1, wxGROW | wxALL, 5);
+    sizerTop->Add(m_textErr, 1, wxGROW | wxALL, 5);

 
     panel->SetSizer(sizerTop);
     sizerTop->Fit(this);
 
     panel->SetSizer(sizerTop);
     sizerTop->Fit(this);


@@ -1062,18 +1251,76 @@ MyPipeFrame::MyPipeFrame(wxFrame *parent,
     Show();
 }
 
     Show();
 }
 

+void MyPipeFrame::OnBtnSendFile(wxCommandEvent& WXUNUSED(event))
+{
+#if wxUSE_FILEDLG
+    wxFileDialog filedlg(this, _T("Select file to send"));
+    if ( filedlg.ShowModal() != wxID_OK )
+        return;
+
+    wxFFile file(filedlg.GetFilename(), _T("r"));
+    wxString data;
+    if ( !file.IsOpened() || !file.ReadAll(&data) )
+        return;
+
+    // can't write the entire string at once, this risk overflowing the pipe
+    // and we would dead lock
+    size_t len = data.length();
+    const wxChar *pc = data.c_str();
+    while ( len )
+    {
+        const size_t CHUNK_SIZE = 4096;
+        m_out.Write(pc, len > CHUNK_SIZE ? CHUNK_SIZE : len);
+
+        // note that not all data could have been written as we don't block on
+        // the write end of the pipe
+        const size_t lenChunk = m_out.LastWrite();
+
+        pc += lenChunk;
+        len -= lenChunk;
+
+        DoGet();
+    }
+#endif // wxUSE_FILEDLG
+}
+

 void MyPipeFrame::DoGet()
 {
     // we don't have any way to be notified when any input appears on the
     // stream so we have to poll it :-(
 void MyPipeFrame::DoGet()
 {
     // we don't have any way to be notified when any input appears on the
     // stream so we have to poll it :-(

-    //
-    // NB: this really must be done because otherwise the other program might
-    //     not have enough time to receive or process our data and we'd read
-    //     an empty string
-    while ( !m_process->IsInputAvailable() && m_process->IsInputOpened() )
-        ;
+    DoGetFromStream(m_textIn, m_in);
+    DoGetFromStream(m_textErr, m_err);
+}
+
+void MyPipeFrame::DoGetFromStream(wxTextCtrl *text, wxInputStream& in)
+{
+    while ( in.CanRead() )
+    {
+        wxChar buffer[4096];
+        buffer[in.Read(buffer, WXSIZEOF(buffer) - 1).LastRead()] = _T('\0');
+
+        text->AppendText(buffer);
+    }
+}
+
+void MyPipeFrame::DoClose()
+{
+    m_process->CloseOutput();
+
+    DisableInput();
+}
+
+void MyPipeFrame::DisableInput()
+{
+    m_textOut->SetEditable(false);
+    FindWindow(Exec_Btn_Send)->Disable();
+    FindWindow(Exec_Btn_SendFile)->Disable();
+    FindWindow(Exec_Btn_Close)->Disable();
+}

 
 

-    m_textOut->SetValue(m_in.ReadLine());
+void MyPipeFrame::DisableOutput()
+{
+    FindWindow(Exec_Btn_Get)->Disable();

 }
 
 void MyPipeFrame::OnClose(wxCloseEvent& event)
 }
 
 void MyPipeFrame::OnClose(wxCloseEvent& event)


@@ -1092,12 +1339,15 @@ void MyPipeFrame::OnClose(wxCloseEvent& event)
     event.Skip();
 }
 
     event.Skip();
 }
 

-void MyPipeFrame::OnProcessTerm(wxProcessEvent& event)
+void MyPipeFrame::OnProcessTerm(wxProcessEvent& WXUNUSED(event))

 {
 {

+    DoGet();
+

     delete m_process;
     m_process = NULL;
 
     wxLogWarning(_T("The other process has terminated, closing"));
 
     delete m_process;
     m_process = NULL;
 
     wxLogWarning(_T("The other process has terminated, closing"));
 

-    Close();
+    DisableInput();
+    DisableOutput();

 }
 }