check that the version of __sync_sub_and_fetch that returns a value is supported...

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

diff --git a/src/unix/baseunix.cpp b/src/unix/baseunix.cpp
index 77466c6560ae147901df566bf5a2bba8907bb9c8..f675818f4327fd7b5023e268aa73ae7f4eb0263c 100644 (file)
--- a/src/unix/baseunix.cpp
+++ b/src/unix/baseunix.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        unix/baseunix.cpp
+// Name:        src/unix/baseunix.cpp

 // Purpose:     misc stuff only used in console applications under Unix
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     misc stuff only used in console applications under Unix
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -27,11 +27,14 @@
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/intl.h"
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/intl.h"

+    #include "wx/utils.h"

 #endif //WX_PRECOMP
 
 #include "wx/apptrait.h"
 #endif //WX_PRECOMP
 
 #include "wx/apptrait.h"

-#include "wx/utils.h"

 #include "wx/unix/execute.h"
 #include "wx/unix/execute.h"

+#include "wx/evtloop.h"
+
+#include "wx/unix/private/timer.h"

 
 // for waitpid()
 #include <sys/types.h>
 
 // for waitpid()
 #include <sys/types.h>


@@ -81,46 +84,15 @@ wxConsoleAppTraits::WaitForChild(wxExecuteData& execData)
     return exitcode;
 }
 
     return exitcode;
 }
 

-// ----------------------------------------------------------------------------
-// misc other stuff
-// ----------------------------------------------------------------------------
-
-// this is in mac/utils.cpp under Mac and MGL
-#if !defined(__WXMAC__) && !defined(__WXMGL__)
+#if wxUSE_TIMER

 
 

-wxToolkitInfo& wxConsoleAppTraits::GetToolkitInfo()
+wxTimerImpl *wxConsoleAppTraits::CreateTimerImpl(wxTimer *timer)

 {
 {

-    static wxToolkitInfo info;
-    int major, minor;
-
-    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;
-    }
-
-    info.versionMajor = major;
-    info.versionMinor = minor;
-    info.name = _T("wxBase");
-    info.os = wxUNIX;
-
-    return info;
+    // 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 // __WXMAC__
+#endif // wxUSE_TIMER

 
 

+//  Note: wxConsoleAppTraits::CreateEventLoop() is defined in evtloopunix.cpp!