X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5489a9a1fa6779df7edd32d27582c5e544ba04dd..081fcce3ba1647a7bf739a55a1432ebf3c676128:/src/cocoa/utils.cpp diff --git a/src/cocoa/utils.cpp b/src/cocoa/utils.cpp index ba082d0a32..c2112fc552 100644 --- a/src/cocoa/utils.cpp +++ b/src/cocoa/utils.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: utils.cpp +// Name: src/cocoa/utils.cpp // Purpose: Various utilities // Author: AUTHOR // Modified by: @@ -9,9 +9,14 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#include "wx/setup.h" +#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" @@ -49,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)