Show labels for controls in wxOSX/Carbon toolbars.

[wxWidgets.git] / src / osx / carbon / dcscreen.cpp

diff --git a/src/osx/carbon/dcscreen.cpp b/src/osx/carbon/dcscreen.cpp
index e544aa4ae4654e750d330a98162d4d7ca1600bd5..6bb57f78b340ca1100e5fe4468a5d0f2ce42eeb6 100644 (file)
--- a/src/osx/carbon/dcscreen.cpp
+++ b/src/osx/carbon/dcscreen.cpp
@@ -16,6 +16,9 @@
 
 #include "wx/osx/private.h"
 #include "wx/graphics.h"
 
 #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)
 
 
 IMPLEMENT_ABSTRACT_CLASS(wxScreenDCImpl, wxWindowDCImpl)
 


@@ -27,12 +30,17 @@ IMPLEMENT_ABSTRACT_CLASS(wxScreenDCImpl, wxWindowDCImpl)
 wxScreenDCImpl::wxScreenDCImpl( wxDC *owner ) :
    wxWindowDCImpl( owner )
 {
 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());
     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;
     Rect bounds;
     bounds.top = (short)cgbounds.origin.y;
     bounds.left = (short)cgbounds.origin.x;


@@ -42,10 +50,8 @@ wxScreenDCImpl::wxScreenDCImpl( wxDC *owner ) :
     CreateNewWindow( kOverlayWindowClass, overlayAttributes, &bounds, (WindowRef*) &m_overlayWindow );
     ShowWindow((WindowRef)m_overlayWindow);
     SetGraphicsContext( wxGraphicsContext::CreateFromNativeWindow( m_overlayWindow ) );
     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
 #endif

+    m_ok = true ;

 }
 
 wxScreenDCImpl::~wxScreenDCImpl()
 }
 
 wxScreenDCImpl::~wxScreenDCImpl()


@@ -57,3 +63,35 @@ wxScreenDCImpl::~wxScreenDCImpl()
     DisposeWindow((WindowRef) m_overlayWindow );
 #endif
 }
     DisposeWindow((WindowRef) m_overlayWindow );
 #endif
 }

+
+// TODO Switch to CGWindowListCreateImage for 10.5 and above
+
+wxBitmap wxScreenDCImpl::DoGetAsBitmap(const wxRect *subrect) const
+{
+    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 = grabViaOpenGL(kCGNullDirectDisplay, srcRect);
+
+    wxASSERT_MSG(image, wxT("wxScreenDC::GetAsBitmap - unable to get screenshot."));
+
+    CGContextDrawImage(context, srcRect, image);
+
+    CGContextRestoreGState(context);
+#endif
+    return bmp;
+}