Fix previous change in case somebody is still using

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

diff --git a/samples/exec/exec.cpp b/samples/exec/exec.cpp
index 7791cc180139094c30a0bdec37d402b359cea847..5ecdb7744d9b5458825c0b2035f7fcd39e2c6354 100644 (file)
--- a/samples/exec/exec.cpp
+++ b/samples/exec/exec.cpp
@@ -17,9 +17,9 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

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

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


@@ -30,10 +30,14 @@
 #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"
 #ifndef WX_PRECOMP
     #include "wx/app.h"

+    #include "wx/log.h"

     #include "wx/frame.h"
     #include "wx/frame.h"

+    #include "wx/panel.h"
+
+    #include "wx/timer.h"

 
     #include "wx/utils.h"
     #include "wx/menu.h"
 
     #include "wx/utils.h"
     #include "wx/menu.h"


@@ -51,6 +55,8 @@
 #endif
 
 #include "wx/txtstrm.h"
 #endif
 
 #include "wx/txtstrm.h"

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

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


@@ -79,7 +85,7 @@ 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 *, MyProcessesArray);

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


@@ -108,6 +114,7 @@ public:
     void OnAbout(wxCommandEvent& event);
 
     // polling output of async processes
     void OnAbout(wxCommandEvent& event);
 
     // polling output of async processes

+    void OnTimer(wxTimerEvent& event);

     void OnIdle(wxIdleEvent& event);
 
     // for MyPipedProcess
     void OnIdle(wxIdleEvent& event);
 
     // for MyPipedProcess


@@ -121,8 +128,33 @@ 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
+
+        m_running.Add(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
     // the PID of the last process we launched asynchronously

-    int m_pidLast;
+    long m_pidLast;

 
     // last command we executed
     wxString m_cmdLast;
 
     // last command we executed
     wxString m_cmdLast;


@@ -143,7 +175,10 @@ private:
 
     MyProcessesArray m_running;
 
 
     MyProcessesArray m_running;
 

-    // any class wishing to process wxWindows events must use this macro
+    // the idle event wake up timer
+    wxTimer m_timerIdleWakeUp;
+
+    // any class wishing to process wxWidgets events must use this macro

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 


@@ -159,23 +194,44 @@ 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);
 

-    void DoSend() { m_out.WriteString(m_textIn->GetValue() + '\n'); DoGet(); }
+    void OnProcessTerm(wxProcessEvent& event);
+
+    void DoSend()
+    {
+        wxString s(m_textOut->GetValue());
+        s += _T('\n');
+        m_out.Write(s.c_str(), s.length());
+        m_textOut->Clear();
+
+        DoGet();
+    }
+

     void 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()
 };


@@ -259,16 +315,18 @@ 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)
 // 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)


@@ -294,18 +352,24 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(Exec_About, MyFrame::OnAbout)
 
     EVT_IDLE(MyFrame::OnIdle)
     EVT_MENU(Exec_About, MyFrame::OnAbout)
 
     EVT_IDLE(MyFrame::OnIdle)

+
+    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(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


@@ -324,26 +388,31 @@ IMPLEMENT_APP(MyApp)
 bool MyApp::OnInit()
 {
     // Create the main application window
 bool MyApp::OnInit()
 {
     // 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_pidLast = 0;
 


@@ -400,7 +469,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() )


@@ -409,7 +478,7 @@ 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
 }
 


@@ -419,8 +488,8 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
 
 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {
 
 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))


@@ -430,7 +499,7 @@ void MyFrame::OnClear(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {

-    wxMessageBox(_T("Exec wxWindows Sample\n© 2000-2001 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);
 }
 


@@ -505,16 +574,16 @@ void MyFrame::OnKill(wxCommandEvent& WXUNUSED(event))
     if ( sig == 0 )
     {
         if ( wxProcess::Exists(pid) )
     if ( sig == 0 )
     {
         if ( wxProcess::Exists(pid) )

-            wxLogStatus(_T("Process %d is running."), pid);
+            wxLogStatus(_T("Process %ld is running."), pid);

         else
         else

-            wxLogStatus(_T("No process with pid = %d."), pid);
+            wxLogStatus(_T("No process with pid = %ld."), pid);

     }
     else // not SIGNONE
     {
         wxKillError rc = wxProcess::Kill(pid, (wxSignal)sig);
         if ( rc == wxKILL_OK )
         {
     }
     else // not SIGNONE
     {
         wxKillError rc = wxProcess::Kill(pid, (wxSignal)sig);
         if ( rc == wxKILL_OK )
         {

-            wxLogStatus(_T("Process %d killed with signal %d."), pid, sig);
+            wxLogStatus(_T("Process %ld killed with signal %d."), pid, sig);

         }
         else
         {
         }
         else
         {


@@ -527,7 +596,7 @@ void MyFrame::OnKill(wxCommandEvent& WXUNUSED(event))
                 _T("unspecified error"),
             };
 
                 _T("unspecified error"),
             };
 

-            wxLogStatus(_T("Failed to kill process %d with signal %d: %s"),
+            wxLogStatus(_T("Failed to kill process %ld with signal %d: %s"),

                         pid, sig, errorText[rc]);
         }
     }
                         pid, sig, errorText[rc]);
         }
     }


@@ -543,13 +612,14 @@ void MyFrame::DoAsyncExec(const wxString& 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;
     }


@@ -564,12 +634,13 @@ void MyFrame::OnSyncExec(wxCommandEvent& WXUNUSED(event))
     if ( !cmd )
         return;
 
     if ( !cmd )
         return;
 

-    wxLogStatus(_T("'%s' is running please wait..."), cmd.c_str());
+    wxLogStatus( _T("'%s' is running please wait..."), cmd.c_str() );

 
     int code = wxExecute(cmd, wxEXEC_SYNC);
 
     wxLogStatus(_T("Process '%s' terminated with exit code %d."),
 
     int code = wxExecute(cmd, wxEXEC_SYNC);
 
     wxLogStatus(_T("Process '%s' terminated with exit code %d."),

-                cmd.c_str(), code);
+        cmd.c_str(), code);
+

     m_cmdLast = cmd;
 }
 
     m_cmdLast = cmd;
 }
 


@@ -615,11 +686,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:


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

-            m_running.Add(process);
+            AddAsyncProcess(process);

         }
     }
 
         }
     }
 


@@ -676,12 +747,12 @@ void MyFrame::OnExecWithPipe(wxCommandEvent& WXUNUSED(event))
 
     // always execute the filter asynchronously
     MyPipedProcess2 *process = new MyPipedProcess2(this, cmd, input);
 
     // always execute the filter asynchronously
     MyPipedProcess2 *process = new MyPipedProcess2(this, cmd, input);

-    int pid = wxExecute(cmd, wxEXEC_ASYNC, process);
+    long pid = wxExecute(cmd, wxEXEC_ASYNC, process);

     if ( pid )
     {
     if ( pid )
     {

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

 
 

-        m_running.Add(process);
+        AddAsyncProcess(process);

     }
     else
     {
     }
     else
     {


@@ -693,7 +764,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,


@@ -725,7 +796,7 @@ void MyFrame::OnPOpen(wxCommandEvent& event)
     new MyPipeFrame(this, cmd, process);
 }
 
     new MyPipeFrame(this, cmd, process);
 }
 

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

 {
     static wxString s_filename;
 
 {
     static wxString s_filename;
 


@@ -769,23 +840,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))


@@ -794,7 +865,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(_T(""), 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'."),


@@ -820,7 +891,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(_T(""), 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'."),


@@ -859,9 +930,14 @@ void MyFrame::OnIdle(wxIdleEvent& event)
     }
 }
 
     }
 }
 

+void MyFrame::OnTimer(wxTimerEvent& WXUNUSED(event))
+{
+    wxWakeUpIdle();
+}
+

 void MyFrame::OnProcessTerminated(MyPipedProcess *process)
 {
 void MyFrame::OnProcessTerminated(MyPipedProcess *process)
 {

-    m_running.Remove(process);
+    RemoveAsyncProcess(process);

 }
 
 
 }
 
 


