fix memory leak in wxScreenDC, fixes #13249

[wxWidgets.git] / src / osx / carbon / graphics.cpp

diff --git a/src/osx/carbon/graphics.cpp b/src/osx/carbon/graphics.cpp
index 4fc5c9f572f2006d924afe38f1a03a9c4e1324ce..0b845f0afa4fde552e5797cefbba057738d737f7 100644 (file)
--- a/src/osx/carbon/graphics.cpp
+++ b/src/osx/carbon/graphics.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        src/osx/carbon/dccg.cpp
+// Name:        src/osx/carbon/graphics.cpp

 // Purpose:     wxDC class
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     wxDC class
 // Author:      Stefan Csomor
 // Modified by:


@@ -225,7 +225,7 @@ class ImagePattern : public wxMacCoreGraphicsPattern
 public :
     ImagePattern( const wxBitmap* bmp , const CGAffineTransform& transform )
     {
 public :
     ImagePattern( const wxBitmap* bmp , const CGAffineTransform& transform )
     {

-        wxASSERT( bmp && bmp->Ok() );
+        wxASSERT( bmp && bmp->IsOk() );

 #ifdef __WXMAC__
         Init( (CGImageRef) bmp->CreateCGImage() , transform );
 #endif
 #ifdef __WXMAC__
         Init( (CGImageRef) bmp->CreateCGImage() , transform );
 #endif


@@ -500,7 +500,7 @@ wxMacCoreGraphicsPenData::wxMacCoreGraphicsPenData( wxGraphicsRenderer* renderer
         case wxPENSTYLE_STIPPLE:
             {
                 wxBitmap* bmp = pen.GetStipple();
         case wxPENSTYLE_STIPPLE:
             {
                 wxBitmap* bmp = pen.GetStipple();

-                if ( bmp && bmp->Ok() )
+                if ( bmp && bmp->IsOk() )

                 {
                     m_colorSpace.reset( CGColorSpaceCreatePattern( NULL ) );
                     m_pattern.reset( (CGPatternRef) *( new ImagePattern( bmp , CGAffineTransformMakeScale( 1,-1 ) ) ) );
                 {
                     m_colorSpace.reset( CGColorSpaceCreatePattern( NULL ) );
                     m_pattern.reset( (CGPatternRef) *( new ImagePattern( bmp , CGAffineTransformMakeScale( 1,-1 ) ) ) );


@@ -647,7 +647,7 @@ wxMacCoreGraphicsColour::wxMacCoreGraphicsColour( const wxBrush &brush )
     {
         // now brush is a bitmap
         wxBitmap* bmp = brush.GetStipple();
     {
         // now brush is a bitmap
         wxBitmap* bmp = brush.GetStipple();

-        if ( bmp && bmp->Ok() )
+        if ( bmp && bmp->IsOk() )

         {
             m_isPattern = true;
             m_patternColorComponents = new CGFloat[1] ;
         {
             m_isPattern = true;
             m_patternColorComponents = new CGFloat[1] ;


@@ -1390,9 +1390,6 @@ public:
 
     void Init();
 
 
     void Init();
 

-    // returns the size of the graphics context in device coordinates
-    virtual void GetSize( wxDouble* width, wxDouble* height);
-

     virtual void StartPage( wxDouble width, wxDouble height );
 
     virtual void EndPage();
     virtual void StartPage( wxDouble width, wxDouble height );
 
     virtual void EndPage();


@@ -1460,6 +1457,9 @@ public:
 
     virtual bool ShouldOffset() const
     {
 
     virtual bool ShouldOffset() const
     {

+        if ( !m_enableOffset )
+            return false;
+        

         int penwidth = 0 ;
         if ( !m_pen.IsNull() )
         {
         int penwidth = 0 ;
         if ( !m_pen.IsNull() )
         {


@@ -1506,8 +1506,6 @@ private:
 #endif
     bool m_contextSynthesized;
     CGAffineTransform m_windowTransform;
 #endif
     bool m_contextSynthesized;
     CGAffineTransform m_windowTransform;

-    wxDouble m_width;
-    wxDouble m_height;

     bool m_invisible;
 
 #if wxOSX_USE_COCOA_OR_CARBON
     bool m_invisible;
 
 #if wxOSX_USE_COCOA_OR_CARBON


@@ -1590,6 +1588,7 @@ wxMacCoreGraphicsContext::wxMacCoreGraphicsContext( wxGraphicsRenderer* renderer
 {
     Init();
     m_windowRef = window;
 {
     Init();
     m_windowRef = window;

+    m_enableOffset = true;

 }
 #endif
 
 }
 #endif
 


@@ -1597,6 +1596,7 @@ wxMacCoreGraphicsContext::wxMacCoreGraphicsContext( wxGraphicsRenderer* renderer
 {
     Init();
 
 {
     Init();
 

+    m_enableOffset = true;

     wxSize sz = window->GetSize();
     m_width = sz.x;
     m_height = sz.y;
     wxSize sz = window->GetSize();
     m_width = sz.x;
     m_height = sz.y;


@@ -1644,12 +1644,6 @@ wxMacCoreGraphicsContext::~wxMacCoreGraphicsContext()
     SetNativeContext(NULL);
 }
 
     SetNativeContext(NULL);
 }
 

-void wxMacCoreGraphicsContext::GetSize( wxDouble* width, wxDouble* height)
-{
-    *width = m_width;
-    *height = m_height;
-}
-

 
 void wxMacCoreGraphicsContext::StartPage( wxDouble width, wxDouble height )
 {
 
 void wxMacCoreGraphicsContext::StartPage( wxDouble width, wxDouble height )
 {


@@ -1709,16 +1703,10 @@ bool wxMacCoreGraphicsContext::EnsureIsValid()
         if ( m_cgContext )
         {
             CGContextSaveGState( m_cgContext );
         if ( m_cgContext )
         {
             CGContextSaveGState( m_cgContext );

-            CGContextConcatCTM( m_cgContext, m_windowTransform );
-            CGContextSetTextMatrix( m_cgContext, CGAffineTransformIdentity );
-            m_contextSynthesized = true;

 #if wxOSX_USE_COCOA_OR_CARBON
             if ( m_clipRgn.get() )
             {
 #if wxOSX_USE_COCOA_OR_CARBON
             if ( m_clipRgn.get() )
             {

-                // the clip region is in device coordinates, so we convert this again to user coordinates

                 wxCFRef<HIMutableShapeRef> hishape( HIShapeCreateMutableCopy( m_clipRgn ) );
                 wxCFRef<HIMutableShapeRef> hishape( HIShapeCreateMutableCopy( m_clipRgn ) );

-                CGPoint transformedOrigin = CGPointApplyAffineTransform( CGPointZero,m_windowTransform);
-                HIShapeOffset( hishape, -transformedOrigin.x, -transformedOrigin.y );

                 // if the shape is empty, HIShapeReplacePathInCGContext doesn't work
                 if ( HIShapeIsEmpty(hishape))
                 {
                 // if the shape is empty, HIShapeReplacePathInCGContext doesn't work
                 if ( HIShapeIsEmpty(hishape))
                 {


@@ -1732,6 +1720,9 @@ bool wxMacCoreGraphicsContext::EnsureIsValid()
                 }
             }
 #endif
                 }
             }
 #endif

+            CGContextConcatCTM( m_cgContext, m_windowTransform );
+            CGContextSetTextMatrix( m_cgContext, CGAffineTransformIdentity );
+            m_contextSynthesized = true;

             CGContextSaveGState( m_cgContext );
 
 #if 0 // turn on for debugging of clientdc
             CGContextSaveGState( m_cgContext );
 
 #if 0 // turn on for debugging of clientdc


@@ -1961,6 +1952,7 @@ void wxMacCoreGraphicsContext::Clip( wxDouble x, wxDouble y, wxDouble w, wxDoubl
         // the clipping itself must be stored as device coordinates, otherwise
         // we cannot apply it back correctly
         r.origin= CGPointApplyAffineTransform( r.origin, m_windowTransform );
         // the clipping itself must be stored as device coordinates, otherwise
         // we cannot apply it back correctly
         r.origin= CGPointApplyAffineTransform( r.origin, m_windowTransform );

+        r.size= CGSizeApplyAffineTransform(r.size, m_windowTransform);

         m_clipRgn.reset(HIShapeCreateWithRect(&r));
 #else
     // allow usage as measuring context
         m_clipRgn.reset(HIShapeCreateWithRect(&r));
 #else
     // allow usage as measuring context


@@ -2181,7 +2173,7 @@ void wxMacCoreGraphicsContext::DrawBitmap( const wxGraphicsBitmap &bmp, wxDouble
     CGRect r = CGRectMake( (CGFloat) x , (CGFloat) y , (CGFloat) w , (CGFloat) h );
     if ( refdata->IsMonochrome() == 1 )
     {
     CGRect r = CGRectMake( (CGFloat) x , (CGFloat) y , (CGFloat) w , (CGFloat) h );
     if ( refdata->IsMonochrome() == 1 )
     {

-        // is is a mask, the '1' in the mask tell where to draw the current brush
+        // is a mask, the '1' in the mask tell where to draw the current brush

         if (  !m_brush.IsNull() )
         {
             if ( ((wxMacCoreGraphicsBrushData*)m_brush.GetRefData())->IsShading() )
         if (  !m_brush.IsNull() )
         {
             if ( ((wxMacCoreGraphicsBrushData*)m_brush.GetRefData())->IsShading() )


@@ -2387,8 +2379,8 @@ void wxMacCoreGraphicsContext::DoDrawRotatedText(const wxString &str,
         wxASSERT_MSG( status == noErr , wxT("couldn't measure the rotated text") );
 
         Rect rect;
         wxASSERT_MSG( status == noErr , wxT("couldn't measure the rotated text") );
 
         Rect rect;

-        x += (int)(sin(angle) * FixedToInt(ascent));
-        y += (int)(cos(angle) * FixedToInt(ascent));
+        x += (int)(sin(angle) * FixedToFloat(ascent));
+        y += (int)(cos(angle) * FixedToFloat(ascent));

 
         status = ::ATSUMeasureTextImage( atsuLayout, kATSUFromTextBeginning, kATSUToTextEnd,
                                         IntToFixed(x) , IntToFixed(y) , &rect );
 
         status = ::ATSUMeasureTextImage( atsuLayout, kATSUFromTextBeginning, kATSUToTextEnd,
                                         IntToFixed(x) , IntToFixed(y) , &rect );


@@ -2446,13 +2438,8 @@ void wxMacCoreGraphicsContext::GetTextExtent( const wxString &str, wxDouble *wid
         wxCFRef<CFAttributedStringRef> attrtext( CFAttributedStringCreate(kCFAllocatorDefault, text, attributes) );
         wxCFRef<CTLineRef> line( CTLineCreateWithAttributedString(attrtext) );
 
         wxCFRef<CFAttributedStringRef> attrtext( CFAttributedStringCreate(kCFAllocatorDefault, text, attributes) );
         wxCFRef<CTLineRef> line( CTLineCreateWithAttributedString(attrtext) );
 

-        // round the returned extent: this is probably more correct anyhow but
-        // we also need to do it to be consistent with GetPartialTextExtents()
-        // below and avoid strange situation when the last partial extent
-        // returned by it could have been greater than the full extent returned
-        // by us
-        CGFloat a, d, l;
-        int w = CTLineGetTypographicBounds(line, &a, &d, &l) + 0.5;
+        CGFloat a, d, l, w;
+        w = CTLineGetTypographicBounds(line, &a, &d, &l);

 
         if ( height )
             *height = a+d+l;
 
         if ( height )
             *height = a+d+l;


@@ -2489,13 +2476,13 @@ void wxMacCoreGraphicsContext::GetTextExtent( const wxString &str, wxDouble *wid
                                             &textBefore , &textAfter, &textAscent , &textDescent );
 
         if ( height )
                                             &textBefore , &textAfter, &textAscent , &textDescent );
 
         if ( height )

-            *height = FixedToInt(textAscent + textDescent);
+            *height = FixedToFloat(textAscent + textDescent);

         if ( descent )
         if ( descent )

-            *descent = FixedToInt(textDescent);
+            *descent = FixedToFloat(textDescent);

         if ( externalLeading )
             *externalLeading = 0;
         if ( width )
         if ( externalLeading )
             *externalLeading = 0;
         if ( width )

-            *width = FixedToInt(textAfter - textBefore);
+            *width = FixedToFloat(textAfter - textBefore);

 
         ::ATSUDisposeTextLayout(atsuLayout);
 
 
         ::ATSUDisposeTextLayout(atsuLayout);
 


@@ -2512,7 +2499,7 @@ void wxMacCoreGraphicsContext::GetTextExtent( const wxString &str, wxDouble *wid
         *height = sz.height;
         /*
     if ( descent )
         *height = sz.height;
         /*
     if ( descent )

-        *descent = FixedToInt(textDescent);
+        *descent = FixedToFloat(textDescent);

     if ( externalLeading )
         *externalLeading = 0;
         */
     if ( externalLeading )
         *externalLeading = 0;
         */


@@ -2583,7 +2570,7 @@ void wxMacCoreGraphicsContext::GetPartialTextExtents(const wxString& text, wxArr
             if (result != noErr || actualNumberOfBounds != 1 )
                 return;
 
             if (result != noErr || actualNumberOfBounds != 1 )
                 return;
 

-            widths[pos] = FixedToInt( glyphBounds.upperRight.x - glyphBounds.upperLeft.x );
+            widths[pos] = FixedToFloat( glyphBounds.upperRight.x - glyphBounds.upperLeft.x );

             //unsigned char uch = s[i];
         }
 #else
             //unsigned char uch = s[i];
         }
 #else


@@ -2603,7 +2590,7 @@ void wxMacCoreGraphicsContext::GetPartialTextExtents(const wxString& text, wxArr
         {
             for ( int pos = 1; pos < (int)glyphCount ; pos ++ )
             {
         {
             for ( int pos = 1; pos < (int)glyphCount ; pos ++ )
             {

-                widths[pos-1] = FixedToInt( layoutRecords[pos].realPos );
+                widths[pos-1] = FixedToFloat( layoutRecords[pos].realPos );

             }
         }
 
             }
         }
 


@@ -2758,7 +2745,10 @@ wxGraphicsContext * wxMacCoreGraphicsRenderer::CreateContext( const wxWindowDC&
 
         // having a cgctx being NULL is fine (will be created on demand)
         // this is the case for all wxWindowDCs except wxPaintDC
 
         // having a cgctx being NULL is fine (will be created on demand)
         // this is the case for all wxWindowDCs except wxPaintDC

-        return new wxMacCoreGraphicsContext( this, cgctx, (wxDouble) w, (wxDouble) h );
+        wxMacCoreGraphicsContext *context = 
+            new wxMacCoreGraphicsContext( this, cgctx, (wxDouble) w, (wxDouble) h );
+        context->EnableOffset(true);
+        return context;

     }
     return NULL;
 }
     }
     return NULL;
 }


@@ -2772,8 +2762,10 @@ wxGraphicsContext * wxMacCoreGraphicsRenderer::CreateContext( const wxMemoryDC&
     {
         int w, h;
         mem_impl->GetSize( &w, &h );
     {
         int w, h;
         mem_impl->GetSize( &w, &h );

-        return new wxMacCoreGraphicsContext( this,
+        wxMacCoreGraphicsContext* context = new wxMacCoreGraphicsContext( this,

             (CGContextRef)(mem_impl->GetGraphicsContext()->GetNativeContext()), (wxDouble) w, (wxDouble) h );
             (CGContextRef)(mem_impl->GetGraphicsContext()->GetNativeContext()), (wxDouble) w, (wxDouble) h );

+        context->EnableOffset(true);
+        return context;

     }
 #endif
     return NULL;
     }
 #endif
     return NULL;


@@ -2805,7 +2797,9 @@ wxGraphicsContext * wxMacCoreGraphicsRenderer::CreateContextFromNativeContext( v
 wxGraphicsContext * wxMacCoreGraphicsRenderer::CreateContextFromNativeWindow( void * window )
 {
 #if wxOSX_USE_CARBON
 wxGraphicsContext * wxMacCoreGraphicsRenderer::CreateContextFromNativeWindow( void * window )
 {
 #if wxOSX_USE_CARBON

-    return new wxMacCoreGraphicsContext(this,(WindowRef)window);
+    wxMacCoreGraphicsContext* context = new wxMacCoreGraphicsContext(this,(WindowRef)window);
+    context->EnableOffset(true);
+    return context;

 #else
     wxUnusedVar(window);
     return NULL;
 #else
     wxUnusedVar(window);
     return NULL;


@@ -2846,7 +2840,7 @@ wxGraphicsMatrix wxMacCoreGraphicsRenderer::CreateMatrix( wxDouble a, wxDouble b
 
 wxGraphicsPen wxMacCoreGraphicsRenderer::CreatePen(const wxPen& pen)
 {
 
 wxGraphicsPen wxMacCoreGraphicsRenderer::CreatePen(const wxPen& pen)
 {

-    if ( !pen.Ok() || pen.GetStyle() == wxTRANSPARENT )
+    if ( !pen.IsOk() || pen.GetStyle() == wxTRANSPARENT )

         return wxNullGraphicsPen;
     else
     {
         return wxNullGraphicsPen;
     else
     {


@@ -2858,7 +2852,7 @@ wxGraphicsPen wxMacCoreGraphicsRenderer::CreatePen(const wxPen& pen)
 
 wxGraphicsBrush wxMacCoreGraphicsRenderer::CreateBrush(const wxBrush& brush )
 {
 
 wxGraphicsBrush wxMacCoreGraphicsRenderer::CreateBrush(const wxBrush& brush )
 {

-    if ( !brush.Ok() || brush.GetStyle() == wxTRANSPARENT )
+    if ( !brush.IsOk() || brush.GetStyle() == wxTRANSPARENT )

         return wxNullGraphicsBrush;
     else
     {
         return wxNullGraphicsBrush;
     else
     {


@@ -2870,7 +2864,7 @@ wxGraphicsBrush wxMacCoreGraphicsRenderer::CreateBrush(const wxBrush& brush )
 
 wxGraphicsBitmap wxMacCoreGraphicsRenderer::CreateBitmap( const wxBitmap& bmp )
 {
 
 wxGraphicsBitmap wxMacCoreGraphicsRenderer::CreateBitmap( const wxBitmap& bmp )
 {

-    if ( bmp.Ok() )
+    if ( bmp.IsOk() )

     {
         wxGraphicsBitmap p;
         p.SetRefData(new wxMacCoreGraphicsBitmapData( this , bmp.CreateCGImage(), bmp.GetDepth() == 1 ) );
     {
         wxGraphicsBitmap p;
         p.SetRefData(new wxMacCoreGraphicsBitmapData( this , bmp.CreateCGImage(), bmp.GetDepth() == 1 ) );


@@ -2935,7 +2929,7 @@ wxMacCoreGraphicsRenderer::CreateRadialGradientBrush(wxDouble xo, wxDouble yo,
 // sets the font
 wxGraphicsFont wxMacCoreGraphicsRenderer::CreateFont( const wxFont &font , const wxColour &col )
 {
 // sets the font
 wxGraphicsFont wxMacCoreGraphicsRenderer::CreateFont( const wxFont &font , const wxColour &col )
 {

-    if ( font.Ok() )
+    if ( font.IsOk() )

     {
         wxGraphicsFont p;
         p.SetRefData(new wxMacCoreGraphicsFontData( this , font, col ));
     {
         wxGraphicsFont p;
         p.SetRefData(new wxMacCoreGraphicsFontData( this , font, col ));