GetColumnTextValue() can't return a reference to a temporary string, so changed it...

[wxWidgets.git] / src / mac / carbon / dcclient.cpp

diff --git a/src/mac/carbon/dcclient.cpp b/src/mac/carbon/dcclient.cpp
index 07304d1ecdaab5d8a38da903001d8c78bfa24e7a..9fcd763bb8548e9ee2f607705d9328fa28b777d7 100644 (file)
--- a/src/mac/carbon/dcclient.cpp
+++ b/src/mac/carbon/dcclient.cpp
@@ -23,6 +23,8 @@
     #include "wx/region.h"
 #endif
 
+#include "wx/graphics.h"
+#include "wx/rawbmp.h"
 #include "wx/mac/private.h"
 
 //-----------------------------------------------------------------------------
@@ -110,6 +112,9 @@ static wxBrush MacGetBackgroundBrush( wxWindow* window )
 wxWindowDC::wxWindowDC()
 {
     m_window = NULL ;
+#if wxMAC_USE_CORE_GRAPHICS
+    m_release = false;
+#endif
 }
 
 wxWindowDC::wxWindowDC(wxWindow *window)
@@ -119,27 +124,35 @@ wxWindowDC::wxWindowDC(wxWindow *window)
     if (!rootwindow)
         return;
 
-    WindowRef windowref = (WindowRef) rootwindow->MacGetWindowRef() ;
-    int x , y ;
-    x = y = 0 ;
-    window->MacWindowToRootWindow( &x , &y ) ;
     m_ok = true ;
 
 #if wxMAC_USE_CORE_GRAPHICS
     m_window->GetSize( &m_width , &m_height);
-       CGContextRef cg = (CGContextRef) window->MacGetCGContextRef();
-       m_release = false;
+    CGContextRef cg = (CGContextRef) window->MacGetCGContextRef();
+    m_release = false;
     if ( cg == NULL )
-               SetGraphicsContext( wxGraphicsContext::Create( window ) ) ;
-       else
-               SetGraphicsContext( wxGraphicsContext::CreateFromNative( cg ) );
-       m_graphicContext->SetPen( m_pen ) ;
-       m_graphicContext->SetBrush( m_brush ) ;
-       SetClippingRegion( 0 , 0 , m_width , m_height ) ;
+    {
+        SetGraphicsContext( wxGraphicsContext::Create( window ) ) ;
+    }
+    else
+    {
+        CGContextSaveGState( cg );
+        m_release = true ;
+        // make sure the context is having its origin at the wx-window coordinates of the
+        // view (read at the top of window.cpp about the differences)
+        if ( window->MacGetLeftBorderSize() != 0 || window->MacGetTopBorderSize() != 0 )
+            CGContextTranslateCTM( cg , -window->MacGetLeftBorderSize() , -window->MacGetTopBorderSize() );
+
+        SetGraphicsContext( wxGraphicsContext::CreateFromNative( cg ) );
+    }
+    SetClippingRegion( 0 , 0 , m_width , m_height ) ;
 #else
-       m_macLocalOrigin.x = x ;
-       m_macLocalOrigin.y = y ;
-    m_macPort = UMAGetWindowPort( windowref ) ;
+    int x , y ;
+    x = y = 0 ;
+    window->MacWindowToRootWindow( &x , &y ) ;
+    m_macLocalOrigin.x = x ;
+    m_macLocalOrigin.y = y ;
+    m_macPort = UMAGetWindowPort( (WindowRef) rootwindow->MacGetWindowRef() ) ;
 
     CopyRgn( (RgnHandle) window->MacGetVisibleRegion(true).GetWXHRGN() , (RgnHandle) m_macBoundaryClipRgn ) ;
     OffsetRgn( (RgnHandle) m_macBoundaryClipRgn , m_macLocalOrigin.x , m_macLocalOrigin.y ) ;
