From 0476fe3d738ecb159be31b80b3f8fe8deb545890 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Mon, 25 Jun 2012 15:23:50 +0000 Subject: [PATCH] adding new API needed for screenshots as old method stopped working in 10.7 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71859 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/osx/carbon/dcscreen.cpp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/osx/carbon/dcscreen.cpp b/src/osx/carbon/dcscreen.cpp index cbd90382e9..c413eb1fe0 100644 --- a/src/osx/carbon/dcscreen.cpp +++ b/src/osx/carbon/dcscreen.cpp @@ -89,7 +89,18 @@ wxBitmap wxScreenDCImpl::DoGetAsBitmap(const wxRect *subrect) const if ( subrect ) srcRect = CGRectOffset( srcRect, -subrect->x, -subrect->y ) ; - CGImageRef image = grabViaOpenGL(kCGNullDirectDisplay, srcRect); + CGImageRef image = NULL; + +#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6 + if ( UMAGetSystemVersion() >= 10.6) + { + image = CGDisplayCreateImage(kCGDirectMainDisplay); + } + else +#endif + { + image = grabViaOpenGL(kCGNullDirectDisplay, srcRect); + } wxASSERT_MSG(image, wxT("wxScreenDC::GetAsBitmap - unable to get screenshot.")); -- 2.47.2