on demand creation of native CGContexts , so that pure text measuring contexts don...

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

diff --git a/src/mac/carbon/dcprint.cpp b/src/mac/carbon/dcprint.cpp
index ce17739428f1357165e7c18c6e6eb3d312542faa..ad07cc2d94631ec8f226f1addf89976d3fe95557 100644 (file)
--- a/src/mac/carbon/dcprint.cpp
+++ b/src/mac/carbon/dcprint.cpp
@@ -27,6 +27,7 @@
 
 #include "wx/mac/uma.h"
 #include "wx/mac/private/print.h"
 
 #include "wx/mac/uma.h"
 #include "wx/mac/private/print.h"

+#include "wx/graphics.h"

 
 IMPLEMENT_CLASS(wxPrinterDC, wxDC)
 
 
 IMPLEMENT_CLASS(wxPrinterDC, wxDC)
 


@@ -94,8 +95,8 @@ wxMacCarbonPrinterDC::wxMacCarbonPrinterDC( wxPrintData* data )
     PMPrinterGetOutputResolution( printer, native->m_macPrintSettings, &res) ;
 #else
     m_err = PMGetResolution((PMPageFormat) (native->m_macPageFormat), &res);
     PMPrinterGetOutputResolution( printer, native->m_macPrintSettings, &res) ;
 #else
     m_err = PMGetResolution((PMPageFormat) (native->m_macPageFormat), &res);

-    m_ppi = wxSize(int(res.hRes), int(res.vRes));

 #endif
 #endif

+    m_ppi = wxSize(int(res.hRes), int(res.vRes));

 }
 
 wxMacCarbonPrinterDC::~wxMacCarbonPrinterDC()
 }
 
 wxMacCarbonPrinterDC::~wxMacCarbonPrinterDC()


@@ -286,8 +287,10 @@ wxPrinterDC::wxPrinterDC(const wxPrintData& printdata)
             m_mm_to_pix_y = mm2inches * sz.y;        
         }
 #if wxMAC_USE_CORE_GRAPHICS
             m_mm_to_pix_y = mm2inches * sz.y;        
         }
 #if wxMAC_USE_CORE_GRAPHICS

+/*

         // the cgContext will only be handed over page by page
         m_graphicContext = new wxMacCGContext() ;
         // the cgContext will only be handed over page by page
         m_graphicContext = new wxMacCGContext() ;

+               */

 #endif
     }
 }
 #endif
     }
 }


@@ -300,8 +303,10 @@ wxSize wxPrinterDC::GetPPI() const
 wxPrinterDC::~wxPrinterDC(void)
 {
 #if wxMAC_USE_CORE_GRAPHICS
 wxPrinterDC::~wxPrinterDC(void)
 {
 #if wxMAC_USE_CORE_GRAPHICS

+/*

     // this context was borrowed
     ((wxMacCGContext*)(m_graphicContext))->SetNativeContext( NULL ) ;
     // this context was borrowed
     ((wxMacCGContext*)(m_graphicContext))->SetNativeContext( NULL ) ;

+       */

 #endif
     delete m_nativePrinterDC ;
 }
 #endif
     delete m_nativePrinterDC ;
 }


@@ -309,7 +314,7 @@ wxPrinterDC::~wxPrinterDC(void)
 #if wxMAC_USE_CORE_GRAPHICS
 void wxPrinterDC::MacSetCGContext( void * cg )
 {
 #if wxMAC_USE_CORE_GRAPHICS
 void wxPrinterDC::MacSetCGContext( void * cg )
 {

-    ((wxMacCGContext*)(m_graphicContext))->SetNativeContext( (CGContextRef) cg ) ;
+    SetGraphicsContext( wxGraphicsContext::CreateFromNative( cg ) );

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