X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/29c99ad3597ad722ed540b1e600f3ae3afe0f872..61d457caae3e33efe8e0953f79c4a94e366b22d7:/src/mac/utils.cpp diff --git a/src/mac/utils.cpp b/src/mac/utils.cpp index ae2d5b4140..24ebec8676 100644 --- a/src/mac/utils.cpp +++ b/src/mac/utils.cpp @@ -218,18 +218,29 @@ static int DoGetOSVersion(int *majorVsn, int *minorVsn) #endif } -int wxConsoleAppTraits::GetOSVersion(int *majorVsn, int *minorVsn) +wxToolkitInfo& wxConsoleAppTraits::GetToolkitInfo() { - return DoGetOSVersion(majorVsn, minorVsn); + static wxToolkitInfo info; + info.os = DoGetOSVersion(&info.majorVersion, &info.minorVersion); + info.name = _T("wxBase"); + return info; } #endif // wxUSE_BASE #if wxUSE_GUI -int wxGUIAppTraits::GetOSVersion(int *majorVsn, int *minorVsn) +wxToolkitInfo& wxGUIAppTraits::GetToolkitInfo() { - return DoGetOSVersion(majorVsn, minorVsn); + static wxToolkitInfo info; + info.os = DoGetOSVersion(&info.majorVersion, &info.minorVersion); + info.shortName = _T("mac"); + info.name = _T("wxMac"); +#ifdef __WXUNIVERSAL__ + info.shortName << _T("univ"); + info.name << _T("/wxUniversal"); +#endif + return info; } // Reading and writing resources (eg WIN.INI, .Xdefaults)