@@ -904,12 +980,11 @@ void MyProcess::OnTerminate(int pid, int status)
 
 bool MyPipedProcess::HasInput()
 {
 
 bool MyPipedProcess::HasInput()
 {

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

 
 

-    wxInputStream& is = *GetInputStream();
-    if ( !is.Eof() )
+    if ( IsInputAvailable() )

     {
     {

-        wxTextInputStream tis(is);
+        wxTextInputStream tis(*GetInputStream());

 
         // this assumes that the output is always line buffered
         wxString msg;
 
         // this assumes that the output is always line buffered
         wxString msg;


@@ -917,13 +992,12 @@ bool MyPipedProcess::HasInput()
 
         m_parent->GetLogListBox()->Append(msg);
 
 
         m_parent->GetLogListBox()->Append(msg);
 

-        hasInput = TRUE;
+        hasInput = true;

     }
 
     }
 

-    wxInputStream& es = *GetErrorStream();
-    if ( !es.Eof() )
+    if ( IsErrorAvailable() )

     {
     {

-        wxTextInputStream tis(es);
+        wxTextInputStream tis(*GetErrorStream());

 
         // this assumes that the output is always line buffered
         wxString msg;
 
         // this assumes that the output is always line buffered
         wxString msg;


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

-        hasInput = TRUE;
+        hasInput = true;

     }
 
     return hasInput;
     }
 
     return hasInput;


@@ -954,7 +1028,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);


@@ -963,7 +1037,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();


@@ -976,45 +1050,147 @@ 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_textIn = new wxTextCtrl(this, -1, _T(""),
+    m_process->SetNextHandler(this);
+
+    wxPanel *panel = new wxPanel(this, wxID_ANY);
+
+    m_textOut = new wxTextCtrl(panel, wxID_ANY, _T(""),

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

-    m_textOut = new wxTextCtrl(this, -1, _T(""));
-    m_textOut->SetEditable(FALSE);
+    m_textIn = new wxTextCtrl(panel, wxID_ANY, _T(""),
+                               wxDefaultPosition, wxDefaultSize,
+                               wxTE_MULTILINE | wxTE_RICH);
+    m_textIn->SetEditable(false);
+    m_textErr = new wxTextCtrl(panel, wxID_ANY, _T(""),
+                               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(this, Exec_Btn_Send, _T("&Send")), 0,
-                   wxALL, 10);
-    sizerBtns->Add(new wxButton(this, 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);

 
 

-    SetSizer(sizerTop);
+    panel->SetSizer(sizerTop);

     sizerTop->Fit(this);
 
     Show();
 }
 
     sizerTop->Fit(this);
 
     Show();
 }
 

+void MyPipeFrame::OnBtnSendFile(wxCommandEvent& WXUNUSED(event))
+{
+    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();
+    }
+}
+

 void MyPipeFrame::DoGet()
 {
 void MyPipeFrame::DoGet()
 {

-    m_textOut->SetValue(m_in.ReadLine());
+    // we don't have any way to be notified when any input appears on the
+    // stream so we have to poll it :-(
+    DoGetFromStream(m_textIn, m_in);
+    DoGetFromStream(m_textErr, m_err);

 }
 
 }
 

-void MyPipeFrame::OnClose(wxCloseEvent& event)
+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();
 
 {
     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();
+}
+
+void MyPipeFrame::DisableOutput()
+{
+    FindWindow(Exec_Btn_Get)->Disable();
+}
+
+void MyPipeFrame::OnClose(wxCloseEvent& event)
+{
+    if ( m_process )
+    {
+        // we're not interested in getting the process termination notification
+        // if we are closing it ourselves
+        wxProcess *process = m_process;
+        m_process = NULL;
+        process->SetNextHandler(NULL);
+
+        process->CloseOutput();
+    }
+

     event.Skip();
 }
 
     event.Skip();
 }
 

+void MyPipeFrame::OnProcessTerm(wxProcessEvent& WXUNUSED(event))
+{
+    DoGet();
+
+    delete m_process;
+    m_process = NULL;
+
+    wxLogWarning(_T("The other process has terminated, closing"));
+
+    DisableInput();
+    DisableOutput();
+}