Add some version checks to help compiling on OSX.

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

diff --git a/src/common/process.cpp b/src/common/process.cpp
index 36764bf2f5ff16a1921883a6ec8dc7897bbf436d..210068e955d73170945b274bd0f47e3f63d5af8d 100644 (file)
--- a/src/common/process.cpp
+++ b/src/common/process.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        process.cpp
+// Name:        src/common/process.cpp

 // Purpose:     Process termination classes
 // Author:      Guilhem Lavaux
 // Modified by: Vadim Zeitlin to check error codes, added Detach() method
 // Purpose:     Process termination classes
 // Author:      Guilhem Lavaux
 // Modified by: Vadim Zeitlin to check error codes, added Detach() method


@@ -30,7 +30,7 @@
 // event tables and such
 // ----------------------------------------------------------------------------
 
 // 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)
 
 IMPLEMENT_DYNAMIC_CLASS(wxProcess, wxEvtHandler)
 IMPLEMENT_DYNAMIC_CLASS(wxProcessEvent, wxEvent)


@@ -102,7 +102,13 @@ void wxProcess::OnTerminate(int pid, int status)
 
 void wxProcess::Detach()
 {
 
 void wxProcess::Detach()
 {

-    SetNextHandler(NULL);
+    // we just detach from the next handler of the chain (i.e. our "parent" -- see ctor)
+    // not also from the previous handler like wxEvtHandler::Unlink() would do:
+
+    if (m_nextHandler)
+        m_nextHandler->SetPreviousHandler(m_previousHandler);
+
+    m_nextHandler = NULL;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -162,7 +168,7 @@ bool wxProcess::Exists(int pid)
         default:
         case wxKILL_ERROR:
         case wxKILL_BAD_SIGNAL:
         default:
         case wxKILL_ERROR:
         case wxKILL_BAD_SIGNAL:

-            wxFAIL_MSG( _T("unexpected wxProcess::Kill() return code") );
+            wxFAIL_MSG( wxT("unexpected wxProcess::Kill() return code") );

             // fall through
 
         case wxKILL_NO_PROCESS:
             // fall through
 
         case wxKILL_NO_PROCESS: