Patch 1709108

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

diff --git a/samples/exec/exec.cpp b/samples/exec/exec.cpp
index 969f242b46d09b4d2a90dfb8c725217e167075bc..1d334c8d3d9222aae2af53ccb77b76a263b23056 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/textdlg.h"

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


@@ -102,6 +98,7 @@ public:
     void OnClear(wxCommandEvent& event);
 
     void OnSyncExec(wxCommandEvent& event);
     void OnClear(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);


@@ -110,6 +107,7 @@ public:
     void OnPOpen(wxCommandEvent& event);
 
     void OnFileExec(wxCommandEvent& event);
     void OnPOpen(wxCommandEvent& event);
 
     void OnFileExec(wxCommandEvent& event);

+    void OnOpenURL(wxCommandEvent& event);

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


@@ -303,10 +301,12 @@ enum
     Exec_Kill,
     Exec_ClearLog,
     Exec_SyncExec = 200,
     Exec_Kill,
     Exec_ClearLog,
     Exec_SyncExec = 200,

+    Exec_SyncNoEventsExec,

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

+    Exec_OpenURL,

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


@@ -335,6 +335,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(Exec_ClearLog,  MyFrame::OnClear)
 
     EVT_MENU(Exec_SyncExec, MyFrame::OnSyncExec)
     EVT_MENU(Exec_ClearLog,  MyFrame::OnClear)
 
     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)


@@ -343,6 +344,7 @@ 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_OpenURL, MyFrame::OnOpenURL)

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


@@ -387,6 +389,9 @@ 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
     MyFrame *frame = new MyFrame(_T("Exec wxWidgets sample"),
                                  wxDefaultPosition, wxSize(500, 140));
     // Create the main application window
     MyFrame *frame = new MyFrame(_T("Exec wxWidgets sample"),
                                  wxDefaultPosition, wxSize(500, 140));


@@ -423,7 +428,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();


@@ -435,6 +440,8 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     wxMenu *execMenu = new wxMenu;
     execMenu->Append(Exec_SyncExec, _T("Sync &execution...\tCtrl-E"),
                      _T("Launch a program and return when it terminates"));
     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"),


@@ -450,13 +457,15 @@ 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_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...


@@ -499,7 +508,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);
 }
 


@@ -644,6 +653,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: "),


@@ -779,6 +807,8 @@ void MyFrame::OnPOpen(wxCommandEvent& WXUNUSED(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 )
     {


@@ -800,8 +830,16 @@ 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(_T("any file"), NULL, s_filename, this);
+#else // !wxUSE_FILEDLG
+    filename = wxGetTextFromUser(_T("Enter the file name"), _T("exec sample"),
+                                 s_filename, this);
+#endif // wxUSE_FILEDLG/!wxUSE_FILEDLG
+
+    if ( filename.empty() )

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


@@ -817,7 +855,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 )
     {


@@ -829,6 +867,27 @@ void MyFrame::OnFileExec(wxCommandEvent& WXUNUSED(event))
     DoAsyncExec(cmd);
 }
 
     DoAsyncExec(cmd);
 }
 

+void MyFrame::OnOpenURL(wxCommandEvent& WXUNUSED(event))
+{
+    static wxString s_filename;
+
+    wxString filename = wxGetTextFromUser
+                        (
+                            _T("Enter the URL"),
+                            _T("exec sample"),
+                            s_filename,
+                            this
+                        );
+
+    if ( filename.empty() )
+        return;
+
+    s_filename = filename;
+
+    if ( !wxLaunchDefaultBrowser(s_filename) )
+        wxLogError(_T("Failed to open URL \"%s\""), s_filename.c_str());
+}
+

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


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


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


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


@@ -1053,22 +1112,22 @@ MyPipeFrame::MyPipeFrame(wxFrame *parent,
            : wxFrame(parent, wxID_ANY, cmd),
              m_process(process),
              // in a real program we'd check that the streams are !NULL here
            : wxFrame(parent, wxID_ANY, cmd),
              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_err(*process->GetErrorStream()),
-             m_out(*process->GetOutputStream())
+             m_err(*process->GetErrorStream())

 {
     m_process->SetNextHandler(this);
 
     wxPanel *panel = new wxPanel(this, wxID_ANY);
 
 {
     m_process->SetNextHandler(this);
 
     wxPanel *panel = new wxPanel(this, wxID_ANY);
 

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

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

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

                                wxDefaultPosition, wxDefaultSize,
                                wxTE_MULTILINE | wxTE_RICH);
     m_textIn->SetEditable(false);
                                wxDefaultPosition, wxDefaultSize,
                                wxTE_MULTILINE | wxTE_RICH);
     m_textIn->SetEditable(false);

-    m_textErr = new wxTextCtrl(panel, wxID_ANY, _T(""),
+    m_textErr = new wxTextCtrl(panel, wxID_ANY, wxEmptyString,

                                wxDefaultPosition, wxDefaultSize,
                                wxTE_MULTILINE | wxTE_RICH);
     m_textErr->SetEditable(false);
                                wxDefaultPosition, wxDefaultSize,
                                wxTE_MULTILINE | wxTE_RICH);
     m_textErr->SetEditable(false);


@@ -1098,6 +1157,7 @@ MyPipeFrame::MyPipeFrame(wxFrame *parent,
 
 void MyPipeFrame::OnBtnSendFile(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyPipeFrame::OnBtnSendFile(wxCommandEvent& WXUNUSED(event))
 {

+#if wxUSE_FILEDLG

     wxFileDialog filedlg(this, _T("Select file to send"));
     if ( filedlg.ShowModal() != wxID_OK )
         return;
     wxFileDialog filedlg(this, _T("Select file to send"));
     if ( filedlg.ShowModal() != wxID_OK )
         return;


@@ -1114,15 +1174,18 @@ void MyPipeFrame::OnBtnSendFile(wxCommandEvent& WXUNUSED(event))
     while ( len )
     {
         const size_t CHUNK_SIZE = 4096;
     while ( len )
     {
         const size_t CHUNK_SIZE = 4096;

-        size_t lenChunk = len > CHUNK_SIZE ? CHUNK_SIZE : len;
+        m_out.Write(pc, len > CHUNK_SIZE ? CHUNK_SIZE : len);

 
 

-        m_out.Write(pc, lenChunk);
+        // 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();
     }
 
         pc += lenChunk;
         len -= lenChunk;
 
         DoGet();
     }

+#endif // wxUSE_FILEDLG

 }
 
 void MyPipeFrame::DoGet()
 }
 
 void MyPipeFrame::DoGet()