another compilation fix PCH-less build

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

diff --git a/src/unix/baseunix.cpp b/src/unix/baseunix.cpp
index de2ee2f15612a7e0c4a202da2a4a039f1af2b071..b2dacab6dd8dcf89e89f5a0f5b900a3a76b97178 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/evtloop.h"
+
+#include "wx/unix/private/timer.h"
 
 // for waitpid()
 #include <sys/types.h>
@@ -81,45 +84,22 @@ wxConsoleAppTraits::WaitForChild(wxExecuteData& execData)
     return exitcode;
 }
 
-// ----------------------------------------------------------------------------
-// misc other stuff
-// ----------------------------------------------------------------------------
+#if wxUSE_TIMER
 
-// this is in mac/utils.cpp under Mac
-#if !defined(__WXMAC__)
-
-wxToolkitInfo& wxConsoleAppTraits::GetToolkitInfo()
+wxTimerImpl *wxConsoleAppTraits::CreateTimerImpl(wxTimer *timer)
 {
-    static wxToolkitInfo info;
-    int major, minor;
+    // this doesn't work yet as there is no main loop in console applications
+    // (but it will be added later)
+    return new wxUnixTimerImpl(timer);
+}
 
-    FILE *f = popen("uname -r", "r");
-    if (f)
-    {
-        char buf[32];
-        size_t c = fread(buf, 1, sizeof(buf) - 1, f);
-        pclose(f);
-        buf[c] = '\0';
-        if ( sscanf(buf, "%d.%d", &major, &minor) != 2 )
-        {
-            // unrecognized uname string format
-            major =
-            minor = -1;
-        }
-    }
-    else
-    {
-        // failed to run uname
-        major =
-        minor = -1;
-    }
+#endif // wxUSE_TIMER
 
-    info.versionMajor = major;
-    info.versionMinor = minor;
-    info.name = _T("wxBase");
-    info.os = wxUNIX;
+#if wxUSE_CONSOLE_EVENTLOOP
 
-    return info;
+wxEventLoopBase *wxConsoleAppTraits::CreateEventLoop()
+{
+    return new wxEventLoop();
 }
 
-#endif // __WXMAC__
+#endif // wxUSE_CONSOLE_EVENTLOOP