Forgot header with OSX prefix

[wxWidgets.git] / src / common / process.cpp

diff --git a/src/common/process.cpp b/src/common/process.cpp
index 2e32b8cd744b74edf8ddbba3bb62a4a073cb3330..bdeccf9923dc5d781bfa5bec89c3cb8b847f8652 100644 (file)
--- a/src/common/process.cpp
+++ b/src/common/process.cpp
@@ -30,7 +30,7 @@
 // event tables and such
 // ----------------------------------------------------------------------------
 
-DEFINE_EVENT_TYPE(wxEVT_END_PROCESS)
+wxDEFINE_EVENT( wxEVT_END_PROCESS, wxProcessEvent )
 
 IMPLEMENT_DYNAMIC_CLASS(wxProcess, wxEvtHandler)
 IMPLEMENT_DYNAMIC_CLASS(wxProcessEvent, wxEvent)
@@ -43,21 +43,13 @@ IMPLEMENT_DYNAMIC_CLASS(wxProcessEvent, wxEvent)
 // wxProcess creation
 // ----------------------------------------------------------------------------
 
-#if WXWIN_COMPATIBILITY_2_2
-
-wxProcess::wxProcess(wxEvtHandler *parent, bool redirect)
-{
-    Init(parent, wxID_ANY, redirect ? wxPROCESS_REDIRECT : wxPROCESS_DEFAULT);
-}
-
-#endif // WXWIN_COMPATIBILITY_2_2
-
 void wxProcess::Init(wxEvtHandler *parent, int id, int flags)
 {
     if ( parent )
         SetNextHandler(parent);
 
     m_id         = id;
+    m_pid        = 0;
     m_redirect   = (flags & wxPROCESS_REDIRECT) != 0;
 
 #if wxUSE_STREAMS
@@ -72,13 +64,16 @@ wxProcess *wxProcess::Open(const wxString& cmd, int flags)
 {
     wxASSERT_MSG( !(flags & wxEXEC_SYNC), wxT("wxEXEC_SYNC should not be used." ));
     wxProcess *process = new wxProcess(wxPROCESS_REDIRECT);
-    if ( !wxExecute(cmd, flags, process) )
+    long pid = wxExecute(cmd, flags, process);
+    if( !pid )
     {
         // couldn't launch the process
         delete process;
         return NULL;
     }
 
+    process->SetPid(pid);
+
     return process;
 }