Rename delegates to try and stop name clashes, probably with wxWebKitCtrl.

[wxWidgets.git] / src / unix / apptraits.cpp

diff --git a/src/unix/apptraits.cpp b/src/unix/apptraits.cpp
index 97c34373078c9a3da50c2cfbfe744838d3337ae6..a2698eef66a928c5e54d6f45a2de30cafb2f5e0e 100644 (file)
--- a/src/unix/apptraits.cpp
+++ b/src/unix/apptraits.cpp
@@ -23,10 +23,12 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#include "wx/apptrait.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

+    #include "wx/utils.h"

 #endif // WX_PRECOMP
 
 #endif // WX_PRECOMP
 

-#include "wx/apptrait.h"

 #include "wx/unix/execute.h"
 
 // ============================================================================
 #include "wx/unix/execute.h"
 
 // ============================================================================


@@ -47,19 +49,13 @@ int wxGUIAppTraits::WaitForChild(wxExecuteData& execData)
     // to process the GUI events while waiting for the child termination
 
     wxEndProcessData endProcData;
     // to process the GUI events while waiting for the child termination
 
     wxEndProcessData endProcData;

-
-    // we may have process for capturing the program output, but it's
-    // not used in wxEndProcessData in the case of sync execution
-    endProcData.process = NULL;
-
-    // sync execution: indicate it by negating the pid
-    endProcData.pid = -execData.pid;
-
+    endProcData.pid = execData.pid;

     endProcData.tag = AddProcessCallback
                       (
                          &endProcData,
                          execData.GetEndProcReadFD()
                       );
     endProcData.tag = AddProcessCallback
                       (
                          &endProcData,
                          execData.GetEndProcReadFD()
                       );

+    endProcData.async = false;

 
 
     // prepare to wait for the child termination: show to the user that we're
 
 
     // prepare to wait for the child termination: show to the user that we're