X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3cd25cff50f35741c8f5327865068593e214e4ca..8064223b7b1b3657363b7a635c381b9269d95e55:/src/mac/carbon/dcprint.cpp?ds=sidebyside diff --git a/src/mac/carbon/dcprint.cpp b/src/mac/carbon/dcprint.cpp index 8f09600531..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 { @@ -83,13 +84,30 @@ 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)); } @@ -107,7 +125,8 @@ 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() ; m_err = PMSessionBeginCGDocumentNoDialog(native->m_macPrintSession, native->m_macPrintSettings, @@ -130,7 +149,14 @@ bool wxMacCarbonPrinterDC::StartDoc( wxPrinterDC* dc , const wxString& WXUNUSED 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 @@ -149,7 +175,8 @@ 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 = PMSessionEndDocumentNoDialog(native->m_macPrintSession); } @@ -159,7 +186,8 @@ 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 = PMSessionBeginPageNoDialog(native->m_macPrintSession, native->m_macPageFormat, @@ -189,13 +217,13 @@ void wxMacCarbonPrinterDC::StartPage( wxPrinterDC* dc ) PMGetAdjustedPaperRect( native->m_macPageFormat , &paperRect ) ; // 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 ) ; + CGContextTranslateCTM( pageContext , (CGFloat) -paperRect.left , (CGFloat) paperRect.bottom ) ; CGContextScaleCTM( pageContext , 1 , -1 ) ; } // since this is a non-critical error, we set the flag back m_err = noErr ; } - dc->SetGraphicsContext( wxGraphicsContext::CreateFromNative( pageContext ) ); + impl->SetGraphicsContext( wxGraphicsContext::CreateFromNative( pageContext ) ); } void wxMacCarbonPrinterDC::EndPage( wxPrinterDC* dc ) @@ -203,7 +231,8 @@ 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 = PMSessionEndPageNoDialog(native->m_macPrintSession); if ( m_err != noErr ) @@ -211,7 +240,7 @@ void wxMacCarbonPrinterDC::EndPage( wxPrinterDC* dc ) PMSessionEndDocumentNoDialog(native->m_macPrintSession); } // the cg context we got when starting the page isn't valid anymore, so replace it - dc->SetGraphicsContext( wxGraphicsContext::Create() ); + impl->SetGraphicsContext( wxGraphicsContext::Create() ); } void wxMacCarbonPrinterDC::GetSize( int *w , int *h) const @@ -231,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 ; @@ -259,24 +289,24 @@ wxPrinterDC::wxPrinterDC(const wxPrintData& printdata) } } -wxSize wxPrinterDC::GetPPI() const +wxSize wxPrinterDCImpl::GetPPI() const { return m_nativePrinterDC->GetPPI() ; } -wxPrinterDC::~wxPrinterDC(void) +wxPrinterDCImpl::~wxPrinterDCImpl() { delete m_nativePrinterDC ; } -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 } @@ -292,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 ) @@ -309,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 ; @@ -324,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 ; @@ -340,21 +370,21 @@ void wxPrinterDC::StartPage(void) m_brush = *wxTRANSPARENT_BRUSH; m_backgroundBrush = *wxWHITE_BRUSH; - 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 ) ;