X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b3dfbbc91088ab32c3aae4294a3c726fadfc5ccd..70e8e9b8f2ff7acaa8ff2e1ac7a006c01af34e0b:/src/unix/baseunix.cpp?ds=sidebyside diff --git a/src/unix/baseunix.cpp b/src/unix/baseunix.cpp index 99a1bdcd3e..8f63455618 100644 --- a/src/unix/baseunix.cpp +++ b/src/unix/baseunix.cpp @@ -1,12 +1,12 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: unix/baseunix.cpp +// Name: src/unix/baseunix.cpp // Purpose: misc stuff only used in console applications under Unix // Author: Vadim Zeitlin // Modified by: // Created: 23.06.2003 // RCS-ID: $Id$ // Copyright: (c) 2003 Vadim Zeitlin -// License: wxWindows license +// License: wxWindows licence /////////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -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,32 +81,3 @@ wxConsoleAppTraits::WaitForChild(wxExecuteData& execData) return exitcode; } -// ---------------------------------------------------------------------------- -// misc other stuff -// ---------------------------------------------------------------------------- - -// WXWIN_OS_DESCRIPTION is normally defined by configure -#if defined( __MWERKS__ ) && defined(__MACH__) - #define WXWIN_OS_DESCRIPTION "MacOS X" -#endif - -int wxConsoleAppTraits::GetOSVersion(int *verMaj, int *verMin) -{ - int major, minor; - char name[256]; - - if ( sscanf(WXWIN_OS_DESCRIPTION, "%255s %d.%d", name, &major, &minor) != 3 ) - { - // unreckognized uname string format - major = - minor = -1; - } - - if ( verMaj ) - *verMaj = major; - if ( verMin ) - *verMin = minor; - - return wxUNIX; -} -