replace wxAddProcessCallback() with wxAppTraits::AddProcessCallback() to fix linking...

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

diff --git a/src/unix/baseunix.cpp b/src/unix/baseunix.cpp
index 16aa2c8c5850da1b9a78475e6a61bc332f4ddb5d..cce400bf2039df1a857ca7359a8575905dc569c5 100644 (file)
--- a/src/unix/baseunix.cpp
+++ b/src/unix/baseunix.cpp
@@ -30,9 +30,10 @@
     #include "wx/utils.h"
 #endif //WX_PRECOMP
 
-#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()
@@ -43,55 +44,8 @@
 // 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)
-{
-    wxASSERT_MSG( execData.flags & wxEXEC_SYNC,
-                  wxT("async execution not supported yet") );
-
-    int exitcode = 0;
-    if ( waitpid(execData.pid, &exitcode, 0) == -1 || !WIFEXITED(exitcode) )
-    {
-        wxLogSysError(_("Waiting for subprocess termination failed"));
-    }
-
-    return exitcode;
-}
-
-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);
-}
+#if wxUSE_TIMER
 
-wxEventLoopBase *wxConsoleAppTraits::CreateEventLoop()
-{
-    return new wxEventLoop();
-}
+#endif // wxUSE_TIMER
 
+//  Note: wxConsoleAppTraits::CreateEventLoop() is defined in evtloopunix.cpp!