Making wxUSE_WEBKIT for optionally building wxWebKitCtrl.

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

diff --git a/samples/exec/exec.cpp b/samples/exec/exec.cpp
index 43858fa326dd5c993ead90fdf0386eb239dbcafd..ab5d6a9acc41307e2d4af14cc4ca35ddc10cb255 100644 (file)
--- a/samples/exec/exec.cpp
+++ b/samples/exec/exec.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

     #pragma implementation "exec.cpp"
     #pragma interface "exec.cpp"
 #endif
     #pragma implementation "exec.cpp"
     #pragma interface "exec.cpp"
 #endif


@@ -30,9 +30,10 @@
 #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/panel.h"
 
     #include "wx/frame.h"
     #include "wx/panel.h"
 


@@ -54,6 +55,7 @@
 #endif
 
 #include "wx/txtstrm.h"
 #endif
 
 #include "wx/txtstrm.h"

+#include "wx/numdlg.h"

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


@@ -82,7 +84,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


@@ -175,7 +177,7 @@ private:
     // the idle event wake up timer
     wxTimer m_timerIdleWakeUp;
 
     // the idle event wake up timer
     wxTimer m_timerIdleWakeUp;
 

-    // any class wishing to process wxWindows events must use this macro
+    // any class wishing to process wxWidgets events must use this macro

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 


@@ -191,9 +193,9 @@ 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 OnBtnGet(wxCommandEvent& WXUNUSED(event)) { DoGet(); }

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


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

-        m_out.WriteString(m_textIn->GetValue() + '\n');
+        m_out.WriteString(m_textIn->GetValue() + _T('\n'));

         m_textIn->Clear();
 
         DoGet();
         m_textIn->Clear();
 
         DoGet();


@@ -306,10 +308,10 @@ enum
 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)


@@ -336,21 +338,21 @@ 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)
     EVT_BUTTON(Exec_Btn_Get, MyPipeFrame::OnBtnGet)
 
 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_CLOSE(MyPipeFrame::OnClose)
 

-    EVT_END_PROCESS(-1, MyPipeFrame::OnProcessTerm)
+    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


@@ -369,26 +371,30 @@ 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_timerIdleWakeUp(this)
 {
     m_pidLast = 0;


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


@@ -455,7 +461,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
 }
 


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


@@ -476,7 +482,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-2002 Vadim Zeitlin"),
+    wxMessageBox(_T("Exec wxWidgets Sample\n© 2000-2002 Vadim Zeitlin"),

                  _T("About Exec"), wxOK | wxICON_INFORMATION, this);
 }
 
                  _T("About Exec"), wxOK | wxICON_INFORMATION, this);
 }
 


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


@@ -741,7 +747,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,


@@ -773,7 +779,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;
 


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


@@ -842,7 +848,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'."),


@@ -868,7 +874,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'."),


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

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

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


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

-        hasInput = TRUE;
+        hasInput = true;

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


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

-        hasInput = TRUE;
+        hasInput = true;

     }
 
     return hasInput;
     }
 
     return hasInput;


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


@@ -1027,7 +1033,7 @@ 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_in(*process->GetInputStream()),
              m_process(process),
              // in a real program we'd check that the streams are !NULL here
              m_in(*process->GetInputStream()),


@@ -1035,13 +1041,13 @@ MyPipeFrame::MyPipeFrame(wxFrame *parent,
 {
     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_textIn = new wxTextCtrl(panel, wxID_ANY, _T(""),

                               wxDefaultPosition, wxDefaultSize,
                               wxTE_PROCESS_ENTER);
                               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);
 
     wxSizer *sizerTop = new wxBoxSizer(wxVERTICAL);
     sizerTop->Add(m_textIn, 0, wxGROW | wxALL, 5);


@@ -1091,7 +1097,7 @@ void MyPipeFrame::OnClose(wxCloseEvent& event)
     event.Skip();
 }
 
     event.Skip();
 }
 

-void MyPipeFrame::OnProcessTerm(wxProcessEvent& event)
+void MyPipeFrame::OnProcessTerm(wxProcessEvent& WXUNUSED(event))

 {
     delete m_process;
     m_process = NULL;
 {
     delete m_process;
     m_process = NULL;