X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/db1d019338d8c11c90360e49eacc3cdc4bfb2b43..13ab552e4d5a6fbc443825eadba12d81f2b3f5be:/src/unix/baseunix.cpp diff --git a/src/unix/baseunix.cpp b/src/unix/baseunix.cpp index d77d5891bd..8f63455618 100644 --- 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: @@ -27,10 +27,10 @@ #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() @@ -81,46 +81,3 @@ wxConsoleAppTraits::WaitForChild(wxExecuteData& execData) return exitcode; } -// ---------------------------------------------------------------------------- -// misc other stuff -// ---------------------------------------------------------------------------- - -// this is in mac/utils.cpp under Mac -#ifndef __WXMAC__ - -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__ -