]> git.saurik.com Git - wxWidgets.git/commitdiff
adding new API needed for screenshots as old method stopped working in 10.7
authorStefan Csomor <csomor@advancedconcepts.ch>
Mon, 25 Jun 2012 15:23:50 +0000 (15:23 +0000)
committerStefan Csomor <csomor@advancedconcepts.ch>
Mon, 25 Jun 2012 15:23:50 +0000 (15:23 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71859 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/osx/carbon/dcscreen.cpp

index cbd90382e90d0ea553585f4c83bd878cc216aa2b..c413eb1fe0cac12786e516f453272186ae347459 100644 (file)
@@ -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."));