RegisterAdditionalEditors() to work even if no wxPropertyGrids created, in sample...

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

diff --git a/src/common/process.cpp b/src/common/process.cpp
index 6e6a931c2f4626d9d78c5cc64fe3f96b7f3b20da..36764bf2f5ff16a1921883a6ec8dc7897bbf436d 100644 (file)
--- a/src/common/process.cpp
+++ b/src/common/process.cpp
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "process.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -53,6 +49,7 @@ void wxProcess::Init(wxEvtHandler *parent, int id, int flags)
         SetNextHandler(parent);
 
     m_id         = id;
         SetNextHandler(parent);
 
     m_id         = id;

+    m_pid        = 0;

     m_redirect   = (flags & wxPROCESS_REDIRECT) != 0;
 
 #if wxUSE_STREAMS
     m_redirect   = (flags & wxPROCESS_REDIRECT) != 0;
 
 #if wxUSE_STREAMS


@@ -67,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);
 {
     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;
     }
 
     {
         // couldn't launch the process
         delete process;
         return NULL;
     }
 

+    process->SetPid(pid);
+

     return process;
 }
 
     return process;
 }
 


@@ -142,10 +142,10 @@ bool wxProcess::IsErrorAvailable() const
 // ----------------------------------------------------------------------------
 
 /* static */
 // ----------------------------------------------------------------------------
 
 /* static */

-wxKillError wxProcess::Kill(int pid, wxSignal sig)
+wxKillError wxProcess::Kill(int pid, wxSignal sig, int flags)

 {
     wxKillError rc;
 {
     wxKillError rc;

-    (void)wxKill(pid, sig, &rc);
+    (void)wxKill(pid, sig, &rc, flags);

 
     return rc;
 }
 
     return rc;
 }


@@ -157,7 +157,7 @@ bool wxProcess::Exists(int pid)
     {
         case wxKILL_OK:
         case wxKILL_ACCESS_DENIED:
     {
         case wxKILL_OK:
         case wxKILL_ACCESS_DENIED:

-            return TRUE;
+            return true;

 
         default:
         case wxKILL_ERROR:
 
         default:
         case wxKILL_ERROR:


@@ -166,7 +166,7 @@ bool wxProcess::Exists(int pid)
             // fall through
 
         case wxKILL_NO_PROCESS:
             // fall through
 
         case wxKILL_NO_PROCESS:

-            return FALSE;
+            return false;

     }
 }
 
     }
 }