@@ -153,27 +166,80 @@ wxWindowDC::wxWindowDC(wxWindow *window)
 wxWindowDC::~wxWindowDC()
 {
 #if wxMAC_USE_CORE_GRAPHICS
-       if ( m_release && m_graphicContext )
-       {
-//             CGContextRef cg = (CGContextRef) m_graphicContext->GetNativeContext() ;
-       }
+    if ( m_release )
+    {
+        // this must not necessarily be the current context, we must restore the state of the
+        // cg we started with above (before the CGContextTranslateCTM call)
+        CGContextRef cg = (CGContextRef) m_window->MacGetCGContextRef();
+        CGContextRestoreGState(cg);
+    }
 #endif
 }
 
 void wxWindowDC::DoGetSize( int* width, int* height ) const
 {
-    wxCHECK_RET( m_window, _T("GetSize() doesn't work without window") );
-
 #if wxMAC_USE_CORE_GRAPHICS
-       if ( width )
-               *width = m_width;
-       if ( height )
-               *height = m_height;
+    if ( width )
+        *width = m_width;
+    if ( height )
+        *height = m_height;
 #else
+    wxCHECK_RET( m_window, _T("GetSize() doesn't work without window") );
     m_window->GetSize(width, height);
 #endif
 }
 
+wxBitmap wxWindowDC::DoGetAsBitmap(const wxRect *subrect) const
+{
+    ControlRef handle = (ControlRef) m_window->GetHandle();
+    if ( !handle )
+        return wxNullBitmap;
+
+    HIRect rect;
+    CGImageRef image;
+    CGContextRef context;
+    void* data;
+
+    size_t bytesPerRow;
+
+    HIViewCreateOffscreenImage( handle, 0, &rect, &image);
+
+
+    int width = subrect != NULL ? subrect->width : (int)rect.size.width;
+    int height = subrect !=  NULL ? subrect->height : (int)rect.size.height ;
+
+    bytesPerRow = ( ( width * 8 * 4 + 7 ) / 8 );
+
+    data = calloc( 1, bytesPerRow * height );
+    context = CGBitmapContextCreate( data, width, height, 8, bytesPerRow, CGColorSpaceCreateDeviceRGB(), kCGImageAlphaPremultipliedFirst );
+
+    if ( subrect )
+        rect = CGRectOffset( rect, -subrect->x, -subrect->y ) ;
+    CGContextDrawImage( context, rect, image );
+
+    unsigned char* buffer = (unsigned char*) data;
+    wxBitmap bmp = wxBitmap(width, height, 32);
+    wxAlphaPixelData pixData(bmp, wxPoint(0,0), wxSize(width, height));
+
+    pixData.UseAlpha();
+    wxAlphaPixelData::Iterator p(pixData);
+    for (int y=0; y<height; y++) {
+        wxAlphaPixelData::Iterator rowStart = p;
+        for (int x=0; x<width; x++) {
+            unsigned char a = buffer[3];
+            p.Red()   = a; buffer++;
+            p.Green() = a; buffer++;
+            p.Blue()  = a; buffer++;
+            p.Alpha() = a; buffer++;
+            ++p;
+        }
+        p = rowStart;
+        p.OffsetY(pixData, 1);
+    }
+
+    return bmp;
+}
+
 /*
  * wxClientDC
  */
@@ -185,16 +251,12 @@ wxClientDC::wxClientDC()
 
 #if wxMAC_USE_CORE_GRAPHICS
 wxClientDC::wxClientDC(wxWindow *window) :
-       wxWindowDC( window )
+    wxWindowDC( window )
 {
     wxPoint origin = window->GetClientAreaOrigin() ;
-    wxSize size = window->GetClientSize() ;
-    int x , y ;
-    x = origin.x ;
-    y = origin.y ;
-    window->MacWindowToRootWindow( &x , &y ) ;
     m_window->GetClientSize( &m_width , &m_height);
-       SetClippingRegion( 0 , 0 , m_width , m_height ) ;
+    SetDeviceOrigin( origin.x, origin.y );
+    SetClippingRegion( 0 , 0 , m_width , m_height ) ;
 }
 #else
 wxClientDC::wxClientDC(wxWindow *window)
@@ -251,16 +313,12 @@ wxPaintDC::wxPaintDC()
 
 #if wxMAC_USE_CORE_GRAPHICS
 wxPaintDC::wxPaintDC(wxWindow *window) :
-       wxWindowDC( window )
+    wxWindowDC( window )
 {
     wxPoint origin = window->GetClientAreaOrigin() ;
-    wxSize size = window->GetClientSize() ;
-    int x , y ;
-    x = origin.x ;
-    y = origin.y ;
-    window->MacWindowToRootWindow( &x , &y ) ;
     m_window->GetClientSize( &m_width , &m_height);
-       SetClippingRegion( 0 , 0 , m_width , m_height ) ;
+    SetDeviceOrigin( origin.x, origin.y );
+    SetClippingRegion( 0 , 0 , m_width , m_height ) ;
 }
 #else
 wxPaintDC::wxPaintDC(wxWindow *window)