more compilation fixes after pen/brush styles changes

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

diff --git a/src/unix/baseunix.cpp b/src/unix/baseunix.cpp
index c5e3ddcee1b2436200f609699b37b266d0818930..cce400bf2039df1a857ca7359a8575905dc569c5 100644 (file)
--- a/src/unix/baseunix.cpp
+++ b/src/unix/baseunix.cpp
@@ -30,7 +30,6 @@
     #include "wx/utils.h"
 #endif //WX_PRECOMP
 
     #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/execute.h"
 #include "wx/evtloop.h"
 #include "wx/gsocket.h"


@@ -45,45 +44,8 @@
 // wxConsoleAppTraits implementation
 // ============================================================================
 
 // wxConsoleAppTraits implementation
 // ============================================================================
 

-int
-wxConsoleAppTraits::WaitForChild(wxExecuteData& execData)
-{
-    int exitcode = 0;
-    if ( execData.flags & wxEXEC_SYNC )
-    {
-        if ( waitpid(execData.pid, &exitcode, 0) == -1 || !WIFEXITED(exitcode) )
-        {
-            wxLogSysError(_("Waiting for subprocess termination failed"));
-        }
-    }
-    else // asynchronous execution
-    {
-        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;
-}
-

 #if wxUSE_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);
-}
-

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