X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7ca528cb60e865ad7bf5b7800c944d0b3af47a79..3682ea7d2cafc2cbb3f9093e0f864dfff54327dd:/samples/exec/exec.cpp?ds=sidebyside

diff --git a/samples/exec/exec.cpp b/samples/exec/exec.cpp
index 6c66fce221..50f2a1acb3 100644
--- a/samples/exec/exec.cpp
+++ b/samples/exec/exec.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma implementation "exec.cpp"
     #pragma interface "exec.cpp"
 #endif
@@ -33,7 +33,11 @@
 // need because it includes almost all "standard" wxWindows headers
 #ifndef WX_PRECOMP
     #include "wx/app.h"
+    #include "wx/log.h"
     #include "wx/frame.h"
+    #include "wx/panel.h"
+
+    #include "wx/timer.h"
 
     #include "wx/utils.h"
     #include "wx/menu.h"
@@ -79,7 +83,7 @@ public:
 
 // Define an array of process pointers used by MyFrame
 class MyPipedProcess;
-WX_DEFINE_ARRAY(MyPipedProcess *, MyProcessesArray);
+WX_DEFINE_ARRAY_NO_PTR(MyPipedProcess *, MyProcessesArray);
 
 // Define a new frame type: this is going to be our main frame
 class MyFrame : public wxFrame
@@ -108,6 +112,7 @@ public:
     void OnAbout(wxCommandEvent& event);
 
     // polling output of async processes
+    void OnTimer(wxTimerEvent& event);
     void OnIdle(wxIdleEvent& event);
 
     // for MyPipedProcess
@@ -121,6 +126,31 @@ private:
 
     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
     long m_pidLast;
 
@@ -143,6 +173,9 @@ private:
 
     MyProcessesArray m_running;
 
+    // the idle event wake up timer
+    wxTimer m_timerIdleWakeUp;
+
     // any class wishing to process wxWindows events must use this macro
     DECLARE_EVENT_TABLE()
 };
@@ -169,7 +202,7 @@ protected:
 
     void DoSend()
     {
-        m_out.WriteString(m_textIn->GetValue() + '\n');
+        m_out.WriteString(m_textIn->GetValue() + _T('\n'));
         m_textIn->Clear();
 
         DoGet();
@@ -303,6 +336,8 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(Exec_About, MyFrame::OnAbout)
 
     EVT_IDLE(MyFrame::OnIdle)
+
+    EVT_TIMER(-1, MyFrame::OnTimer)
 END_EVENT_TABLE()
 
 BEGIN_EVENT_TABLE(MyPipeFrame, wxFrame)
@@ -352,9 +387,14 @@ bool MyApp::OnInit()
 // 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)
-       : wxFrame((wxFrame *)NULL, -1, title, pos, size)
+       : wxFrame((wxFrame *)NULL, -1, title, pos, size),
+         m_timerIdleWakeUp(this)
 {
     m_pidLast = 0;
 
@@ -441,7 +481,7 @@ void MyFrame::OnClear(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
-    wxMessageBox(_T("Exec wxWindows Sample\n© 2000-2001 Vadim Zeitlin"),
+    wxMessageBox(_T("Exec wxWindows Sample\n© 2000-2002 Vadim Zeitlin"),
                  _T("About Exec"), wxOK | wxICON_INFORMATION, this);
 }
 
@@ -663,7 +703,7 @@ void MyFrame::OnExecWithRedirect(wxCommandEvent& WXUNUSED(event))
         }
         else
         {
-            m_running.Add(process);
+            AddAsyncProcess(process);
         }
     }
 
@@ -694,7 +734,7 @@ void MyFrame::OnExecWithPipe(wxCommandEvent& WXUNUSED(event))
     {
         wxLogStatus( _T("Process %ld (%s) launched."), pid, cmd.c_str() );
 
-        m_running.Add(process);
+        AddAsyncProcess(process);
     }
     else
     {
@@ -706,7 +746,7 @@ void MyFrame::OnExecWithPipe(wxCommandEvent& WXUNUSED(event))
     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,
@@ -738,7 +778,7 @@ void MyFrame::OnPOpen(wxCommandEvent& event)
     new MyPipeFrame(this, cmd, process);
 }
 
-void MyFrame::OnFileExec(wxCommandEvent& event)
+void MyFrame::OnFileExec(wxCommandEvent& WXUNUSED(event))
 {
     static wxString s_filename;
 
@@ -807,7 +847,7 @@ void MyFrame::OnDDEExec(wxCommandEvent& WXUNUSED(event))
         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'."),
@@ -833,7 +873,7 @@ void MyFrame::OnDDERequest(wxCommandEvent& WXUNUSED(event))
         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'."),
@@ -872,9 +912,14 @@ void MyFrame::OnIdle(wxIdleEvent& event)
     }
 }
 
+void MyFrame::OnTimer(wxTimerEvent& WXUNUSED(event))
+{
+    wxWakeUpIdle();
+}
+
 void MyFrame::OnProcessTerminated(MyPipedProcess *process)
 {
-    m_running.Remove(process);
+    RemoveAsyncProcess(process);
 }
 
 
@@ -919,10 +964,9 @@ bool MyPipedProcess::HasInput()
 {
     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;
@@ -933,10 +977,9 @@ bool MyPipedProcess::HasInput()
         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;
@@ -1053,7 +1096,7 @@ void MyPipeFrame::OnClose(wxCloseEvent& event)
     event.Skip();
 }
 
-void MyPipeFrame::OnProcessTerm(wxProcessEvent& event)
+void MyPipeFrame::OnProcessTerm(wxProcessEvent& WXUNUSED(event))
 {
     delete m_process;
     m_process = NULL;