X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/906c935a80b10d53cecf57f71ab5f3f4f1d529ec..bb996f289574defb0ae4339ae8e46ff3cf6fa54c:/src/osx/carbon/utilscocoa.mm?ds=sidebyside diff --git a/src/osx/carbon/utilscocoa.mm b/src/osx/carbon/utilscocoa.mm index dc4248f3c7..a4c9ba8016 100644 --- a/src/osx/carbon/utilscocoa.mm +++ b/src/osx/carbon/utilscocoa.mm @@ -11,6 +11,10 @@ #include "wx/wxprec.h" +#ifndef WX_PRECOMP +#include "wx/object.h" +#endif + #if wxOSX_USE_COCOA_OR_CARBON #include #else @@ -189,7 +193,7 @@ WX_NSFont wxFont::OSXCreateNSFont(wxOSXSystemFont font, wxNativeFontInfo* info) } static inline double DegToRad(double deg) { return (deg * M_PI) / 180.0; } -static const NSAffineTransformStruct kSlantNSTransformStruct = { 1, 0, tan(DegToRad(11)), 1, 0, 0 }; +static const NSAffineTransformStruct kSlantNSTransformStruct = { 1, 0, static_cast(tan(DegToRad(11))), 1, 0, 0 }; WX_NSFont wxFont::OSXCreateNSFont(const wxNativeFontInfo* info) { @@ -339,6 +343,19 @@ WX_UIFont wxFont::OSXCreateUIFont(const wxNativeFontInfo* info) return uiFont; } +#endif + +// ---------------------------------------------------------------------------- +// NSWindow Utils +// ---------------------------------------------------------------------------- + +#if wxOSX_USE_COCOA + +WXWindow wxOSXGetMainWindow() +{ + return [NSApp mainWindow]; +} + #endif // ---------------------------------------------------------------------------- // NSImage Utils