X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..3d63133a5ef146494fa821c76c705e535990086a:/src/unix/baseunix.cpp?ds=inline diff --git a/src/unix/baseunix.cpp b/src/unix/baseunix.cpp index 0b03067e58..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,33 +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; - char name[256]; - - if ( sscanf(WXWIN_OS_DESCRIPTION, "%255s %d.%d", name, &major, &minor) != 3 ) - { - // unreckognized uname string format - major = - minor = -1; - } - - info.versionMajor = major; - info.versionMinor = minor; - info.name = _T("wxBase"); - info.os = wxUNIX; - - return info; -} - -#endif // __WXMAC__ -