Add dependency on tabmdi.h

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

diff --git a/src/mac/carbon/dcclient.cpp b/src/mac/carbon/dcclient.cpp
index 8f815eee528e1a3f4d7285abe7397e5f5d531183..27164c2c9ec538bee99c931a48e521664feacdb5 100644 (file)
--- a/src/mac/carbon/dcclient.cpp
+++ b/src/mac/carbon/dcclient.cpp
@@ -112,6 +112,9 @@ static wxBrush MacGetBackgroundBrush( wxWindow* window )
 wxWindowDC::wxWindowDC()
 {
     m_window = NULL ;
 wxWindowDC::wxWindowDC()
 {
     m_window = NULL ;

+#if wxMAC_USE_CORE_GRAPHICS
+    m_release = false;
+#endif

 }
 
 wxWindowDC::wxWindowDC(wxWindow *window)
 }
 
 wxWindowDC::wxWindowDC(wxWindow *window)


@@ -121,9 +124,6 @@ wxWindowDC::wxWindowDC(wxWindow *window)
     if (!rootwindow)
         return;
 
     if (!rootwindow)
         return;
 

-    int x , y ;
-    x = y = 0 ;
-    window->MacWindowToRootWindow( &x , &y ) ;

     m_ok = true ;
 
 #if wxMAC_USE_CORE_GRAPHICS
     m_ok = true ;
 
 #if wxMAC_USE_CORE_GRAPHICS


@@ -138,17 +138,18 @@ wxWindowDC::wxWindowDC(wxWindow *window)
     {
         CGContextSaveGState( cg );
         m_release = true ;
     {
         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() );
 
         SetGraphicsContext( wxGraphicsContext::CreateFromNative( cg ) );
     }
         // 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 ) );
     }

-    m_graphicContext->SetPen( m_pen ) ;
-    m_graphicContext->SetBrush( m_brush ) ;

     SetClippingRegion( 0 , 0 , m_width , m_height ) ;
 #else
     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() ) ;
     m_macLocalOrigin.x = x ;
     m_macLocalOrigin.y = y ;
     m_macPort = UMAGetWindowPort( (WindowRef) rootwindow->MacGetWindowRef() ) ;


@@ -165,11 +166,12 @@ wxWindowDC::wxWindowDC(wxWindow *window)
 wxWindowDC::~wxWindowDC()
 {
 #if wxMAC_USE_CORE_GRAPHICS
 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_window->MacGetCGContextRef();
         CGContextRestoreGState(cg);

-        //CGContextRef cg = (CGContextRef) m_graphicContext->GetNativeContext() ;

     }
 #endif
 }
     }
 #endif
 }


@@ -189,36 +191,41 @@ void wxWindowDC::DoGetSize( int* width, int* height ) const
 
 wxBitmap wxWindowDC::DoGetAsBitmap(const wxRect *subrect) const
 {
 
 wxBitmap wxWindowDC::DoGetAsBitmap(const wxRect *subrect) const
 {

-    ControlRef handle = (ControlRef) m_window->GetHandle(); 
+    // wxScreenDC is derived from wxWindowDC, so a screen dc will
+    // call this method when a Blit is performed with it as a source.
+    if (!m_window)
+        return wxNullBitmap;
+        
+    ControlRef handle = (ControlRef) m_window->GetHandle();

     if ( !handle )
         return wxNullBitmap;
 
     if ( !handle )
         return wxNullBitmap;
 

-    HIRect rect;    
+    HIRect rect;

     CGImageRef image;
     CGContextRef context;
     void* data;
     CGImageRef image;
     CGContextRef context;
     void* data;

-     
+

     size_t bytesPerRow;
     size_t bytesPerRow;

-    
+

     HIViewCreateOffscreenImage( handle, 0, &rect, &image);
     HIViewCreateOffscreenImage( handle, 0, &rect, &image);

-    
-    
-    int width = subrect != NULL ? subrect->width : rect.size.width;
-    int height = subrect !=  NULL ? subrect->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 );
     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 );
 
     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));
     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++) {
     pixData.UseAlpha();
     wxAlphaPixelData::Iterator p(pixData);
     for (int y=0; y<height; y++) {


@@ -229,12 +236,12 @@ wxBitmap wxWindowDC::DoGetAsBitmap(const wxRect *subrect) const
             p.Green() = a; buffer++;
             p.Blue()  = a; buffer++;
             p.Alpha() = a; buffer++;
             p.Green() = a; buffer++;
             p.Blue()  = a; buffer++;
             p.Alpha() = a; buffer++;

-            ++p; 
+            ++p;

         }
         p = rowStart;
         p.OffsetY(pixData, 1);
     }
         }
         p = rowStart;
         p.OffsetY(pixData, 1);
     }

-    
+

     return bmp;
 }
 
     return bmp;
 }
 


@@ -252,11 +259,6 @@ wxClientDC::wxClientDC(wxWindow *window) :
     wxWindowDC( window )
 {
     wxPoint origin = window->GetClientAreaOrigin() ;
     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 ) ;
     m_window->GetClientSize( &m_width , &m_height);
     SetDeviceOrigin( origin.x, origin.y );
     SetClippingRegion( 0 , 0 , m_width , m_height ) ;


@@ -319,11 +321,6 @@ wxPaintDC::wxPaintDC(wxWindow *window) :
     wxWindowDC( window )
 {
     wxPoint origin = window->GetClientAreaOrigin() ;
     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 ) ;
     m_window->GetClientSize( &m_width , &m_height);
     SetDeviceOrigin( origin.x, origin.y );
     SetClippingRegion( 0 , 0 , m_width , m_height ) ;