Some compile fixes.

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

diff --git a/src/mac/carbon/dcclient.cpp b/src/mac/carbon/dcclient.cpp
index 970370092b8a16ea3c53d561ceb130898a0ff389..bd03115cb5b455720e7972f23b328349a52c0d3e 100644 (file)
--- a/src/mac/carbon/dcclient.cpp
+++ b/src/mac/carbon/dcclient.cpp
@@ -121,9 +121,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,7 +130,6 @@ wxWindowDC::wxWindowDC(wxWindow *window)
     if ( cg == NULL )
     {
         SetGraphicsContext( wxGraphicsContext::Create( window ) ) ;
-        SetDeviceOrigin( x, y );
     }
     else
     {
@@ -150,6 +146,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() ) ;
@@ -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;          
@@ -250,11 +252,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 +314,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 ) ;