X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/db49000e6c3340297e14c8659612bbd5f9004bce..9d5507f7a2701395e1d5c121bd877bb9066ee6ea:/src/mac/carbon/dcprint.cpp?ds=sidebyside diff --git a/src/mac/carbon/dcprint.cpp b/src/mac/carbon/dcprint.cpp index cabdd0d9b1..10c79a07ef 100644 --- a/src/mac/carbon/dcprint.cpp +++ b/src/mac/carbon/dcprint.cpp @@ -27,8 +27,10 @@ #include "wx/mac/uma.h" #include "wx/mac/private/print.h" +#include "wx/mac/carbon/dcprint.h" +#include "wx/graphics.h" -IMPLEMENT_CLASS(wxPrinterDC, wxDC) +IMPLEMENT_ABSTRACT_CLASS(wxPrinterDCImpl, wxGCDCImpl) class wxNativePrinterDC { @@ -53,7 +55,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 +64,6 @@ public : virtual void GetSize( int *w , int *h) const ; virtual wxSize GetPPI() const ; private : - GrafPtr m_macPrintFormerPort ; wxCoord m_maxX ; wxCoord m_maxY ; wxSize m_ppi ; @@ -71,8 +72,6 @@ private : wxMacCarbonPrinterDC::wxMacCarbonPrinterDC( wxPrintData* data ) { - ::GetPort( & m_macPrintFormerPort ) ; - m_err = noErr ; wxMacCarbonPrintData *native = (wxMacCarbonPrintData*) data->GetNativeData() ; @@ -85,14 +84,18 @@ 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() { - // nothing to release from print data, as wxPrinterDC has all data in its wxPrintData member - ::SetPort( m_macPrintFormerPort ) ; } wxNativePrinterDC* wxNativePrinterDC::Create(wxPrintData* data) @@ -105,33 +108,40 @@ bool wxMacCarbonPrinterDC::StartDoc( wxPrinterDC* dc , const wxString& WXUNUSED if ( m_err ) return false ; - wxMacCarbonPrintData *native = (wxMacCarbonPrintData*) dc->GetPrintData().GetNativeData() ; + wxPrinterDCImpl *impl = (wxPrinterDCImpl*) dc->GetImpl(); + wxMacCarbonPrintData *native = (wxMacCarbonPrintData*) impl->GetPrintData().GetNativeData() ; -#if wxMAC_USE_CORE_GRAPHICS - { - CFStringRef s[1] = { kPMGraphicsContextCoreGraphics }; - CFArrayRef graphicsContextsArray = CFArrayCreate(NULL, (const void**)s, 1, &kCFTypeArrayCallBacks); - PMSessionSetDocumentFormatGeneration(native->m_macPrintSession, kPMDocumentFormatPDF, graphicsContextsArray, NULL); - CFRelease(graphicsContextsArray); - } -#endif - - m_err = PMSessionBeginDocument(native->m_macPrintSession, + m_err = PMSessionBeginCGDocumentNoDialog(native->m_macPrintSession, native->m_macPrintSettings, - native->m_macPageFormat); + native->m_macPageFormat); 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; - m_err = PMGetResolution((PMPageFormat) (native->m_macPageFormat), &res); +#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 + if ( PMPrinterGetOutputResolution != NULL ) + { + PMPrinter printer; + m_err = PMSessionGetCurrentPrinter(native->m_macPrintSession, &printer); + if ( m_err == noErr ) + m_err = PMPrinterGetOutputResolution( printer, native->m_macPrintSettings, &res) ; + } + else +#endif + { +#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5 + m_err = PMGetResolution((PMPageFormat) (native->m_macPageFormat), &res); +#endif + } + m_ppi = wxSize(int(res.hRes), int(res.vRes)); return true ; } @@ -141,9 +151,10 @@ void wxMacCarbonPrinterDC::EndDoc( wxPrinterDC* dc ) if ( m_err ) return ; - wxMacCarbonPrintData *native = (wxMacCarbonPrintData*) dc->GetPrintData().GetNativeData() ; + wxPrinterDCImpl *impl = (wxPrinterDCImpl*) dc->GetImpl(); + wxMacCarbonPrintData *native = (wxMacCarbonPrintData*) impl->GetPrintData().GetNativeData() ; - m_err = PMSessionEndDocument(native->m_macPrintSession); + m_err = PMSessionEndDocumentNoDialog(native->m_macPrintSession); } void wxMacCarbonPrinterDC::StartPage( wxPrinterDC* dc ) @@ -151,33 +162,25 @@ void wxMacCarbonPrinterDC::StartPage( wxPrinterDC* dc ) if ( m_err ) return ; - wxMacCarbonPrintData *native = (wxMacCarbonPrintData*) dc->GetPrintData().GetNativeData() ; + wxPrinterDCImpl *impl = (wxPrinterDCImpl*) dc->GetImpl(); + wxMacCarbonPrintData *native = (wxMacCarbonPrintData*) impl->GetPrintData().GetNativeData() ; - m_err = PMSessionBeginPage(native->m_macPrintSession, + m_err = PMSessionBeginPageNoDialog(native->m_macPrintSession, native->m_macPageFormat, nil); -#if wxMAC_USE_CORE_GRAPHICS CGContextRef pageContext; -#endif + if ( m_err == noErr ) { -#if wxMAC_USE_CORE_GRAPHICS - m_err = PMSessionGetGraphicsContext(native->m_macPrintSession, - kPMGraphicsContextCoreGraphics, - (void**) &pageContext ); - dc->MacSetCGContext(pageContext) ; -#else - m_err = PMSessionGetGraphicsContext(native->m_macPrintSession, - kPMGraphicsContextQuickdraw, - (void**) &dc->m_macPort ); -#endif + m_err = PMSessionGetCGGraphicsContext(native->m_macPrintSession, + &pageContext ); } if ( m_err != noErr ) { - PMSessionEndPage(native->m_macPrintSession); - PMSessionEndDocument(native->m_macPrintSession); + PMSessionEndPageNoDialog(native->m_macPrintSession); + PMSessionEndDocumentNoDialog(native->m_macPrintSession); } else { @@ -186,20 +189,17 @@ void wxMacCarbonPrinterDC::StartPage( wxPrinterDC* dc ) m_err = PMGetAdjustedPageRect(native->m_macPageFormat, &rPage); if ( !m_err ) { -#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; -#endif } // since this is a non-critical error, we set the flag back m_err = noErr ; } + impl->SetGraphicsContext( wxGraphicsContext::CreateFromNative( pageContext ) ); } void wxMacCarbonPrinterDC::EndPage( wxPrinterDC* dc ) @@ -207,13 +207,16 @@ void wxMacCarbonPrinterDC::EndPage( wxPrinterDC* dc ) if ( m_err ) return ; - wxMacCarbonPrintData *native = (wxMacCarbonPrintData*) dc->GetPrintData().GetNativeData() ; + wxPrinterDCImpl *impl = (wxPrinterDCImpl*) dc->GetImpl(); + wxMacCarbonPrintData *native = (wxMacCarbonPrintData*) impl->GetPrintData().GetNativeData() ; - m_err = PMSessionEndPage(native->m_macPrintSession); + m_err = PMSessionEndPageNoDialog(native->m_macPrintSession); if ( m_err != noErr ) { - PMSessionEndDocument(native->m_macPrintSession); + PMSessionEndDocumentNoDialog(native->m_macPrintSession); } + // the cg context we got when starting the page isn't valid anymore, so replace it + impl->SetGraphicsContext( wxGraphicsContext::Create() ); } void wxMacCarbonPrinterDC::GetSize( int *w , int *h) const @@ -233,7 +236,8 @@ wxSize wxMacCarbonPrinterDC::GetPPI() const // // -wxPrinterDC::wxPrinterDC(const wxPrintData& printdata) +wxPrinterDCImpl::wxPrinterDCImpl( wxPrinterDC *owner, const wxPrintData& printdata ) + : wxGCDCImpl( owner ) { m_ok = false ; m_printData = printdata ; @@ -255,43 +259,30 @@ wxPrinterDC::wxPrinterDC(const wxPrintData& printdata) m_mm_to_pix_x = mm2inches * sz.x; 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() ; -#endif + // we need at least a measuring context because people start measuring before a page + // gets printed at all + SetGraphicsContext( wxGraphicsContext::Create() ); } } -wxSize wxPrinterDC::GetPPI() const +wxSize wxPrinterDCImpl::GetPPI() const { return m_nativePrinterDC->GetPPI() ; } -wxPrinterDC::~wxPrinterDC(void) +wxPrinterDCImpl::~wxPrinterDCImpl() { -#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 ) +bool wxPrinterDCImpl::StartDoc( const wxString& message ) { - wxASSERT_MSG( Ok() , wxT("Called wxPrinterDC::StartDoc from an invalid object") ) ; + wxASSERT_MSG( IsOk() , wxT("Called wxPrinterDC::StartDoc from an invalid object") ) ; if ( !m_ok ) return false ; - if ( m_nativePrinterDC->StartDoc(this, message ) ) + if ( m_nativePrinterDC->StartDoc( (wxPrinterDC*) GetOwner(), message ) ) { // in case we have to do additional things when successful } @@ -307,12 +298,12 @@ bool wxPrinterDC::StartDoc( const wxString& message ) return m_ok ; } -void wxPrinterDC::EndDoc(void) +void wxPrinterDCImpl::EndDoc(void) { if ( !m_ok ) return ; - m_nativePrinterDC->EndDoc( this ) ; + m_nativePrinterDC->EndDoc( (wxPrinterDC*) GetOwner() ) ; m_ok = m_nativePrinterDC->Ok() ; if ( !m_ok ) @@ -324,7 +315,22 @@ void wxPrinterDC::EndDoc(void) } } -void wxPrinterDC::StartPage(void) +wxRect wxPrinterDCImpl::GetPaperRect() +{ + wxCoord w, h; + GetOwner()->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 wxPrinterDCImpl::StartPage() { if ( !m_ok ) return ; @@ -339,27 +345,22 @@ void wxPrinterDC::StartPage(void) m_font = *wxNORMAL_FONT; m_brush = *wxTRANSPARENT_BRUSH; m_backgroundBrush = *wxWHITE_BRUSH; -#if !wxMAC_USE_CORE_GRAPHICS - m_macFontInstalled = false ; - m_macBrushInstalled = false ; - m_macPenInstalled = false ; -#endif - m_nativePrinterDC->StartPage(this) ; + m_nativePrinterDC->StartPage( (wxPrinterDC*) GetOwner() ) ; m_ok = m_nativePrinterDC->Ok() ; } -void wxPrinterDC::EndPage(void) +void wxPrinterDCImpl::EndPage() { if ( !m_ok ) return ; - m_nativePrinterDC->EndPage(this) ; + m_nativePrinterDC->EndPage( (wxPrinterDC*) GetOwner() ); m_ok = m_nativePrinterDC->Ok() ; } -void wxPrinterDC::DoGetSize(int *width, int *height) const +void wxPrinterDCImpl::DoGetSize(int *width, int *height) const { wxCHECK_RET( m_ok , _T("GetSize() doesn't work without a valid wxPrinterDC") ); m_nativePrinterDC->GetSize(width, height ) ;