X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c64c9cd3ba5c5aa5d1cc0b59e9b78fd66650bc58..5f547a582e954f0ade36014e24eedcdb353f1020:/src/mac/carbon/dcclient.cpp?ds=sidebyside

diff --git a/src/mac/carbon/dcclient.cpp b/src/mac/carbon/dcclient.cpp
index 970370092b..db6a1c5e72 100644
--- a/src/mac/carbon/dcclient.cpp
+++ b/src/mac/carbon/dcclient.cpp
@@ -112,6 +112,7 @@ static wxBrush MacGetBackgroundBrush( wxWindow* window )
 wxWindowDC::wxWindowDC()
 {
     m_window = NULL ;
+    m_release = false;
 }
 
 wxWindowDC::wxWindowDC(wxWindow *window)
@@ -121,9 +122,6 @@ wxWindowDC::wxWindowDC(wxWindow *window)
     if (!rootwindow)
         return;
 
-    int x , y ;
-    x = y = 0 ;
-    window->MacWindowToRootWindow( &x , &y ) ;
     m_ok = true ;
 
 #if wxMAC_USE_CORE_GRAPHICS
@@ -133,13 +131,12 @@ wxWindowDC::wxWindowDC(wxWindow *window)
     if ( cg == NULL )
     {
         SetGraphicsContext( wxGraphicsContext::Create( window ) ) ;
-        SetDeviceOrigin( x, y );
     }
     else
     {
         CGContextSaveGState( cg );
         m_release = true ;
-        // make sure the context is having its origin at the wx-window coordinates of the 
+        // 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() );
@@ -150,6 +147,9 @@ wxWindowDC::wxWindowDC(wxWindow *window)
     m_graphicContext->SetBrush( m_brush ) ;
     SetClippingRegion( 0 , 0 , m_width , m_height ) ;
 #else
+    int x , y ;
+    x = y = 0 ;
+    window->MacWindowToRootWindow( &x , &y ) ;
     m_macLocalOrigin.x = x ;
     m_macLocalOrigin.y = y ;
     m_macPort = UMAGetWindowPort( (WindowRef) rootwindow->MacGetWindowRef() ) ;
@@ -166,11 +166,12 @@ wxWindowDC::wxWindowDC(wxWindow *window)
 wxWindowDC::~wxWindowDC()
 {
 #if wxMAC_USE_CORE_GRAPHICS
-    if ( m_release && m_graphicContext )
+    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);
-        //CGContextRef cg = (CGContextRef) m_graphicContext->GetNativeContext() ;
     }
 #endif
 }
@@ -188,35 +189,38 @@ void wxWindowDC::DoGetSize( int* width, int* height ) const
 #endif
 }
 
-wxBitmap wxWindowDC::DoGetAsBitmap() const
+wxBitmap wxWindowDC::DoGetAsBitmap(const wxRect *subrect) const
 {
-    ControlRef handle = (ControlRef) m_window->GetHandle(); 
+    ControlRef handle = (ControlRef) m_window->GetHandle();
     if ( !handle )
         return wxNullBitmap;
 
-    HIRect rect;    
+    HIRect rect;
     CGImageRef image;
     CGContextRef context;
     void* data;
-     
+
     size_t bytesPerRow;
-    
+
     HIViewCreateOffscreenImage( handle, 0, &rect, &image);
-    
-    int width = rect.size.width;
-    int height = rect.size.height; 
-    
+
+
+    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;          
+    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++) {
@@ -227,12 +231,12 @@ wxBitmap wxWindowDC::DoGetAsBitmap() const
             p.Green() = a; buffer++;
             p.Blue()  = a; buffer++;
             p.Alpha() = a; buffer++;
-            ++p; 
+            ++p;
         }
         p = rowStart;
         p.OffsetY(pixData, 1);
     }
-    
+
     return bmp;
 }
 
@@ -250,11 +254,6 @@ wxClientDC::wxClientDC(wxWindow *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);
     SetDeviceOrigin( origin.x, origin.y );
     SetClippingRegion( 0 , 0 , m_width , m_height ) ;
@@ -317,11 +316,6 @@ wxPaintDC::wxPaintDC(wxWindow *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);
     SetDeviceOrigin( origin.x, origin.y );
     SetClippingRegion( 0 , 0 , m_width , m_height ) ;