X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/324899f6c5fa0e052dc718b9b37fc6f557dc78ba..4ac725a3b3cc829e39c91173aaeb61132d4a231c:/src/unix/baseunix.cpp diff --git a/src/unix/baseunix.cpp b/src/unix/baseunix.cpp index bd40653d6f..d77d5891bd 100644 --- a/src/unix/baseunix.cpp +++ b/src/unix/baseunix.cpp @@ -6,7 +6,7 @@ // Created: 23.06.2003 // RCS-ID: $Id$ // Copyright: (c) 2003 Vadim Zeitlin -// License: wxWindows license +// License: wxWindows licence /////////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -92,11 +92,24 @@ wxToolkitInfo& wxConsoleAppTraits::GetToolkitInfo() { static wxToolkitInfo info; int major, minor; - char name[256]; - if ( sscanf(WXWIN_OS_DESCRIPTION, "%255s %d.%d", name, &major, &minor) != 3 ) + FILE *f = popen("uname -r", "r"); + if (f) { - // unreckognized uname string format + 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; }