X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4fcb208a4fdd14091d122f9630c18335b8c2c2d3..71a09c3579dd5cb4cd8fa7fdc143561cbff74e12:/src/osx/carbon/dcscreen.cpp

diff --git a/src/osx/carbon/dcscreen.cpp b/src/osx/carbon/dcscreen.cpp
index 3f0d549ce3..81761d364d 100644
--- a/src/osx/carbon/dcscreen.cpp
+++ b/src/osx/carbon/dcscreen.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -16,7 +15,9 @@
 
 #include "wx/osx/private.h"
 #include "wx/graphics.h"
+#if wxOSX_USE_COCOA_OR_CARBON
 #include "wx/osx/private/glgrab.h"
+#endif
 
 IMPLEMENT_ABSTRACT_CLASS(wxScreenDCImpl, wxWindowDCImpl)
 
@@ -28,12 +29,17 @@ IMPLEMENT_ABSTRACT_CLASS(wxScreenDCImpl, wxWindowDCImpl)
 wxScreenDCImpl::wxScreenDCImpl( wxDC *owner ) :
    wxWindowDCImpl( owner )
 {
-#if wxOSX_USE_COCOA_OR_IPHONE
-    m_graphicContext = NULL;
-    m_ok = false ;
-#else
+#if wxOSX_USE_COCOA_OR_CARBON
     CGRect cgbounds ;
     cgbounds = CGDisplayBounds(CGMainDisplayID());
+    m_width = (wxCoord)cgbounds.size.width;
+    m_height = (wxCoord)cgbounds.size.height;
+#else
+    wxDisplaySize( &m_width, &m_height );
+#endif
+#if wxOSX_USE_COCOA_OR_IPHONE
+    SetGraphicsContext( wxGraphicsContext::Create() );
+#else
     Rect bounds;
     bounds.top = (short)cgbounds.origin.y;
     bounds.left = (short)cgbounds.origin.x;
@@ -43,52 +49,67 @@ wxScreenDCImpl::wxScreenDCImpl( wxDC *owner ) :
     CreateNewWindow( kOverlayWindowClass, overlayAttributes, &bounds, (WindowRef*) &m_overlayWindow );
     ShowWindow((WindowRef)m_overlayWindow);
     SetGraphicsContext( wxGraphicsContext::CreateFromNativeWindow( m_overlayWindow ) );
-    m_width = (wxCoord)cgbounds.size.width;
-    m_height = (wxCoord)cgbounds.size.height;
-    m_ok = true ;
 #endif
+    m_ok = true ;
 }
 
 wxScreenDCImpl::~wxScreenDCImpl()
 {
-    delete m_graphicContext;
-    m_graphicContext = NULL;
+    wxDELETE(m_graphicContext);
 #if wxOSX_USE_COCOA_OR_IPHONE
 #else
     DisposeWindow((WindowRef) m_overlayWindow );
 #endif
 }
 
+#if wxOSX_USE_IPHONE
+// Apple has allowed usage of this API as of 15th Dec 2009w
+extern CGImageRef UIGetScreenImage();
+#endif
+
+// TODO Switch to CGWindowListCreateImage for 10.5 and above
+
 wxBitmap wxScreenDCImpl::DoGetAsBitmap(const wxRect *subrect) const
 {
-    CGRect srcRect = CGRectMake(0, 0, m_width, m_height);
-    if (subrect)
-    {
-        srcRect.origin.x = subrect->GetX();
-        srcRect.origin.y = subrect->GetY();
-        srcRect.size.width = subrect->GetWidth();
-        srcRect.size.height = subrect->GetHeight();
-    }
-    
-    wxBitmap bmp = wxBitmap(srcRect.size.width, srcRect.size.height, 32);
-    
+    wxRect rect = subrect ? *subrect : wxRect(0, 0, m_width, m_height);
+
+    wxBitmap bmp(rect.GetSize(), 32);
+
+#if !wxOSX_USE_IPHONE
+    CGRect srcRect = CGRectMake(rect.x, rect.y, rect.width, rect.height);
+
     CGContextRef context = (CGContextRef)bmp.GetHBITMAP();
-    
+
     CGContextSaveGState(context);
-    
+
     CGContextTranslateCTM( context, 0,  m_height );
     CGContextScaleCTM( context, 1, -1 );
-    
+
     if ( subrect )
         srcRect = CGRectOffset( srcRect, -subrect->x, -subrect->y ) ;
+
+    CGImageRef image = NULL;
     
-    CGImageRef image = grabViaOpenGL(kCGNullDirectDisplay, srcRect);
-    
+#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."));
-    
+
     CGContextDrawImage(context, srcRect, image);
-    
-    CGContextRestoreGState(context);
 
+    CGImageRelease(image);
+
+    CGContextRestoreGState(context);
+#else
+    // TODO implement using UIGetScreenImage, CGImageCreateWithImageInRect, CGContextDrawImage
+#endif
     return bmp;
 }