X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8498a2858b50bb96947f367b495835793107e5cc..69199aad025095def4b42214f7b44829397caf52:/src/cocoa/utils.cpp diff --git a/src/cocoa/utils.cpp b/src/cocoa/utils.cpp index e3bb09c2fc..c2112fc552 100644 --- a/src/cocoa/utils.cpp +++ b/src/cocoa/utils.cpp @@ -12,7 +12,11 @@ #include "wx/wxprec.h" #include "wx/utils.h" -#include "wx/app.h" + +#ifndef WX_PRECOMP + #include "wx/app.h" +#endif // WX_PRECOMP + #include "wx/apptrait.h" #include "wx/display.h" @@ -50,13 +54,12 @@ void wxClientDisplayRect(int *x,int *y,int *width,int *height) *height=768; } -wxToolkitInfo& wxGUIAppTraits::GetToolkitInfo() +wxPortId wxGUIAppTraits::GetToolkitVersion(int *verMaj, int *verMin) const { - static wxToolkitInfo info; - info.shortName = _T("cocoa"); - info.name = _T("wxCocoa"); - // TODO: Finish this - return info; + // We suppose that toolkit version is the same as OS version under Mac + wxGetOsVersion(verMaj, verMin); + + return wxPORT_COCOA; } wxWindow* wxFindWindowAtPoint(const wxPoint& pt)