X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2739d4f0528b324700973169b67750107568bf12..9cb0c458c4601f444437f7e816efe654158eaf90:/src/unix/baseunix.cpp?ds=inline

diff --git a/src/unix/baseunix.cpp b/src/unix/baseunix.cpp
index d28b5225c0..01d4281e9d 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,15 @@
 #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>
@@ -80,32 +85,15 @@ wxConsoleAppTraits::WaitForChild(wxExecuteData& execData)
     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
+#if wxUSE_TIMER
 
-int wxConsoleAppTraits::GetOSVersion(int *verMaj, int *verMin)
+wxTimerImpl *wxConsoleAppTraits::CreateTimerImpl(wxTimer *timer)
 {
-    int major, minor;
-    char name[256];
-
-    if ( sscanf(WXWIN_OS_DESCRIPTION, "%.255s %d.%d", name, &major, &minor) != 3 )
-    {
-        // unreckognized uname string format
-        major =
-        minor = -1;
-    }
-
-    if ( verMaj )
-        *verMaj = major;
-    if ( verMin )
-        *verMin = minor;
-
-    return wxUNIX;
+    // 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!