X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ba7c420af0041f3e8485580a0b18e8927592f758..2aa24b607061a398d0876b87e695f4f9dc531cb2:/src/cocoa/utils.cpp diff --git a/src/cocoa/utils.cpp b/src/cocoa/utils.cpp index 6f0cbfae94..0f59261522 100644 --- a/src/cocoa/utils.cpp +++ b/src/cocoa/utils.cpp @@ -13,6 +13,7 @@ #include "wx/utils.h" #include "wx/app.h" #include "wx/apptrait.h" +#include "wx/display.h" #include @@ -21,7 +22,6 @@ #include #include -// Get size of display void wxDisplaySize(int *width, int *height) { // TODO @@ -49,13 +49,13 @@ void wxClientDisplayRect(int *x,int *y,int *width,int *height) *height=768; } -int wxGUIAppTraits::GetOSVersion(int *verMaj, int *verMin) +wxToolkitInfo& wxGUIAppTraits::GetToolkitInfo() { - if(verMaj) - *verMaj=0; - if(verMin) - *verMin=0; - return 0; + static wxToolkitInfo info; + info.shortName = _T("cocoa"); + info.name = _T("wxCocoa"); + // TODO: Finish this + return info; } // Return TRUE if we have a colour display @@ -84,7 +84,7 @@ void wxBell() } #if 0 -// DFE: These aren't even implemented by wxGTK, and no wxWindows code calls +// DFE: These aren't even implemented by wxGTK, and no wxWidgets code calls // them. If someone needs them, then they'll get a link error // Consume all events until no more left