warn the user about using getters of objects in invalid state

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

diff --git a/src/unix/baseunix.cpp b/src/unix/baseunix.cpp
index 822a55bcb6db25e93cbd48ae367768dbb3de52ef..c5e3ddcee1b2436200f609699b37b266d0818930 100644 (file)
--- a/src/unix/baseunix.cpp
+++ b/src/unix/baseunix.cpp
@@ -32,6 +32,9 @@
 
 #include "wx/apptrait.h"
 #include "wx/unix/execute.h"
 
 #include "wx/apptrait.h"
 #include "wx/unix/execute.h"

+#include "wx/evtloop.h"
+#include "wx/gsocket.h"
+

 #include "wx/unix/private/timer.h"
 
 // for waitpid()
 #include "wx/unix/private/timer.h"
 
 // for waitpid()


@@ -42,50 +45,45 @@
 // wxConsoleAppTraits implementation
 // ============================================================================
 
 // wxConsoleAppTraits implementation
 // ============================================================================
 

-// ----------------------------------------------------------------------------
-// wxExecute support
-// ----------------------------------------------------------------------------
-
-bool wxConsoleAppTraits::CreateEndProcessPipe(wxExecuteData& WXUNUSED(data))
-{
-    // nothing to do, so always ok
-    return true;
-}
-
-bool
-wxConsoleAppTraits::IsWriteFDOfEndProcessPipe(wxExecuteData& WXUNUSED(data),
-                                              int WXUNUSED(fd))
-{
-    // we don't have any pipe
-    return false;
-}
-
-void
-wxConsoleAppTraits::DetachWriteFDOfEndProcessPipe(wxExecuteData& WXUNUSED(data))
-{
-    // nothing to do
-}
-
-

 int
 wxConsoleAppTraits::WaitForChild(wxExecuteData& execData)
 {
 int
 wxConsoleAppTraits::WaitForChild(wxExecuteData& execData)
 {

-    wxASSERT_MSG( execData.flags & wxEXEC_SYNC,
-                  wxT("async execution not supported yet") );
-

     int exitcode = 0;
     int exitcode = 0;

-    if ( waitpid(execData.pid, &exitcode, 0) == -1 || !WIFEXITED(exitcode) )
+    if ( execData.flags & wxEXEC_SYNC )
+    {
+        if ( waitpid(execData.pid, &exitcode, 0) == -1 || !WIFEXITED(exitcode) )
+        {
+            wxLogSysError(_("Waiting for subprocess termination failed"));
+        }
+    }
+    else // asynchronous execution

     {
     {

-        wxLogSysError(_("Waiting for subprocess termination failed"));
+        wxEndProcessData *endProcData = new wxEndProcessData;
+        endProcData->process  = execData.process;
+        endProcData->pid      = execData.pid;
+        endProcData->tag = wxAddProcessCallback
+                           (
+                             endProcData,
+                             execData.pipeEndProcDetect.Detach(wxPipe::Read)
+                           );
+
+        execData.pipeEndProcDetect.Close();
+        exitcode = execData.pid;
+

     }
 
     return exitcode;
 }
 
     }
 
     return exitcode;
 }
 

-wxTimerImpl*
-wxConsoleAppTraits::CreateTimerImpl(wxTimer *timer)
+#if wxUSE_TIMER
+
+wxTimerImpl *wxConsoleAppTraits::CreateTimerImpl(wxTimer *timer)

 {
     // this doesn't work yet as there is no main loop in console applications
     // (but it will be added later)
     return new wxUnixTimerImpl(timer);
 }
 {
     // this doesn't work yet as there is no main loop in console applications
     // (but it will be added later)
     return new wxUnixTimerImpl(timer);
 }

+
+#endif // wxUSE_TIMER
+
+//  Note: wxConsoleAppTraits::CreateEventLoop() is defined in evtloopunix.cpp!