X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f415cab9ef1433413a1a68a982ee9b17c5a8deda..5c7b506103cfc078a821860766e31c47d595e07f:/src/mac/carbon/dcprint.cpp diff --git a/src/mac/carbon/dcprint.cpp b/src/mac/carbon/dcprint.cpp index fc24e02e66..ccc58d99ff 100644 --- a/src/mac/carbon/dcprint.cpp +++ b/src/mac/carbon/dcprint.cpp @@ -27,9 +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 { @@ -63,9 +64,6 @@ 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 ; @@ -74,9 +72,6 @@ private : wxMacCarbonPrinterDC::wxMacCarbonPrinterDC( wxPrintData* data ) { -#if !wxMAC_USE_CORE_GRAPHICS - ::GetPort( & m_macPrintFormerPort ) ; -#endif m_err = noErr ; wxMacCarbonPrintData *native = (wxMacCarbonPrintData*) data->GetNativeData() ; @@ -89,22 +84,35 @@ 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); + +#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) ; + if ( m_err == -9589 /* kPMKeyNotFound */ ) + { + m_err = noErr ; + res.hRes = res.vRes = 300; + } + } + } + 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)); } 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) @@ -117,27 +125,12 @@ 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 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); - PMSessionSetDocumentFormatGeneration(native->m_macPrintSession, kPMDocumentFormatPDF, graphicsContextsArray, NULL); - 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, + m_err = PMSessionBeginCGDocumentNoDialog(native->m_macPrintSession, native->m_macPrintSettings, - native->m_macPageFormat); -#else - m_err = PMSessionBeginDocument(native->m_macPrintSession, - native->m_macPrintSettings, - native->m_macPageFormat); - -#endif - + native->m_macPageFormat); if ( m_err != noErr ) return false; @@ -150,13 +143,29 @@ bool wxMacCarbonPrinterDC::StartDoc( wxPrinterDC* dc , const wxString& WXUNUSED 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); +#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) ; + if ( m_err == -9589 /* kPMKeyNotFound */ ) + { + m_err = noErr ; + res.hRes = res.vRes = 300; + } + } + } + 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 ; } @@ -166,9 +175,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 ) @@ -176,39 +186,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 -#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 ); -#endif - dc->MacSetCGContext(pageContext) ; -#else - m_err = PMSessionGetGraphicsContext(native->m_macPrintSession, - kPMGraphicsContextQuickdraw, - (void**) &dc->m_macPort ); -#endif } if ( m_err != noErr ) { - PMSessionEndPage(native->m_macPrintSession); - PMSessionEndDocument(native->m_macPrintSession); + PMSessionEndPageNoDialog(native->m_macPrintSession); + PMSessionEndDocumentNoDialog(native->m_macPrintSession); } else { @@ -217,20 +213,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 , (CGFloat) -paperRect.left , (CGFloat) 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 ) @@ -238,13 +231,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 @@ -264,7 +260,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 ; @@ -286,47 +283,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 ) +bool wxPrinterDCImpl::StartDoc( const wxString& message ) { - SetGraphicsContext( wxGraphicsContext::CreateFromNative( 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") ) ; + 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 } @@ -342,12 +322,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 ) @@ -359,10 +339,10 @@ void wxPrinterDC::EndDoc(void) } } -wxRect wxPrinterDC::GetPaperRect() +wxRect wxPrinterDCImpl::GetPaperRect() { wxCoord w, h; - GetSize(&w, &h); + GetOwner()->GetSize(&w, &h); wxRect pageRect(0, 0, w, h); wxMacCarbonPrintData *native = (wxMacCarbonPrintData*) m_printData.GetNativeData() ; OSStatus err = noErr ; @@ -374,7 +354,7 @@ wxRect wxPrinterDC::GetPaperRect() wxCoord(rPaper.right - rPaper.left), wxCoord(rPaper.bottom - rPaper.top)); } -void wxPrinterDC::StartPage(void) +void wxPrinterDCImpl::StartPage() { if ( !m_ok ) return ; @@ -389,27 +369,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 ) ;