X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a24aff654fb10971e82abccc1b56217d556d447b..a290fa5a7deebe9d96c0c0089d18e27d4bd9b624:/src/cocoa/utils.cpp diff --git a/src/cocoa/utils.cpp b/src/cocoa/utils.cpp index 14c47ad65c..ef9413bec6 100644 --- a/src/cocoa/utils.cpp +++ b/src/cocoa/utils.cpp @@ -12,6 +12,8 @@ #include "wx/setup.h" #include "wx/utils.h" #include "wx/app.h" +#include "wx/apptrait.h" +#include "wx/display.h" #include @@ -21,9 +23,18 @@ #include // Get size of display +size_t wxDisplayBase::GetCount() +{ + return 1; +} + void wxDisplaySize(int *width, int *height) { // TODO + if(width) + *width = 1024; + if(height) + *height = 768; } void wxDisplaySizeMM(int*,int*) @@ -44,10 +55,13 @@ void wxClientDisplayRect(int *x,int *y,int *width,int *height) *height=768; } -int wxGetOsVersion(int *majorVsn, int *minorVsn) +wxToolkitInfo& wxGUIAppTraits::GetToolkitInfo() { - // TODO - 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 @@ -76,7 +90,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