wxaui flags reworked a bit; allows any hinting type to be explicity invoked; turning...

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

diff --git a/samples/exec/exec.cpp b/samples/exec/exec.cpp
index eaeb0b15b9b0bb5d9667b361978a5b07d9d8fb22..13e9c0003d71da0ba1991046b92b76a83255ff39 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"
 


@@ -56,6 +51,7 @@
 
 #include "wx/txtstrm.h"
 #include "wx/numdlg.h"
 
 #include "wx/txtstrm.h"
 #include "wx/numdlg.h"

+#include "wx/ffile.h"

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


@@ -195,7 +191,9 @@ public:
 protected:
     void OnTextEnter(wxCommandEvent& WXUNUSED(event)) { DoSend(); }
     void OnBtnSend(wxCommandEvent& WXUNUSED(event)) { DoSend(); }
 protected:
     void OnTextEnter(wxCommandEvent& WXUNUSED(event)) { DoSend(); }
     void OnBtnSend(wxCommandEvent& WXUNUSED(event)) { DoSend(); }

+    void OnBtnSendFile(wxCommandEvent& WXUNUSED(event));

     void OnBtnGet(wxCommandEvent& WXUNUSED(event)) { DoGet(); }
     void OnBtnGet(wxCommandEvent& WXUNUSED(event)) { DoGet(); }

+    void OnBtnClose(wxCommandEvent& WXUNUSED(event)) { DoClose(); }

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


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

-        m_out.WriteString(m_textIn->GetValue() + _T('\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()
 };


@@ -302,7 +310,9 @@ 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");


@@ -338,18 +348,20 @@ 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()
 
 // Create a new application object: this macro will allow wxWidgets to create
 END_EVENT_TABLE()
 
 // Create a new application object: this macro will allow wxWidgets to create


@@ -375,13 +387,13 @@ bool MyApp::OnInit()
                                  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;

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


@@ -394,7 +406,7 @@ bool MyApp::OnInit()
 
 // 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;


@@ -406,7 +418,7 @@ 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();


@@ -439,7 +451,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     execMenu->Append(Exec_DDERequest, _T("Send DDE &request...\tCtrl-R"));
 #endif
 
     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...


@@ -452,7 +464,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() )


@@ -471,8 +483,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))


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

-    wxMessageBox(_T("Exec wxWidgets 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);
 }
 


@@ -669,11 +681,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:


@@ -783,8 +795,13 @@ void MyFrame::OnFileExec(wxCommandEvent& WXUNUSED(event))
 {
     static wxString s_filename;
 
 {
     static wxString s_filename;
 

-    wxString filename = wxLoadFileSelector(_T(""), _T(""), s_filename);
-    if ( !filename )
+    wxString filename;
+
+#if wxUSE_FILEDLG
+    filename = wxLoadFileSelector(wxEmptyString, wxEmptyString, s_filename);
+#endif // wxUSE_FILEDLG
+
+    if ( filename.empty() )

         return;
 
     s_filename = filename;
         return;
 
     s_filename = filename;


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

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

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


@@ -823,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))


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

-    wxConnectionBase *conn = client.MakeConnection(_T(""), 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'."),


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

-    wxConnectionBase *conn = client.MakeConnection(_T(""), 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'."),


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

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

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


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

-        hasInput = TRUE;
+        hasInput = true;

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


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

-        hasInput = TRUE;
+        hasInput = true;

     }
 
     return hasInput;
     }
 
     return hasInput;


@@ -1011,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);


@@ -1020,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();


@@ -1033,33 +1050,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);


@@ -1067,18 +1096,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');

 
 

-    m_textOut->SetValue(m_in.ReadLine());
+        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();
+}
+
+void MyPipeFrame::DisableOutput()
+{
+    FindWindow(Exec_Btn_Get)->Disable();

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


@@ -1099,10 +1186,13 @@ void MyPipeFrame::OnClose(wxCloseEvent& event)
 
 void MyPipeFrame::OnProcessTerm(wxProcessEvent& WXUNUSED(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();

 }
 }