subrect blit

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42649 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/mac/carbon/dcclient.h b/include/wx/mac/carbon/dcclient.h
index 2817c20a9a4c1592f3fa67b5b19639f98078ffbb..b743ea79180aeda92c6b903cb1815b7434a8d990 100644 (file)
--- a/include/wx/mac/carbon/dcclient.h
+++ b/include/wx/mac/carbon/dcclient.h
@@ -35,7 +35,7 @@ class WXDLLEXPORT wxWindowDC: public wxDC
   wxWindow *GetWindow() const { return m_window; }
   protected :
     virtual void DoGetSize( int *width, int *height ) const;
-    virtual wxBitmap DoGetAsBitmap() const; 
+    virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const; 
     wxWindow     *m_window;
 #if wxMAC_USE_CORE_GRAPHICS
        bool            m_release;

diff --git a/src/mac/carbon/dcclient.cpp b/src/mac/carbon/dcclient.cpp
index 970370092b8a16ea3c53d561ceb130898a0ff389..8f815eee528e1a3f4d7285abe7397e5f5d531183 100644 (file)
--- a/src/mac/carbon/dcclient.cpp
+++ b/src/mac/carbon/dcclient.cpp
@@ -133,7 +133,6 @@ wxWindowDC::wxWindowDC(wxWindow *window)
     if ( cg == NULL )
     {
         SetGraphicsContext( wxGraphicsContext::Create( window ) ) ;
-        SetDeviceOrigin( x, y );
     }
     else
     {
@@ -188,7 +187,7 @@ 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(); 
     if ( !handle )
@@ -203,14 +202,17 @@ wxBitmap wxWindowDC::DoGetAsBitmap() const
     
     HIViewCreateOffscreenImage( handle, 0, &rect, &image);
     
-    int width = rect.size.width;
-    int height = rect.size.height; 
+    
+    int width = subrect != NULL ? subrect->width : rect.size.width;
+    int height = subrect !=  NULL ? subrect->height : 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;