X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/db49000e6c3340297e14c8659612bbd5f9004bce..7564225f8bff6e6c2ed27695836035fa85a81189:/src/mac/carbon/dcprint.cpp diff --git a/src/mac/carbon/dcprint.cpp b/src/mac/carbon/dcprint.cpp index cabdd0d9b1..58b2eb7a13 100644 --- 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/graphics.h" IMPLEMENT_CLASS(wxPrinterDC, wxDC) @@ -53,7 +54,7 @@ class wxMacCarbonPrinterDC : public wxNativePrinterDC { public : wxMacCarbonPrinterDC( wxPrintData* data ) ; - ~wxMacCarbonPrinterDC() ; + virtual ~wxMacCarbonPrinterDC() ; virtual bool StartDoc( wxPrinterDC* dc , const wxString& message ) ; virtual void EndDoc( wxPrinterDC* dc ) ; virtual void StartPage( wxPrinterDC* dc ) ; @@ -62,7 +63,9 @@ public : virtual void GetSize( int *w , int *h) const ; virtual wxSize GetPPI() const ; private : +#if !wxMAC_USE_CORE_GRAPHICS GrafPtr m_macPrintFormerPort ; +#endif wxCoord m_maxX ; wxCoord m_maxY ; wxSize m_ppi ; @@ -71,8 +74,9 @@ private : wxMacCarbonPrinterDC::wxMacCarbonPrinterDC( wxPrintData* data ) { +#if !wxMAC_USE_CORE_GRAPHICS ::GetPort( & m_macPrintFormerPort ) ; - +#endif m_err = noErr ; wxMacCarbonPrintData *native = (wxMacCarbonPrintData*) data->GetNativeData() ; @@ -85,14 +89,22 @@ wxMacCarbonPrinterDC::wxMacCarbonPrinterDC( wxPrintData* data ) m_maxY = wxCoord(rPage.bottom - rPage.top); PMResolution res; +#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 + PMPrinter printer; + PMSessionGetCurrentPrinter(native->m_macPrintSession, &printer); + PMPrinterGetOutputResolution( printer, native->m_macPrintSettings, &res) ; +#else m_err = PMGetResolution((PMPageFormat) (native->m_macPageFormat), &res); +#endif m_ppi = wxSize(int(res.hRes), int(res.vRes)); } wxMacCarbonPrinterDC::~wxMacCarbonPrinterDC() { +#if !wxMAC_USE_CORE_GRAPHICS // nothing to release from print data, as wxPrinterDC has all data in its wxPrintData member ::SetPort( m_macPrintFormerPort ) ; +#endif } wxNativePrinterDC* wxNativePrinterDC::Create(wxPrintData* data) @@ -107,7 +119,7 @@ bool wxMacCarbonPrinterDC::StartDoc( wxPrinterDC* dc , const wxString& WXUNUSED wxMacCarbonPrintData *native = (wxMacCarbonPrintData*) dc->GetPrintData().GetNativeData() ; -#if wxMAC_USE_CORE_GRAPHICS +#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_4 && wxMAC_USE_CORE_GRAPHICS { CFStringRef s[1] = { kPMGraphicsContextCoreGraphics }; CFArrayRef graphicsContextsArray = CFArrayCreate(NULL, (const void**)s, 1, &kCFTypeArrayCallBacks); @@ -115,23 +127,36 @@ bool wxMacCarbonPrinterDC::StartDoc( wxPrinterDC* dc , const wxString& WXUNUSED CFRelease(graphicsContextsArray); } #endif - +#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_4 && wxMAC_USE_CORE_GRAPHICS + m_err = PMSessionBeginCGDocument(native->m_macPrintSession, + native->m_macPrintSettings, + native->m_macPageFormat); +#else m_err = PMSessionBeginDocument(native->m_macPrintSession, native->m_macPrintSettings, native->m_macPageFormat); + +#endif + if ( m_err != noErr ) return false; PMRect rPage; m_err = PMGetAdjustedPageRect(native->m_macPageFormat, &rPage); if ( m_err != noErr ) - return; + return false ; m_maxX = wxCoord(rPage.right - rPage.left) ; m_maxY = wxCoord(rPage.bottom - rPage.top); PMResolution res; +#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 + PMPrinter printer; + PMSessionGetCurrentPrinter(native->m_macPrintSession, &printer); + PMPrinterGetOutputResolution( printer, native->m_macPrintSettings, &res) ; +#else m_err = PMGetResolution((PMPageFormat) (native->m_macPageFormat), &res); +#endif m_ppi = wxSize(int(res.hRes), int(res.vRes)); return true ; } @@ -163,10 +188,15 @@ void wxMacCarbonPrinterDC::StartPage( wxPrinterDC* dc ) if ( m_err == noErr ) { #if wxMAC_USE_CORE_GRAPHICS +#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_4 + m_err = PMSessionGetCGGraphicsContext(native->m_macPrintSession, + &pageContext ); + +#else m_err = PMSessionGetGraphicsContext(native->m_macPrintSession, kPMGraphicsContextCoreGraphics, (void**) &pageContext ); - dc->MacSetCGContext(pageContext) ; +#endif #else m_err = PMSessionGetGraphicsContext(native->m_macPrintSession, kPMGraphicsContextQuickdraw, @@ -189,9 +219,10 @@ void wxMacCarbonPrinterDC::StartPage( wxPrinterDC* dc ) #if wxMAC_USE_CORE_GRAPHICS PMRect paperRect ; PMGetAdjustedPaperRect( native->m_macPageFormat , &paperRect ) ; - CGContextTranslateCTM( pageContext , -paperRect.left , -paperRect.top + ( rPage.bottom - rPage.top ) ) ; + // make sure (0,0) is at the upper left of the printable area (wx conventions) + // Core Graphics initially has the lower left of the paper as 0,0 + CGContextTranslateCTM( pageContext , -paperRect.left , paperRect.bottom ) ; CGContextScaleCTM( pageContext , 1 , -1 ) ; - CGContextSaveGState( pageContext ) ; #else dc->m_macLocalOrigin.x = (int) rPage.left; dc->m_macLocalOrigin.y = (int) rPage.top; @@ -200,6 +231,9 @@ void wxMacCarbonPrinterDC::StartPage( wxPrinterDC* dc ) // since this is a non-critical error, we set the flag back m_err = noErr ; } +#if wxMAC_USE_CORE_GRAPHICS + dc->SetGraphicsContext( wxGraphicsContext::CreateFromNative( pageContext ) ); +#endif } void wxMacCarbonPrinterDC::EndPage( wxPrinterDC* dc ) @@ -214,6 +248,10 @@ void wxMacCarbonPrinterDC::EndPage( wxPrinterDC* dc ) { PMSessionEndDocument(native->m_macPrintSession); } +#if wxMAC_USE_CORE_GRAPHICS + // the cg context we got when starting the page isn't valid anymore, so replace it + dc->SetGraphicsContext( wxGraphicsContext::Create() ); +#endif } void wxMacCarbonPrinterDC::GetSize( int *w , int *h) const @@ -256,8 +294,9 @@ wxPrinterDC::wxPrinterDC(const wxPrintData& printdata) 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() ; + // we need at least a measuring context because people start measuring before a page + // gets printed at all + SetGraphicsContext( wxGraphicsContext::Create() ); #endif } } @@ -269,21 +308,9 @@ wxSize wxPrinterDC::GetPPI() const wxPrinterDC::~wxPrinterDC(void) { -#if wxMAC_USE_CORE_GRAPHICS - // this context was borrowed - ((wxMacCGContext*)(m_graphicContext))->SetNativeContext( NULL ) ; -#endif delete m_nativePrinterDC ; } -#if wxMAC_USE_CORE_GRAPHICS -void wxPrinterDC::MacSetCGContext( void * cg ) -{ - ((wxMacCGContext*)(m_graphicContext))->SetNativeContext( (CGContextRef) cg ) ; - m_graphicContext->SetPen( m_pen ) ; - m_graphicContext->SetBrush( m_brush ) ; -} -#endif bool wxPrinterDC::StartDoc( const wxString& message ) { wxASSERT_MSG( Ok() , wxT("Called wxPrinterDC::StartDoc from an invalid object") ) ; @@ -324,6 +351,21 @@ void wxPrinterDC::EndDoc(void) } } +wxRect wxPrinterDC::GetPaperRect() +{ + wxCoord w, h; + GetSize(&w, &h); + wxRect pageRect(0, 0, w, h); + wxMacCarbonPrintData *native = (wxMacCarbonPrintData*) m_printData.GetNativeData() ; + OSStatus err = noErr ; + PMRect rPaper; + err = PMGetAdjustedPaperRect(native->m_macPageFormat, &rPaper); + if ( err != noErr ) + return pageRect; + return wxRect(wxCoord(rPaper.left), wxCoord(rPaper.top), + wxCoord(rPaper.right - rPaper.left), wxCoord(rPaper.bottom - rPaper.top)); +} + void wxPrinterDC::StartPage(void) { if ( !m_ok )