///////////////////////////////////////////////////////////////////////////////
-// Name: unix/baseunix.cpp
+// Name: src/unix/baseunix.cpp
// Purpose: misc stuff only used in console applications under Unix
// Author: Vadim Zeitlin
// Modified by:
#ifndef WX_PRECOMP
#include "wx/log.h"
#include "wx/intl.h"
+ #include "wx/utils.h"
#endif //WX_PRECOMP
#include "wx/apptrait.h"
-#include "wx/utils.h"
#include "wx/unix/execute.h"
// for waitpid()
return exitcode;
}
-// ----------------------------------------------------------------------------
-// misc other stuff
-// ----------------------------------------------------------------------------
-
-// this is in mac/utils.cpp under Mac and MGL
-#if !defined(__WXMAC__) && !defined(__WXMGL__)
-
-wxToolkitInfo& wxConsoleAppTraits::GetToolkitInfo()
-{
- 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;
-}
-
-#endif // __WXMAC__
-