X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8df6de970d7b4e4bc1f8701d1f3ab1adedde8f00..1d57de48588afa27a9df2026b830e6cd5b858b5d:/src/unix/baseunix.cpp

diff --git a/src/unix/baseunix.cpp b/src/unix/baseunix.cpp
index ef7f1e1f9d..cce400bf20 100644
--- a/src/unix/baseunix.cpp
+++ b/src/unix/baseunix.cpp
@@ -1,12 +1,12 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        unix/baseunix.cpp
+// Name:        src/unix/baseunix.cpp
 // Purpose:     misc stuff only used in console applications under Unix
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     23.06.2003
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
-// License:     wxWindows license
+// License:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -27,10 +27,14 @@
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/intl.h"
+    #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()
 #include <sys/types.h>
@@ -40,72 +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;
-}
-
-// ----------------------------------------------------------------------------
-// misc other stuff
-// ----------------------------------------------------------------------------
-
-// WXWIN_OS_DESCRIPTION is normally defined by configure
-#if defined( __MWERKS__ ) && defined(__MACH__)
-    #define WXWIN_OS_DESCRIPTION "MacOS X"
-#endif
-
-int wxConsoleAppTraits::GetOSVersion(int *verMaj, int *verMin)
-{
-    int major, minor;
-    char name[256];
-
-    if ( sscanf(WXWIN_OS_DESCRIPTION, "%s %d.%d", name, &major, &minor) != 3 )
-    {
-        // unreckognized uname string format
-        major =
-        minor = -1;
-    }
-
-    if ( verMaj )
-        *verMaj = major;
-    if ( verMin )
-        *verMin = minor;
+#if wxUSE_TIMER
 
-    return wxUNIX;
-}
+#endif // wxUSE_TIMER
 
+//  Note: wxConsoleAppTraits::CreateEventLoop() is defined in evtloopunix.cpp!