// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
#pragma implementation "exec.cpp"
#pragma interface "exec.cpp"
#endif
#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"
#include "wx/frame.h"
+ #include "wx/panel.h"
+
+ #include "wx/timer.h"
#include "wx/utils.h"
#include "wx/menu.h"
#endif
#include "wx/txtstrm.h"
+#include "wx/numdlg.h"
#include "wx/process.h"
// 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
void OnAbout(wxCommandEvent& event);
// polling output of async processes
+ void OnTimer(wxTimerEvent& event);
void OnIdle(wxIdleEvent& event);
// for MyPipedProcess
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;
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()
};
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 OnBtnGet(wxCommandEvent& WXUNUSED(event)) { DoGet(); }
void OnClose(wxCloseEvent& event);
void DoSend()
{
- m_out.WriteString(m_textIn->GetValue() + '\n');
+ m_out.WriteString(m_textIn->GetValue() + _T('\n'));
m_textIn->Clear();
DoGet();
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_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)
EVT_BUTTON(Exec_Btn_Get, MyPipeFrame::OnBtnGet)
- EVT_TEXT_ENTER(-1, MyPipeFrame::OnTextEnter)
+ EVT_TEXT_ENTER(wxID_ANY, MyPipeFrame::OnTextEnter)
EVT_CLOSE(MyPipeFrame::OnClose)
- EVT_END_PROCESS(-1, MyPipeFrame::OnProcessTerm)
+ EVT_END_PROCESS(wxID_ANY, MyPipeFrame::OnProcessTerm)
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
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
- frame->Show(TRUE);
+ frame->Show(true);
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.
- return TRUE;
+ return true;
}
// ----------------------------------------------------------------------------
// 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, wxID_ANY, title, pos, size),
+ m_timerIdleWakeUp(this)
{
m_pidLast = 0;
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() )
#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
}
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::OnAbout(wxCommandEvent& WXUNUSED(event))
{
- wxMessageBox(_T("Exec wxWindows Sample\n© 2000-2001 Vadim Zeitlin"),
+ wxMessageBox(_T("Exec wxWidgets Sample\n© 2000-2002 Vadim Zeitlin"),
_T("About Exec"), wxOK | wxICON_INFORMATION, this);
}
wxYES_NO | wxCANCEL | wxICON_QUESTION, this) )
{
case wxYES:
- sync = TRUE;
+ sync = true;
break;
case wxNO:
- sync = FALSE;
+ sync = false;
break;
default:
}
else
{
- m_running.Add(process);
+ AddAsyncProcess(process);
}
}
{
wxLogStatus( _T("Process %ld (%s) launched."), pid, cmd.c_str() );
- m_running.Add(process);
+ AddAsyncProcess(process);
}
else
{
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,
new MyPipeFrame(this, cmd, process);
}
-void MyFrame::OnFileExec(wxCommandEvent& event)
+void MyFrame::OnFileExec(wxCommandEvent& WXUNUSED(event))
{
static wxString s_filename;
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 )
- return FALSE;
+ return false;
m_topic = topic;
wxString cmd = wxGetTextFromUser(_T("DDE command:"), DIALOG_TITLE, m_cmdDde);
if ( !cmd )
- return FALSE;
+ return false;
m_cmdDde = cmd;
- return TRUE;
+ return true;
}
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'."),
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'."),
}
}
+void MyFrame::OnTimer(wxTimerEvent& WXUNUSED(event))
+{
+ wxWakeUpIdle();
+}
+
void MyFrame::OnProcessTerminated(MyPipedProcess *process)
{
- m_running.Remove(process);
+ RemoveAsyncProcess(process);
}
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;
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;
m_parent->GetLogListBox()->Append(msg);
- hasInput = TRUE;
+ hasInput = true;
}
return hasInput;
m_input.clear();
// call us once again - may be we'll have output
- return TRUE;
+ return true;
}
return MyPipedProcess::HasInput();
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_in(*process->GetInputStream()),
{
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_textIn = new wxTextCtrl(panel, wxID_ANY, _T(""),
wxDefaultPosition, wxDefaultSize,
wxTE_PROCESS_ENTER);
- m_textOut = new wxTextCtrl(panel, -1, _T(""));
- m_textOut->SetEditable(FALSE);
+ m_textOut = new wxTextCtrl(panel, wxID_ANY, _T(""));
+ m_textOut->SetEditable(false);
wxSizer *sizerTop = new wxBoxSizer(wxVERTICAL);
sizerTop->Add(m_textIn, 0, wxGROW | wxALL, 5);
event.Skip();
}
-void MyPipeFrame::OnProcessTerm(wxProcessEvent& event)
+void MyPipeFrame::OnProcessTerm(wxProcessEvent& WXUNUSED(event))
{
delete m_process;
m_process = NULL;
projects / wxWidgets.git / blobdiff