Added null checks to wxTextObjectData::GetDataHere and GetDataSize [ patch 1237326 ]

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

diff --git a/src/common/process.cpp b/src/common/process.cpp
index 4ef1fb157ab9e65b8b34961bb4b4a62d4da091ed..518549e660f8571cb89841f3f3e22227fb64fb47 100644 (file)
--- a/src/common/process.cpp
+++ b/src/common/process.cpp
@@ -47,6 +47,15 @@ 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 )
@@ -142,10 +151,10 @@ bool wxProcess::IsErrorAvailable() const
 // ----------------------------------------------------------------------------
 
 /* static */
-wxKillError wxProcess::Kill(int pid, wxSignal sig)
+wxKillError wxProcess::Kill(int pid, wxSignal sig, int flags)
 {
     wxKillError rc;
-    (void)wxKill(pid, sig, &rc);
+    (void)wxKill(pid, sig, &rc, flags);
 
     return rc;
 }