Applied patch [ 1194316 ] wxMediaCtrl MSW config and setup cleanup

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

diff --git a/src/common/process.cpp b/src/common/process.cpp
index cffb5f85693ff86c36c5c83073429cb02ece5f02..518549e660f8571cb89841f3f3e22227fb64fb47 100644 (file)
--- a/src/common/process.cpp
+++ b/src/common/process.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

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

     #pragma implementation "process.h"
 #endif
 
     #pragma implementation "process.h"
 #endif
 


@@ -47,6 +47,15 @@ IMPLEMENT_DYNAMIC_CLASS(wxProcessEvent, wxEvent)
 // wxProcess creation
 // ----------------------------------------------------------------------------
 
 // 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 )
 void wxProcess::Init(wxEvtHandler *parent, int id, int flags)
 {
     if ( parent )


@@ -142,10 +151,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 +166,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 +175,7 @@ bool wxProcess::Exists(int pid)
             // fall through
 
         case wxKILL_NO_PROCESS:
             // fall through
 
         case wxKILL_NO_PROCESS:

-            return FALSE;
+            return false;

     }
 }
 
     }
 }